mirror of
https://github.com/Drezil/imgui.git
synced 2024-12-18 06:06:35 +00:00
Examples: Makefile fixes.
This commit is contained in:
parent
2dd92e3eed
commit
3f86554457
@ -10,9 +10,8 @@
|
|||||||
|
|
||||||
#CXX = g++
|
#CXX = g++
|
||||||
|
|
||||||
OBJS = main.o imgui_impl_glfw_gl3.o
|
OBJS = main.o imgui_impl_glfw_gl3.o gl3w/GL/gl3w.o
|
||||||
OBJS += ../../imgui.o
|
OBJS += ../../imgui.o
|
||||||
OBJS += ../opengl_example/gl3w/GL/gl3w.o
|
|
||||||
|
|
||||||
UNAME_S := $(shell uname -s)
|
UNAME_S := $(shell uname -s)
|
||||||
|
|
||||||
@ -21,7 +20,7 @@ ifeq ($(UNAME_S), Linux) #LINUX
|
|||||||
ECHO_MESSAGE = "Linux"
|
ECHO_MESSAGE = "Linux"
|
||||||
LIBS = `pkg-config --static --libs glfw3`
|
LIBS = `pkg-config --static --libs glfw3`
|
||||||
|
|
||||||
CXXFLAGS = -I../../ -I../opengl_example/gl3w `pkg-config --cflags glfw3`
|
CXXFLAGS = -I../../ -Igl3w `pkg-config --cflags glfw3`
|
||||||
CXXFLAGS += -Wall
|
CXXFLAGS += -Wall
|
||||||
CFLAGS = $(CXXFLAGS)
|
CFLAGS = $(CXXFLAGS)
|
||||||
endif
|
endif
|
||||||
@ -32,7 +31,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE
|
|||||||
LIBS += -L/usr/local/lib
|
LIBS += -L/usr/local/lib
|
||||||
LIBS += -lglfw3
|
LIBS += -lglfw3
|
||||||
|
|
||||||
CXXFLAGS = -I../../ -I../opengl_example/gl3w -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include
|
CXXFLAGS = -I../../ -Igl3w -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user