ocornut 10 лет назад
Родитель
Сommit
dc7cdb3025
2 измененных файлов с 8 добавлено и 4 удалено
  1. 4 2
      examples/opengl3_example/Makefile
  2. 4 2
      examples/opengl_example/Makefile

+ 4 - 2
examples/opengl3_example/Makefile

@@ -20,14 +20,15 @@ UNAME_S := $(shell uname -s)
 
 
 ifeq ($(UNAME_S), Linux) #LINUX
 ifeq ($(UNAME_S), Linux) #LINUX
 	ECHO_MESSAGE = "Linux"
 	ECHO_MESSAGE = "Linux"
+	LIBS = `pkg-config --static --libs glfw3`
+
 	CXXFLAGS = -I../../ -I../opengl_example/gl3w `pkg-config --cflags glfw3`
 	CXXFLAGS = -I../../ -I../opengl_example/gl3w `pkg-config --cflags glfw3`
 	CXXFLAGS += -Wall
 	CXXFLAGS += -Wall
-	LIBS = `pkg-config --static --libs glfw3`
+	CFLAGS = CXXFLAGS
 endif
 endif
 
 
 ifeq ($(UNAME_S), Darwin) #APPLE
 ifeq ($(UNAME_S), Darwin) #APPLE
 	ECHO_MESSAGE = "Mac OS X"
 	ECHO_MESSAGE = "Mac OS X"
-
 	LIBS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo
 	LIBS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo
 	LIBS += -L/usr/local/lib
 	LIBS += -L/usr/local/lib
 	LIBS += -lglfw3
 	LIBS += -lglfw3
@@ -35,6 +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
 endif
 endif
 
 
 .cpp.o:
 .cpp.o:

+ 4 - 2
examples/opengl_example/Makefile

@@ -19,14 +19,15 @@ UNAME_S := $(shell uname -s)
 
 
 ifeq ($(UNAME_S), Linux) #LINUX
 ifeq ($(UNAME_S), Linux) #LINUX
 	ECHO_MESSAGE = "Linux"
 	ECHO_MESSAGE = "Linux"
+	LIBS = `pkg-config --static --libs glfw3`
+
 	CXXFLAGS = -I../../ `pkg-config --cflags glfw3`
 	CXXFLAGS = -I../../ `pkg-config --cflags glfw3`
 	CXXFLAGS += -Wall
 	CXXFLAGS += -Wall
-	LIBS = `pkg-config --static --libs glfw3`
+	CFLAGS = CXXFLAGS
 endif
 endif
 
 
 ifeq ($(UNAME_S), Darwin) #APPLE
 ifeq ($(UNAME_S), Darwin) #APPLE
 	ECHO_MESSAGE = "Mac OS X"
 	ECHO_MESSAGE = "Mac OS X"
-
 	LIBS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo
 	LIBS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo
 	LIBS += -L/usr/local/lib
 	LIBS += -L/usr/local/lib
 	LIBS += -lglfw3
 	LIBS += -lglfw3
@@ -34,6 +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
 endif
 endif
 
 
 .cpp.o:
 .cpp.o: