Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-18 06:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #825 from philix/fix-build

Browse Source 
Examples: OSX: Fix Mac OS X build XCode project and remove cruft from Makefile
This commit is contained in:
omar 2016-09-10 11:31:41 +02:00 committed by GitHub
commit 012223114d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/apple_example/imguiex.xcodeproj/project.pbxproj
View File

@ -97,7 +97,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1A1A0F4D1CB3C54D0090F036 /* libglfw3.dylib */, 1A1A0F4D1CB3C54D0090F036 /* libglfw3.dylib */,
1A1A0F351CB3A1B20090F036 /* opengl_example */, 1A1A0F351CB3A1B20090F036 /* opengl2_example */,
1A1A0F211CB39FB50090F036 /* AppDelegate.h */, 1A1A0F211CB39FB50090F036 /* AppDelegate.h */,
1A1A0F221CB39FB50090F036 /* AppDelegate.m */, 1A1A0F221CB39FB50090F036 /* AppDelegate.m */,
1A1A0F271CB39FB50090F036 /* Assets.xcassets */, 1A1A0F271CB39FB50090F036 /* Assets.xcassets */,
@ -114,15 +114,15 @@
name = "Supporting Files"; name = "Supporting Files";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
1A1A0F351CB3A1B20090F036 /* opengl_example */ = { 1A1A0F351CB3A1B20090F036 /* opengl2_example */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1A1A0F371CB3A1B20090F036 /* imgui_impl_glfw.cpp */, 1A1A0F371CB3A1B20090F036 /* imgui_impl_glfw.cpp */,
1A1A0F381CB3A1B20090F036 /* imgui_impl_glfw.h */, 1A1A0F381CB3A1B20090F036 /* imgui_impl_glfw.h */,
1A1A0F391CB3A1B20090F036 /* main.cpp */, 1A1A0F391CB3A1B20090F036 /* main.cpp */,
); );
name = opengl_example; name = opengl2_example;
path = ../../opengl_example; path = ../../opengl2_example;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
6D1E39141B35EEF10017B40F /* usynergy */ = { 6D1E39141B35EEF10017B40F /* usynergy */ = {

9
examples/opengl3_example/Makefile
View File

@ -3,9 +3,10 @@
# Compatible with Ubuntu 14.04.1 and Mac OS X # Compatible with Ubuntu 14.04.1 and Mac OS X
# #
# #
# if you using Mac OS X: # You will need GLFW (http://www.glfw.org)
# You'll need glfw #
# http://www.glfw.org # apt-get install libglfw-dev # Linux
# brew install glfw # Mac OS X
# #
#CXX = g++ #CXX = g++
@ -33,7 +34,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE
LIBS += -L/usr/local/lib -lglfw3 LIBS += -L/usr/local/lib -lglfw3
#LIBS += -L/usr/local/lib -lglfw #LIBS += -L/usr/local/lib -lglfw
CXXFLAGS = -I../../ -I../libs/gl3w -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include CXXFLAGS = -I../../ -I../libs/gl3w -I/usr/local/include
CXXFLAGS += -Wall -Wformat CXXFLAGS += -Wall -Wformat
# CXXFLAGS += -D__APPLE__ # CXXFLAGS += -D__APPLE__
CFLAGS = $(CXXFLAGS) CFLAGS = $(CXXFLAGS)