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

[iOS] Removed support for examples, it was too much trouble and not as robust as true iOS App Xcode projects

Browse source
This commit is contained in:
Laurent Gomila 2013-09-11 23:15:08 +02:00 • committed by Jonathan De Wachter
parent 8f459cd1af
commit c35b48bcea
8 changed files with 18 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/CMakeLists.txt
View file

@ -2,16 +2,12 @@
# add the examples subdirectories
add_subdirectory(ftp)
add_subdirectory(opengl)
if(NOT IOS)
add_subdirectory(pong)
endif()
add_subdirectory(pong)
add_subdirectory(shader)
add_subdirectory(sockets)
if(NOT IOS)
add_subdirectory(sound)
add_subdirectory(sound_capture)
add_subdirectory(voip)
endif()
add_subdirectory(sound)
add_subdirectory(sound_capture)
add_subdirectory(voip)
add_subdirectory(window)
if(SFML_OS_WINDOWS)
add_subdirectory(win32)

8
examples/opengl/CMakeLists.txt
View file

@ -5,11 +5,9 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/examples/opengl)
set(SRC ${SRCROOT}/OpenGL.cpp)
# find OpenGL and GLU
if(NOT IOS)
find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR})
set(ADDITIONAL_LIBRARIES ${OPENGL_LIBRARIES})
endif()
find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR})
set(ADDITIONAL_LIBRARIES ${OPENGL_LIBRARIES})
# define the opengl target
sfml_add_example(opengl GUI_APP

13
examples/opengl/OpenGL.cpp
View file

@ -4,19 +4,6 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics.hpp>
#include <SFML/OpenGL.hpp>
#include <SFML/Main.hpp>
// Some platform-specific stuff
#ifdef SFML_OPENGL_ES
#define glClearDepth glClearDepthf
#define glFrustum glFrustumf
#define gluBuild2DMipmaps(target, internalFormat, width, height, format, type, pixels) \
glTexImage2D(target, 0, internalFormat, width, height, 0, format, type, pixels); \
glGenerateMipmapOES(GL_TEXTURE_2D);
#endif
////////////////////////////////////////////////////////////

2
examples/shader/Shader.cpp
View file

@ -3,8 +3,6 @@
// Headers
////////////////////////////////////////////////////////////
#include "Effect.hpp"
#include <SFML/Graphics.hpp>
#include <SFML/Main.hpp>
#include <vector>
#include <cmath>

8
examples/window/CMakeLists.txt
View file

@ -5,11 +5,9 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/examples/window)
set(SRC ${SRCROOT}/Window.cpp)
# find OpenGL and GLU
if(NOT IOS)
find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR})
set(ADDITIONAL_LIBRARIES ${OPENGL_LIBRARIES})
endif()
find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR})
set(ADDITIONAL_LIBRARIES ${OPENGL_LIBRARIES})
# define the window target
sfml_add_example(window GUI_APP

10
examples/window/Window.cpp
View file

@ -3,16 +3,6 @@
////////////////////////////////////////////////////////////
#include <SFML/Window.hpp>
#include <SFML/OpenGL.hpp>
#include <SFML/Main.hpp>
// Some platform-specific stuff
#ifdef SFML_OPENGL_ES
#define glClearDepth glClearDepthf
#define glFrustum glFrustumf
#endif
////////////////////////////////////////////////////////////