From 708a4c84958831f991a819a3eb0a96d4bf59af9a Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 26 Sep 2021 23:08:04 +1000 Subject: [PATCH] Fix iOS compile instructions --- readme.md | 4 ++-- src/Platform_Posix.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/readme.md b/readme.md index b6159ae5c..29148b688 100644 --- a/readme.md +++ b/readme.md @@ -142,9 +142,9 @@ Use Android Studio or run gradlew in android folder (TODO explain more detailed) #### iOS -```clang *.c interop_ios.m -framework UIKit -framework OpenGLES -framework Foundation -lobjc``` +```clang *.c interop_ios.m -framework UIKit -framework OpenGLES -framework CoreGraphics -framework QuartzCore -framework Foundation``` -iOS version is unfinished because of lack of access to suitable devices for me to test with +iOS version will have issues as it's incomplete and only tested in iOS Simulator ##### Other diff --git a/src/Platform_Posix.c b/src/Platform_Posix.c index 287236c84..1404ee566 100644 --- a/src/Platform_Posix.c +++ b/src/Platform_Posix.c @@ -653,6 +653,8 @@ void Process_Exit(cc_result code) { exit(code); } /* Opening browser/starting shell is not really standardised */ #if defined CC_BUILD_ANDROID /* Implemented in Platform_Android.c */ +#elif defined CC_BUILD_IOS +/* implemented in interop_ios.m */ #elif defined CC_BUILD_MACOS cc_result Process_StartOpen(const cc_string* args) { UInt8 str[NATIVE_STR_LEN]; @@ -675,8 +677,6 @@ cc_result Process_StartOpen(const cc_string* args) { Process_RawStart("open", cmd); return 0; } -#elif defined CC_BUILD_IOS -/* implemented in interop_ios.m */ #else cc_result Process_StartOpen(const cc_string* args) { char str[NATIVE_STR_LEN]; @@ -691,7 +691,7 @@ cc_result Process_StartOpen(const cc_string* args) { #endif /* Retrieving exe path is completely OS dependant */ -#if defined CC_BUILD_DARWIN +#if defined CC_BUILD_MACOS static cc_result Process_RawGetExePath(char* path, int* len) { Mem_Set(path, '\0', NATIVE_STR_LEN); cc_uint32 size = NATIVE_STR_LEN; @@ -791,7 +791,7 @@ const char* const Updater_OGL = "ClassiCube.rpi"; #else const char* const Updater_OGL = NULL; #endif -#elif defined CC_BUILD_DARWIN +#elif defined CC_BUILD_MACOS #if __x86_64__ const char* const Updater_OGL = "ClassiCube.64.osx"; #elif __i386__ @@ -1209,7 +1209,7 @@ int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, cc_string* arg int i, count; argc--; argv++; /* skip executable path argument */ -#ifdef CC_BUILD_DARWIN +#ifdef CC_BUILD_MACOS /* Sometimes a "-psn_0_[number]" argument is added before actual args */ if (argc) { static const cc_string psn = String_FromConst("-psn_0_"); @@ -1255,7 +1255,7 @@ cc_result Platform_SetDefaultCurrentDirectory(int argc, char **argv) { if (path[i] == '/') break; } -#ifdef CC_BUILD_DARWIN +#ifdef CC_BUILD_MACOS static const cc_string bundle = String_FromConst(".app/Contents/MacOS/"); cc_string raw = String_Init(path, len, 0);