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

All mobile-compatible examples now successfully link

Browse source
This commit is contained in:
Ceylo 2018-04-11 21:45:36 +02:00 • committed by Lukas Dürrenberger
parent b516a3ae2b
commit 82c2f4c05e
7 changed files with 137 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,6 +132,8 @@ endif()
if(SFML_OS_ANDROID)
target_link_libraries(sfml-graphics PRIVATE z EGL GLESv1_CM)
elseif(SFML_OS_IOS)
target_link_libraries(sfml-graphics PRIVATE z bz2)
endif()
sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY")

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

@ -251,14 +251,14 @@ endif()
if(SFML_OPENGL_ES)
if(SFML_OS_IOS)
target_link_libraries(sfml-window PRIVATE "-framework OpenGLES")
sfml_add_external(OpenGL LINK "-framework OpenGLES")
elseif(SFML_OS_ANDROID)
target_link_libraries(sfml-window PRIVATE EGL GLESv1_CM)
sfml_add_external(OpenGL LINK "EGL" "GLESv1_CM")
endif()
else()
sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_LIBRARIES")
target_link_libraries(sfml-window PRIVATE OpenGL)
sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_gl_LIBRARY")
endif()
target_link_libraries(sfml-window PRIVATE OpenGL)
if(SFML_OS_WINDOWS AND NOT SFML_COMPILER_MSVC)
include(CheckIncludeFile)