From 1cf60c05ed9d418ad106dfbb1239d9423ab9817a Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Mon, 18 Feb 2019 21:49:03 -0500 Subject: [PATCH] iOS support (thanks Caleb!) --- CMakeLists.txt | 4 +++- mojoshader_internal.h | 4 ---- mojoshader_opengl.c | 5 ++++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf20d084..31598c5c 100644 --- 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 index 4c1c6ad1..cb1dacf0 100644 --- 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 index 08b9773f..cb835eaf 100644 --- 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