From 69c4a2b5d011e68a64e8a6c3f9cc111a23b8cf24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sat, 6 Jan 2024 08:18:54 -0800 Subject: [PATCH] Removed support for ios-simulator. --- makefile | 18 ----------- scripts/toolchain.lua | 75 ------------------------------------------- 2 files changed, 93 deletions(-) diff --git a/makefile b/makefile index 522371c..2132e97 100644 --- a/makefile +++ b/makefile @@ -17,8 +17,6 @@ all: $(GENIE) --gcc=osx-x64 gmake $(GENIE) --gcc=osx-arm64 gmake $(GENIE) --gcc=ios-arm gmake - $(GENIE) --gcc=ios-simulator gmake - $(GENIE) --gcc=ios-simulator64 gmake $(GENIE) xcode8 .build/projects/gmake-android-arm: @@ -112,22 +110,6 @@ ios-arm-release: .build/projects/gmake-ios-arm make -R -C .build/projects/gmake-ios-arm config=release ios-arm: ios-arm-debug ios-arm-release -.build/projects/gmake-ios-simulator: - $(GENIE) --gcc=ios-simulator gmake -ios-simulator-debug: .build/projects/gmake-ios-simulator - make -R -C .build/projects/gmake-ios-simulator config=debug -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 8a005e4..6e237c6 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -81,10 +81,7 @@ function toolchain(_buildDir, _libDir) { "linux-riscv64-gcc", "Linux (RISC-V 64, GCC compiler)" }, { "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" }, { "mingw-clang", "MinGW (clang compiler)" }, { "netbsd", "NetBSD" }, @@ -256,30 +253,12 @@ function toolchain(_buildDir, _libDir) premake.gcc.ar = "ar" location (path.join(_buildDir, "projects", _ACTION .. "-" .. _OPTIONS["gcc"])) - elseif "ios-simulator" == _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-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++" premake.gcc.ar = "ar" location (path.join(_buildDir, "projects", _ACTION .. "-tvos-arm64")) - elseif "tvos-simulator" == _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 .. "-tvos-simulator")) - elseif "linux-gcc" == _OPTIONS["gcc"] then location (path.join(_buildDir, "projects", _ACTION .. "-linux")) @@ -1018,42 +997,6 @@ function toolchain(_buildDir, _libDir) "-fembed-bitcode", } - configuration { "ios-simulator" } - targetdir (path.join(_buildDir, "ios-simulator/bin")) - objdir (path.join(_buildDir, "ios-simulator/obj")) - libdirs { path.join(_libDir, "lib/ios-simulator") } - linkoptions { - "-mios-simulator-version-min=9.0", - "-arch i386", - "--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=9.0", - "-arch i386", - "--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=9.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=9.0", - "-arch x86_64", - "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", - } - configuration { "tvos*" } linkoptions { "-lc++", @@ -1087,24 +1030,6 @@ function toolchain(_buildDir, _libDir) "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS" ..tvosPlatform .. ".sdk", } - configuration { "tvos-simulator" } - targetdir (path.join(_buildDir, "tvos-simulator/bin")) - objdir (path.join(_buildDir, "tvos-simulator/obj")) - libdirs { path.join(_libDir, "lib/tvos-simulator") } - linkoptions { - "-mtvos-simulator-version-min=9.0", - "-arch i386", - "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk", - "-L/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk/usr/lib/system", - "-F/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk/System/Library/Frameworks", - "-F/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk/System/Library/PrivateFrameworks", - } - buildoptions { - "-mtvos-simulator-version-min=9.0", - "-arch i386", - "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk", - } - configuration { "orbis" } targetdir (path.join(_buildDir, "orbis/bin")) objdir (path.join(_buildDir, "orbis/obj"))