diff options
| author | falkTX <falktx@falktx.com> | 2019-07-15 11:47:08 +0200 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2019-07-15 11:47:08 +0200 |
| commit | c29301f717f188829d55bf403c646f4d1e58ce47 (patch) | |
| tree | a21c0f49700123da9f4207fa9b6ebd5e6931c75d | |
| parent | b11b6a4332d1887ba3f5b8842418d5d8e015dcb1 (diff) | |
| parent | 0a65c4f83e391e19c151239bc58687b419f25466 (diff) | |
Merge branch 'master' into develop
| -rw-r--r-- | dgl/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dgl/Makefile b/dgl/Makefile index 9d6f31a3..3005e709 100644 --- a/dgl/Makefile +++ b/dgl/Makefile @@ -108,34 +108,34 @@ all: $(TARGETS) ../build/dgl/%.cpp.cairo.o: src/%.cpp -@mkdir -p ../build/dgl @echo "Compiling $< (Cairo variant)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DDGL_CAIRO -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(CAIRO_FLAGS) -DDGL_CAIRO -c -o $@ ../build/dgl/Window.cpp.cairo.o: src/Window.cpp src/sofd/* src/pugl/* -@mkdir -p ../build/dgl @echo "Compiling $< (Cairo variant)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DDGL_CAIRO -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(CAIRO_FLAGS) -DDGL_CAIRO -c -o $@ ../build/dgl/Window.mm.cairo.o: src/Window.cpp src/sofd/* src/pugl/* -@mkdir -p ../build/dgl @echo "Compiling $< (Cairo variant)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DDGL_CAIRO -ObjC++ -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(CAIRO_FLAGS) -DDGL_CAIRO -ObjC++ -c -o $@ # --------------------------------------------------------------------------------------------------------------------- ../build/dgl/%.cpp.opengl.o: src/%.cpp -@mkdir -p ../build/dgl @echo "Compiling $< (OpenGL variant)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DDGL_OPENGL -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(OPENGL_FLAGS) -DDGL_OPENGL -c -o $@ ../build/dgl/Window.cpp.opengl.o: src/Window.cpp src/sofd/* src/pugl/* -@mkdir -p ../build/dgl @echo "Compiling $< (OpenGL variant)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DDGL_OPENGL -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(OPENGL_FLAGS) -DDGL_OPENGL -c -o $@ ../build/dgl/Window.mm.opengl.o: src/Window.cpp src/sofd/* src/pugl/* -@mkdir -p ../build/dgl @echo "Compiling $< (OpenGL variant)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DDGL_OPENGL -ObjC++ -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(OPENGL_FLAGS) -DDGL_OPENGL -ObjC++ -c -o $@ # --------------------------------------------------------------------------------------------------------------------- |