All mobile-compatible examples now successfully link

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

View file

@ -1,10 +1,7 @@
# iOS Demo
if(SFML_OS_IOS)
add_subdirectory(iOS)
else(SFML_OS_IOS)
# add the examples subdirectories
# CLI based examples
if (NOT SFML_OS_IOS)
if(SFML_BUILD_NETWORK)
add_subdirectory(ftp)
add_subdirectory(sockets)
@ -16,23 +13,33 @@ else(SFML_OS_IOS)
add_subdirectory(sound)
add_subdirectory(sound_capture)
endif()
if(SFML_BUILD_WINDOW)
add_subdirectory(window)
endif()
if(SFML_BUILD_GRAPHICS)
endif()
# GUI based examples
if(SFML_BUILD_WINDOW)
add_subdirectory(window)
endif()
if(SFML_BUILD_GRAPHICS)
add_subdirectory(opengl)
if (NOT SFML_OS_IOS)
add_subdirectory(joystick)
add_subdirectory(opengl)
add_subdirectory(shader)
add_subdirectory(island)
if(SFML_OS_WINDOWS)
add_subdirectory(win32)
elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
add_subdirectory(X11)
elseif(SFML_OS_MACOSX)
add_subdirectory(cocoa)
endif()
endif()
if(SFML_BUILD_GRAPHICS AND SFML_BUILD_AUDIO)
add_subdirectory(pong)
add_subdirectory(island)
if(SFML_OS_WINDOWS)
add_subdirectory(win32)
elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
add_subdirectory(X11)
elseif(SFML_OS_MACOSX)
add_subdirectory(cocoa)
endif()
endif(SFML_OS_IOS)
endif()
if(SFML_BUILD_GRAPHICS AND SFML_BUILD_AUDIO)
add_subdirectory(pong)
endif()
# Mobile specific examples
if(SFML_OS_IOS)
add_subdirectory(iOS)
endif()

View file

@ -5,6 +5,15 @@
#include <SFML/Graphics.hpp>
#include <SFML/OpenGL.hpp>
#ifdef SFML_SYSTEM_IOS
#include <SFML/Main.hpp>
#endif
#ifdef SFML_OPENGL_ES
#define glClearDepth glClearDepthf
#define glFrustum glFrustumf
#endif
#ifndef GL_SRGB8_ALPHA8
#define GL_SRGB8_ALPHA8 0x8C43
#endif

View file

@ -4,6 +4,14 @@
#include <SFML/Window.hpp>
#include <SFML/OpenGL.hpp>
#ifdef SFML_SYSTEM_IOS
#include <SFML/Main.hpp>
#endif
#ifdef SFML_OPENGL_ES
#define glClearDepth glClearDepthf
#define glFrustum glFrustumf
#endif
////////////////////////////////////////////////////////////
/// Entry point of application