diff --git a/makefile b/makefile index e377204..3026a6a 100644 --- a/makefile +++ b/makefile @@ -16,6 +16,7 @@ all: $(GENIE) --gcc=osx gmake $(GENIE) --gcc=ios-arm gmake $(GENIE) --gcc=ios-simulator gmake + $(GENIE) --gcc=ios-simulator64 gmake $(GENIE) xcode4 .build/projects/gmake-android-arm: @@ -112,6 +113,14 @@ ios-simulator-release: .build/projects/gmake-ios-simulator make -R -C .build/projects/gmake-ios-simulator config=release ios-simulator: ios-simulator-debug ios-simulator-release +.build/projects/gmake-ios-simulator64: + $(GENIE) --gcc=ios-simulator64 gmake +ios-simulator64-debug: .build/projects/gmake-ios-simulator64 + make -R -C .build/projects/gmake-ios-simulator64 config=debug +ios-simulator64-release: .build/projects/gmake-ios-simulator64 + make -R -C .build/projects/gmake-ios-simulator64 config=release +ios-simulator64: ios-simulator64-debug ios-simulator64-release + rebuild-shaders: make -R -C examples rebuild diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 80375ec..ede2e9c 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -64,6 +64,7 @@ function toolchain(_buildDir, _libDir) { "ios-arm", "iOS - ARM" }, { "ios-arm64", "iOS - ARM64" }, { "ios-simulator", "iOS - Simulator" }, + { "ios-simulator64", "iOS - Simulator 64" }, { "tvos-arm64", "tvOS - ARM64" }, { "tvos-simulator", "tvOS - Simulator" }, { "mingw-gcc", "MinGW" }, @@ -272,6 +273,12 @@ function toolchain(_buildDir, _libDir) premake.gcc.ar = "ar" location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator")) + elseif "ios-simulator64" == _OPTIONS["gcc"] then + premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" + premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" + premake.gcc.ar = "ar" + location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator64")) + elseif "tvos-arm64" == _OPTIONS["gcc"] then premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" @@ -1122,6 +1129,24 @@ function toolchain(_buildDir, _libDir) "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", } + configuration { "ios-simulator64" } + targetdir (path.join(_buildDir, "ios-simulator64/bin")) + objdir (path.join(_buildDir, "ios-simulator64/obj")) + libdirs { path.join(_libDir, "lib/ios-simulator64") } + linkoptions { + "-mios-simulator-version-min=7.0", + "-arch x86_64", + "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", + "-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/usr/lib/system", + "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/Frameworks", + "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks", + } + buildoptions { + "-mios-simulator-version-min=7.0", + "-arch x86_64", + "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", + } + configuration { "tvos*" } linkoptions { "-lc++",