mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 19:10:23 -10:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
39652536ab | ||
|
|
44d55466ba | ||
|
|
aef3355422 |
+57
-8
@@ -47,7 +47,7 @@ BITCODE_CONFIGURE_FLAGS=--enable-llvm-runtime --with-bitcode=yes
|
||||
# ios_$(1)_LDFLAGS
|
||||
# ios_$(1)_BITCODE_MARKER
|
||||
#
|
||||
# This handles tvos as well.
|
||||
# This handles tvos/watchos as well.
|
||||
#
|
||||
define iOSDeviceTemplate
|
||||
|
||||
@@ -156,24 +156,31 @@ endef
|
||||
|
||||
ios_sysroot = -isysroot $(XCODE_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_VERSION).sdk -miphoneos-version-min=$(IOS_VERSION_MIN)
|
||||
tvos_sysroot = -isysroot $(XCODE_DIR)/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS$(TVOS_VERSION).sdk -mtvos-version-min=$(TVOS_VERSION_MIN)
|
||||
watchos_sysroot = -isysroot $(XCODE_DIR)/Platforms/WatchOS.platform/Developer/SDKs/WatchOS$(WATCH_VERSION).sdk -mwatchos-version-min=$(WATCHOS_VERSION_MIN)
|
||||
|
||||
# explicitly disable dtrace, since it requires inline assembly, which is disabled on AppleTV (and mono's configure.ac doesn't know that (yet at least))
|
||||
ios_targettv_CONFIGURE_FLAGS = --enable-dtrace=no $(BITCODE_CONFIGURE_FLAGS)
|
||||
ios_targetwatch_CONFIGURE_FLAGS = --with-cooperative-gc=yes $(BITCODE_CONFIGURE_FLAGS)
|
||||
|
||||
ios_target32_SYSROOT = $(ios_sysroot)
|
||||
ios_target32s_SYSROOT = $(ios_sysroot)
|
||||
ios_target64_SYSROOT = $(ios_sysroot)
|
||||
ios_targettv_SYSROOT = $(tvos_sysroot)
|
||||
ios_targetwatch_SYSROOT = $(watchos_sysroot)
|
||||
|
||||
ios_target32_CPPFLAGS = -DHOST_IOS
|
||||
ios_target32s_CPPFLAGS = -DHOST_IOS
|
||||
ios_target64_CPPFLAGS = -DHOST_IOS
|
||||
ios_targettv_CPPFLAGS = -DHOST_APPLETVOS -DTARGET_APPLETVOS
|
||||
ios_targetwatch_CPPFLAGS = -DHOST_IOS -DHOST_WATCHOS
|
||||
|
||||
ios_targettv_CFLAGS = -fembed-bitcode -fno-gnu-inline-asm
|
||||
ios_targettv_CXXFLAGS = -fembed-bitcode -fno-gnu-inline-asm
|
||||
ios_targetwatch_CFLAGS = -fembed-bitcode -fno-gnu-inline-asm
|
||||
ios_targetwatch_CXXFLAGS = -fembed-bitcode -fno-gnu-inline-asm
|
||||
|
||||
ios_targettv_LDFLAGS = -Wl,-bitcode_bundle $(BITCODE_LDFLAGS)
|
||||
ios_targetwatch_LDFLAGS = -Wl,-bitcode_bundle $(BITCODE_LDFLAGS)
|
||||
|
||||
ios_targettv_AC_VARS = \
|
||||
ac_cv_func_system=no \
|
||||
@@ -185,6 +192,7 @@ ios_targettv_AC_VARS = \
|
||||
ac_cv_func_execve=no \
|
||||
ac_cv_func_execvp=no \
|
||||
ac_cv_func_signal=no
|
||||
ios_targetwatch_AC_VARS = $(ios_targettv_AC_VARS)
|
||||
|
||||
# ios_target32_BITCODE_MARKER=-fembed-bitcode-marker
|
||||
$(eval $(call iOSDeviceTemplate,target32,armv7,arm))
|
||||
@@ -192,6 +200,7 @@ $(eval $(call iOSDeviceTemplate,target32s,armv7s,arm))
|
||||
# ios_target64_BITCODE_MARKER=-fembed-bitcode-marker
|
||||
$(eval $(call iOSDeviceTemplate,target64,arm64,aarch64))
|
||||
$(eval $(call iOSDeviceTemplate,targettv,arm64,aarch64))
|
||||
$(eval $(call iOSDeviceTemplate,targetwatch,armv7k,armv7k))
|
||||
|
||||
##
|
||||
# Simulator builds
|
||||
@@ -201,11 +210,15 @@ $(eval $(call iOSDeviceTemplate,targettv,arm64,aarch64))
|
||||
# $(2): arch (i386 or x86_64)
|
||||
#
|
||||
# Flags:
|
||||
# ios_$(1)_SYSROOT
|
||||
# ios_$(1)_AC_VARS
|
||||
# ios_$(1)_CFLAGS
|
||||
# ios_$(1)_CPPFLAGS
|
||||
# ios_$(1)_CXXFLAGS
|
||||
# ios_$(1)_LDFLAGS
|
||||
#
|
||||
# This handles tvos/watchos as well.
|
||||
#
|
||||
define iOSSimulatorTemplate
|
||||
|
||||
_ios_$(1)_CC=$$(CCACHE) $$(PLATFORM_BIN)/clang
|
||||
@@ -224,26 +237,23 @@ _ios_$(1)_AC_VARS= \
|
||||
|
||||
_ios_$(1)_CFLAGS= \
|
||||
$$(ios_CFLAGS) \
|
||||
-isysroot $$(XCODE_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$$(IOS_VERSION).sdk -mios-simulator-version-min=$$(IOS_VERSION_MIN) \
|
||||
$$(ios_$(1)_SYSROOT) \
|
||||
-arch $(2) \
|
||||
-Wl,-application_extension \
|
||||
-DHOST_IOS \
|
||||
$$(ios_$(1)_CFLAGS)
|
||||
|
||||
_ios_$(1)_CPPFLAGS= \
|
||||
$$(ios_CPPFLAGS) \
|
||||
-isysroot $$(XCODE_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$$(IOS_VERSION).sdk -mios-simulator-version-min=$$(IOS_VERSION_MIN) \
|
||||
$$(ios_$(1)_SYSROOT) \
|
||||
-arch $(2) \
|
||||
-Wl,-application_extension \
|
||||
-DHOST_IOS \
|
||||
$$(ios_$(1)_CPPFLAGS)
|
||||
|
||||
_ios_$(1)_CXXFLAGS= \
|
||||
$$(ios_CXXFLAGS) \
|
||||
-isysroot $$(XCODE_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$$(IOS_VERSION).sdk -mios-simulator-version-min=$$(IOS_VERSION_MIN) \
|
||||
$$(ios_$(1)_SYSROOT) \
|
||||
-arch $(2) \
|
||||
-Wl,-application_extension\
|
||||
-DHOST_IOS \
|
||||
$$(ios_$(1)_CXXFLAGS)
|
||||
|
||||
_ios_$(1)_LDFLAGS= \
|
||||
@@ -272,7 +282,8 @@ _ios_$(1)_CONFIGURE_FLAGS= \
|
||||
--enable-maintainer-mode \
|
||||
--enable-minimal=com,remoting,shared_perfcounters \
|
||||
--with-tls=pthread \
|
||||
--without-ikvm-native
|
||||
--without-ikvm-native \
|
||||
$$(ios_$(1)_CONFIGURE_FLAGS)
|
||||
|
||||
# _ios_$(1)_CONFIGURE_FLAGS += --enable-extension-module=xamarin
|
||||
|
||||
@@ -297,8 +308,46 @@ TARGETS += ios-$(1)
|
||||
|
||||
endef
|
||||
|
||||
ios_sim_sysroot = -isysroot $(XCODE_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(IOS_VERSION).sdk -mios-simulator-version-min=$(IOS_VERSION_MIN)
|
||||
tvos_sim_sysroot = -isysroot $(XCODE_DIR)/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator$(TVOS_VERSION).sdk -mtvos-simulator-version-min=$(TVOS_VERSION_MIN)
|
||||
watchos_sim_sysroot = -isysroot $(XCODE_DIR)/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator$(WATCH_VERSION).sdk -mwatchos-simulator-version-min=$(WATCHOS_VERSION_MIN)
|
||||
|
||||
ios_sim32_SYSROOT = $(ios_sim_sysroot)
|
||||
ios_sim64_SYSROOT = $(ios_sim_sysroot)
|
||||
ios_simtv_SYSROOT = $(tvos_sim_sysroot)
|
||||
ios_simwatch_SYSROOT = $(watchos_sim_sysroot)
|
||||
|
||||
ios_simwatch_CONFIGURE_FLAGS = --with-cooperative-gc=yes
|
||||
|
||||
ios_sim32_CPPFLAGS = -DHOST_IOS
|
||||
ios_sim64_CPPFLAGS = -DHOST_IOS
|
||||
ios_simtv_CPPFLAGS = -DHOST_APPLETVOS -DTARGET_APPLETVOS
|
||||
ios_simwatch_CPPFLAGS = -DHOST_IOS -DHOST_WATCHOS
|
||||
|
||||
ios_simtv_AC_VARS = \
|
||||
ac_cv_func_pthread_kill=no \
|
||||
ac_cv_func_kill=no \
|
||||
ac_cv_func_sigaction=no \
|
||||
ac_cv_func_fork=no \
|
||||
ac_cv_func_execv=no \
|
||||
ac_cv_func_execve=no \
|
||||
ac_cv_func_execvp=no \
|
||||
ac_cv_func_signal=no
|
||||
ios_simwatch_AC_VARS = \
|
||||
ac_cv_func_system=no \
|
||||
ac_cv_func_pthread_kill=no \
|
||||
ac_cv_func_kill=no \
|
||||
ac_cv_func_sigaction=no \
|
||||
ac_cv_func_fork=no \
|
||||
ac_cv_func_execv=no \
|
||||
ac_cv_func_execve=no \
|
||||
ac_cv_func_execvp=no \
|
||||
ac_cv_func_signal=no
|
||||
|
||||
$(eval $(call iOSSimulatorTemplate,sim32,i386))
|
||||
$(eval $(call iOSSimulatorTemplate,sim64,x86_64))
|
||||
$(eval $(call iOSSimulatorTemplate,simtv,x86_64))
|
||||
$(eval $(call iOSSimulatorTemplate,simwatch,i386))
|
||||
|
||||
$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(wildcard $(TOP)/tools/offsets-tool/*.cs)
|
||||
$(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
|
||||
|
||||
Reference in new issue
Block a user