Created
June 21, 2016 23:58
-
-
Save abadams/80e1bc7922f1c6ee7b92143c7a683904 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/opengl_demo/Makefile b/apps/opengl_demo/Makefile | |
index 3b0948a..8e5294a 100644 | |
--- a/apps/opengl_demo/Makefile | |
+++ b/apps/opengl_demo/Makefile | |
@@ -1,20 +1,21 @@ | |
+ | |
# | |
# This could be more DRY using some Makefile magic, but for the example | |
# app will try to maximize clarity by making most rules explicit | |
# | |
# OS X settings, with Halide and other libraries installed by homebrew | |
-HALIDE_TOOLS_DIR = /usr/local/share/halide/tools | |
+HALIDE_TOOLS_DIR = ../../tools | |
MAIN_LIBS = -framework OpenGL -framework GLUT -lglfw3 -lpng -ldrawtext | |
GENERATOR_LIBS = -lHalide -lz -lcurses | |
DTX_FONT = /Library/Fonts/Arial.ttf | |
-CXXFLAGS = -std=c++11 -g -DDTX_FONT=\"$(DTX_FONT)\" | |
+CXXFLAGS = -std=c++11 -g -DDTX_FONT=\"$(DTX_FONT)\" -I ../../include -I /opt/local/include | |
.PHONY: run clean | |
default: run | |
- | |
+ | |
run: build/opengl_demo | |
build/opengl_demo image.png | |
@@ -53,7 +54,7 @@ build/sample_filter_opengl.o build/sample_filter_opengl.h: build/generate_sample | |
build/generate_sample_filter: sample_filter.cpp | |
@mkdir -p build | |
- $(CXX) $(CXXFLAGS) -fno-rtti -o $@ $^ $(HALIDE_TOOLS_DIR)/GenGen.cpp $(GENERATOR_LIBS) | |
+ $(CXX) $(CXXFLAGS) -fno-rtti -o $@ $^ $(HALIDE_TOOLS_DIR)/GenGen.cpp $(GENERATOR_LIBS) -I ../../include -L ../../bin | |
# | |
# Build in subdir using auto-dependency mechanism | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment