kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #592 from tanis2000/tvos

Browse Source 
tvOS support
This commit is contained in:
Joshua Granick
2015-10-02 09:49:28 -07:00
parent cb619f6a29 06487ad363
commit 7e182981fe
27 changed files with 1988 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
project/Build.xml
View File

@@ -8,6 +8,7 @@
<set name="lime-legacy" value="1" if="legacy || lime_legacy" />
<set name="ios" value="1" if="iphone" />
<set name="tvos" value="1" if="appletv" />
<set name="LIME_CAIRO" value="1" />
<set name="LIME_CURL" value="1" unless="emscripten" />
@@ -147,6 +148,8 @@
<compilerflag value="-DLIME_OPENGL" />
<compilerflag value="-I${DEVELOPER_DIR}/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS${TVOS_VER}.sdk/" if="tvos" />
<file name="src/graphics/opengl/OpenGLBindings.cpp" />
</section>
@@ -185,7 +188,9 @@
<compilerflag value="-DLIME_SDL" />
<compilerflag value="-DNATIVE_TOOLKIT_SDL_ANGLE" if="NATIVE_TOOLKIT_SDL_ANGLE" />
<compilerflag value="-D__IPHONEOS__" if="ios" />
<compilerflag value="-D__IPHONEOS__" if="ios || tvos" />
<compilerflag value="-D__APPLETVOS__" if="tvos" />
<compilerflag value="-DAPPLETV" if="tvos" />
<file name="src/backend/sdl/SDLApplication.cpp" />
<file name="src/backend/sdl/SDLWindow.cpp" />
@@ -200,7 +205,7 @@
<compilerflag value="-DSTATIC_LINK" if="emscripten" />
<file name="${HXCPP}/project/libs/zlib/ZLib.cpp" if="emscripten || ios || static_link" />
<file name="${HXCPP}/project/libs/zlib/ZLib.cpp" if="emscripten || ios || static_link || tvos" />
</section>
@@ -262,7 +267,7 @@
<files id="native-toolkit-neko" if="LIME_NEKO" />
<files id="native-toolkit-nfd" if="LIME_NFD" />
<files id="native-toolkit-ogg" if="LIME_OGG" />
<files id="native-toolkit-openal" if="LIME_OPENAL" unless="mac || iphone || android || emscripten" />
<files id="native-toolkit-openal" if="LIME_OPENAL" unless="mac || iphone || android || emscripten || tvos" />
<files id="native-toolkit-openal-android" if="LIME_OPENAL android" />
<files id="native-toolkit-pixman" if="LIME_PIXMAN" />
<files id="native-toolkit-png" if="LIME_PNG" />
@@ -350,6 +355,22 @@
</section>
<section if="tvos">
<vflag name="-framework" value="UIKit" />
<vflag name="-framework" value="Foundation" />
<vflag name="-framework" value="CoreAudio" />
<vflag name="-framework" value="CoreVideo" />
<vflag name="-framework" value="OpenGLES" />
<vflag name="-framework" value="AudioToolbox" />
<vflag name="-framework" value="AudioUnit" />
<vflag name="-framework" value="OpenAL"/>
<lib name="-ldl" />
<lib name="-lEGL" />
<lib name="-lGLESv2" />
</section>
</section>
</target>

4
project/src/backend/sdl/SDLApplication.cpp
View File

@@ -54,7 +54,7 @@ namespace lime {
TouchEvent touchEvent;
WindowEvent windowEvent;
#if defined(IOS) || defined(ANDROID)
#if defined(IOS) || defined(ANDROID) || defined(TVOS)
for (int i = 0; i < SDL_NumJoysticks (); i++) {
if (strstr (SDL_JoystickNameForIndex (i), "Accelerometer")) {
@@ -166,7 +166,7 @@ namespace lime {
case SDL_JOYAXISMOTION:
#if defined(IOS) || defined(ANDROID)
#if defined(IOS) || defined(ANDROID) || defined(TVOS)
if (event->jaxis.which == accelerometerID) {
ProcessSensorEvent (event);

2
project/src/graphics/opengl/OpenGL.h
View File

@@ -14,7 +14,7 @@
#include <gl2.h>
#include <gl2ext.h>
#elif defined (IPHONE)
#elif defined (IPHONE) || defined(APPLETV)
#define LIME_GLES
#include <OpenGLES/ES1/gl.h>