diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-02-02 03:12:03 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-02-02 03:12:03 +0000 |
| commit | 8f79e7a5592a60040d647dff9a24cd63ff42393e (patch) | |
| tree | 76d1f05d048cd13ceb2be9591f9587584dabda76 | |
| parent | Fixed MacOS build warnings (diff) | |
| download | DiligentTools-8f79e7a5592a60040d647dff9a24cd63ff42393e.tar.gz DiligentTools-8f79e7a5592a60040d647dff9a24cd63ff42393e.zip | |
Enabled iOS build
| -rw-r--r-- | External/libtiff-4.0.3/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | External/libtiff-4.0.3/libtiff/tif_config.h | 2 | ||||
| -rw-r--r-- | External/libtiff-4.0.3/libtiff/tiffconf.h | 4 | ||||
| -rw-r--r-- | External/lua-5.2.3/src/loslib.c | 4 | ||||
| -rw-r--r-- | External/zlib-1.2.8/CMakeLists.txt | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/External/libtiff-4.0.3/CMakeLists.txt b/External/libtiff-4.0.3/CMakeLists.txt index 1f3bf28..36581af 100644 --- a/External/libtiff-4.0.3/CMakeLists.txt +++ b/External/libtiff-4.0.3/CMakeLists.txt @@ -47,7 +47,7 @@ set(SOURCE if(PLATFORM_WIN32) list(APPEND SOURCE libtiff/tif_win32.c) -elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS) +elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS) list(APPEND SOURCE libtiff/tif_unix.c) else() message(FATAL_ERROR "Unknown platform") diff --git a/External/libtiff-4.0.3/libtiff/tif_config.h b/External/libtiff-4.0.3/libtiff/tif_config.h index c25568d..fcc5602 100644 --- a/External/libtiff-4.0.3/libtiff/tif_config.h +++ b/External/libtiff-4.0.3/libtiff/tif_config.h @@ -6,7 +6,7 @@ # include "tif_config.android.h" -#elif defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) +#elif defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_IOS) # include "tif_config.linux.h" diff --git a/External/libtiff-4.0.3/libtiff/tiffconf.h b/External/libtiff-4.0.3/libtiff/tiffconf.h index e85055b..fb73ed9 100644 --- a/External/libtiff-4.0.3/libtiff/tiffconf.h +++ b/External/libtiff-4.0.3/libtiff/tiffconf.h @@ -2,7 +2,7 @@ # include "tiffconf.vc.h" -#elif defined(PLATFORM_ANDROID) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) +#elif defined(PLATFORM_ANDROID) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_IOS) # include "tiffconf.linux.h" @@ -10,4 +10,4 @@ # error Unsupported platform -#endif
\ No newline at end of file +#endif diff --git a/External/lua-5.2.3/src/loslib.c b/External/lua-5.2.3/src/loslib.c index 052ba17..1f14873 100644 --- a/External/lua-5.2.3/src/loslib.c +++ b/External/lua-5.2.3/src/loslib.c @@ -78,6 +78,9 @@ static int os_execute (lua_State *L) { +#ifdef PLATFORM_IOS + return luaL_error(L, "os_execute is not available on iOS"); +#else const char *cmd = luaL_optstring(L, 1, NULL); int stat = system(cmd); if (cmd != NULL) @@ -86,6 +89,7 @@ static int os_execute (lua_State *L) { lua_pushboolean(L, stat); /* true if there is a shell */ return 1; } +#endif } diff --git a/External/zlib-1.2.8/CMakeLists.txt b/External/zlib-1.2.8/CMakeLists.txt index 35cb15e..648c06d 100644 --- a/External/zlib-1.2.8/CMakeLists.txt +++ b/External/zlib-1.2.8/CMakeLists.txt @@ -44,7 +44,7 @@ if(MSVC) target_compile_options(ZLib PRIVATE /W3 /wd4131 /wd4127 /wd4244 /wd4996) endif() -if(PLATFORM_ANDROID OR PLATFORM_MACOS) +if(PLATFORM_ANDROID OR PLATFORM_MACOS OR PLATFORM_IOS) target_compile_definitions(ZLib PRIVATE HAVE_UNISTD_H) endif() |