lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[iOS] Improved support for examples, removed the need for a toolchain file

Browse source
This commit is contained in:
Laurent Gomila 2013-08-29 23:45:13 +02:00 • committed by Jonathan De Wachter
parent 4e8e1629d1
commit 239921b456
7 changed files with 20 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SFML/Graphics/CMakeLists.txt
View file

@ -124,8 +124,8 @@ if(NOT OPENGL_ES)
endif()
if(IOS)
find_host_package(JPEG REQUIRED)
find_host_package(Freetype REQUIRED)
find_package(JPEG REQUIRED)
find_package(Freetype REQUIRED)
set(GRAPHICS_EXT_INCLUDE_PATHS ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
set(GRAPHICS_EXT_LIBS -framework OpenGLES ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
endif()

4
src/SFML/Window/CMakeLists.txt
View file

@ -183,9 +183,9 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
set(WINDOW_EXT_LIBS ${WINDOW_EXT_LIBS} usbhid)
endif()
elseif(SFML_OS_MACOSX)
set(WINDOW_EXT_LIBS ${WINDOW_EXT_LIBS} ${OPENGL_gl_LIBRARY} "-framework Foundation -framework AppKit -framework IOKit -framework Carbon")
set(WINDOW_EXT_LIBS ${WINDOW_EXT_LIBS} ${OPENGL_gl_LIBRARY} "-framework Foundation -framework AppKit -framework IOKit -framework Carbon")
elseif(SFML_OS_IOS)
set(WINDOW_EXT_LIBS ${WINDOW_EXT_LIBS} "-framework OpenGLES -framework Foundation -framework UIKit -framework CoreGraphics")
set(WINDOW_EXT_LIBS ${WINDOW_EXT_LIBS} "-framework OpenGLES -framework Foundation -framework UIKit -framework CoreGraphics -framework QuartzCore -framework CoreMotion")
endif()
# define the sfml-window target