Browse Source

Merge branch 'master' into develop

pull/158/head
falkTX 5 years ago
parent
commit
c29301f717
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      dgl/Makefile

+ 6
- 6
dgl/Makefile View File

@@ -108,34 +108,34 @@ all: $(TARGETS)
../build/dgl/%.cpp.cairo.o: src/%.cpp ../build/dgl/%.cpp.cairo.o: src/%.cpp
-@mkdir -p ../build/dgl -@mkdir -p ../build/dgl
@echo "Compiling $< (Cairo variant)" @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/* ../build/dgl/Window.cpp.cairo.o: src/Window.cpp src/sofd/* src/pugl/*
-@mkdir -p ../build/dgl -@mkdir -p ../build/dgl
@echo "Compiling $< (Cairo variant)" @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/* ../build/dgl/Window.mm.cairo.o: src/Window.cpp src/sofd/* src/pugl/*
-@mkdir -p ../build/dgl -@mkdir -p ../build/dgl
@echo "Compiling $< (Cairo variant)" @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 ../build/dgl/%.cpp.opengl.o: src/%.cpp
-@mkdir -p ../build/dgl -@mkdir -p ../build/dgl
@echo "Compiling $< (OpenGL variant)" @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/* ../build/dgl/Window.cpp.opengl.o: src/Window.cpp src/sofd/* src/pugl/*
-@mkdir -p ../build/dgl -@mkdir -p ../build/dgl
@echo "Compiling $< (OpenGL variant)" @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/* ../build/dgl/Window.mm.opengl.o: src/Window.cpp src/sofd/* src/pugl/*
-@mkdir -p ../build/dgl -@mkdir -p ../build/dgl
@echo "Compiling $< (OpenGL variant)" @echo "Compiling $< (OpenGL variant)"
@$(CXX) $< $(BUILD_CXX_FLAGS) -DDGL_OPENGL -ObjC++ -c -o $@
@$(CXX) $< $(BUILD_CXX_FLAGS) $(OPENGL_FLAGS) -DDGL_OPENGL -ObjC++ -c -o $@


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------




Loading…
Cancel
Save