mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 19:29:52 +02:00
Code Issues Projects Releases Wiki Activity

Update tpt-libs

Browse Source 
Also restructure meson.build and the ghactions workflow a bit, and enable -ffunction-sections and -fdata-sections.

Note that starcatcher uploads have not been tested and most likely don't work.
This commit is contained in:
Tamás Bálint Misius
2022-08-23 11:14:06 +02:00
parent ed13f33e7a
commit 513d2cae3e
73 changed files with 971 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cross-examples/android.ini
View File

@@ -3,11 +3,13 @@ andriod_ndk_toolchain_bin = '/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuil
[properties]
# only needed if you want to run the custom target powder_apk (powder.apk)
android_platform_jar = '/opt/android-sdk/platforms/android-30/android.jar'
# android_ndk_toolchain_prefix comes from the correct cross-file in ./android/cross
android_ndk_toolchain_prefix = android_ndk_toolchain_prefix
android_platform = 'android-30'
android_platform_jar = '/opt/android-sdk/platforms/' + android_platform + '/android.jar'
java_runtime_jar = '/usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar'
[binaries]
# android_ndk_toolchain_prefix comes from the correct cross-file in ./android/cross
c = andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang')
# c = [ 'ccache', andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang') ]
cpp = andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang++')

10
cross-examples/macaa64.ini
View File

@@ -1,12 +1,6 @@
[built-in options]
c_args = [ '-arch', 'arm64', '-mmacosx-version-min=10.15' ]
cpp_args = [ '-arch', 'arm64', '-mmacosx-version-min=10.15' ]
c_link_args = [ '-arch', 'arm64', '-mmacosx-version-min=10.15' ]
cpp_link_args = [ '-arch', 'arm64', '-mmacosx-version-min=10.15' ]
[binaries]
c = 'clang'
cpp = 'clang++'
c = [ 'clang', '-arch', 'arm64' ]
cpp = [ 'clang++', '-arch', 'arm64' ]
strip = 'strip'
[host_machine]