DPF

commit c29301f717f188829d55bf403c646f4d1e58ce47
parent b11b6a4332d1887ba3f5b8842418d5d8e015dcb1
Author: falkTX <falktx@falktx.com>
Date:   Mon, 15 Jul 2019 11:46:41 +0200

Merge branch 'master' into develop

Diffstat:
M
dgl/Makefile
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git 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 $@
 
 # ---------------------------------------------------------------------------------------------------------------------