Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Examples: Speculative Makefile fix. I should get a Linux box instead on relying on Jenkins, this is pretty embarrassing.

Browse Source
docking
ocornut 10 years ago
parent dc7cdb3025
commit b911f96a56
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
examples/opengl3_example/Makefile
Unescape Escape View File

@ -24,7 +24,7 @@ ifeq ($(UNAME_S), Linux) #LINUX
CXXFLAGS = -I../../ -I../opengl_example/gl3w `pkg-config --cflags glfw3` CXXFLAGS = -I../../ -I../opengl_example/gl3w `pkg-config --cflags glfw3`
CXXFLAGS += -Wall CXXFLAGS += -Wall
CFLAGS = CXXFLAGS CFLAGS = $(CXXFLAGS)
endif endif
ifeq ($(UNAME_S), Darwin) #APPLE ifeq ($(UNAME_S), Darwin) #APPLE
@ -36,7 +36,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE
CXXFLAGS = -I../../ -I../opengl_example/gl3w -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include CXXFLAGS = -I../../ -I../opengl_example/gl3w -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include
CXXFLAGS += -Wall CXXFLAGS += -Wall
# CXXFLAGS += -D__APPLE__ # CXXFLAGS += -D__APPLE__
CFLAGS = CXXFLAGS CFLAGS = $(CXXFLAGS)
endif endif
.cpp.o: .cpp.o:

4
examples/opengl_example/Makefile
Unescape Escape View File

@ -23,7 +23,7 @@ ifeq ($(UNAME_S), Linux) #LINUX
CXXFLAGS = -I../../ `pkg-config --cflags glfw3` CXXFLAGS = -I../../ `pkg-config --cflags glfw3`
CXXFLAGS += -Wall CXXFLAGS += -Wall
CFLAGS = CXXFLAGS CFLAGS = $(CXXFLAGS)
endif endif
ifeq ($(UNAME_S), Darwin) #APPLE ifeq ($(UNAME_S), Darwin) #APPLE
@ -35,7 +35,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE
CXXFLAGS = -I../../ -I/usr/local/include CXXFLAGS = -I../../ -I/usr/local/include
CXXFLAGS += -Wall CXXFLAGS += -Wall
# CXXFLAGS += -D__APPLE__ # CXXFLAGS += -D__APPLE__
CFLAGS = CXXFLAGS CFLAGS = $(CXXFLAGS)
endif endif
.cpp.o: .cpp.o:

Write Preview
Loading…
Cancel
Save