iOS support (thanks Caleb!)

icculus · Feb 19, 2019 · 1cf60c0 · 1cf60c0
1 parent 56ec97f
commit 1cf60c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,7 +94,9 @@ IF(COMPILER_SUPPORT)
 ENDIF(COMPILER_SUPPORT)
 
 IF(APPLE)
-    find_library(CARBON_FRAMEWORK Carbon)  # Stupid Gestalt.
+    IF(NOT IOS)
+        find_library(CARBON_FRAMEWORK Carbon)  # Stupid Gestalt.
+    ENDIF(NOT IOS)
 ENDIF(APPLE)
 
 IF(NOT PROFILE_D3D)

diff --git a/mojoshader_internal.h b/mojoshader_internal.h
@@ -23,10 +23,6 @@
 #define DEBUG_TOKENIZER \
     (DEBUG_PREPROCESSOR || DEBUG_ASSEMBLER_PARSER || DEBUG_LEXER)
 
-#if (defined(__APPLE__) && defined(__MACH__))
-#define PLATFORM_MACOSX 1
-#endif
-
 // This is the highest shader version we currently support.
 
 #define MAX_SHADER_MAJOR 3

diff --git a/mojoshader_opengl.c b/mojoshader_opengl.c
@@ -20,8 +20,11 @@
 #endif
 
 #if (defined(__APPLE__) && defined(__MACH__))
+#include "TargetConditionals.h"
+#if !TARGET_OS_IPHONE && !TARGET_OS_TV
 #define PLATFORM_MACOSX 1
-#endif
+#endif /* !TARGET_OS_IPHONE && !TARGET_OS_TV */
+#endif /* (defined(__APPLE__) && defined(__MACH__)) */
 
 #if PLATFORM_MACOSX
 #include <Carbon/Carbon.h>