ci: update build options

This commit is contained in:
Andrei Alexeyev 2022-12-24 13:42:34 +01:00
parent 281a39a4f5
commit 3e37be3d8f
No known key found for this signature in database
GPG key ID: 72D26128040B9690
16 changed files with 50 additions and 34 deletions

View file

@ -66,6 +66,7 @@ jobs:
source ${{ env.EM_CACHE_FOLDER }}/emsdk_env.sh
meson setup build/
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/emscripten-ephemeral-ci.ini
--cross-file misc/ci/emscripten-build.ini
--prefix=$(pwd)/build-test

View file

@ -72,6 +72,7 @@ jobs:
- name: Configure
run: >
meson setup build/
--native-file misc/ci/common-options.ini
--native-file misc/ci/linux-x86_64-build-test-ci.ini
--prefix=$(pwd)/build-test
@ -132,6 +133,7 @@ jobs:
- name: Configure
run: >
meson setup build/
--native-file misc/ci/common-options.ini
--native-file misc/ci/macos-x86_64-build-test-ci.ini
--prefix=$(pwd)/build-test
@ -168,6 +170,7 @@ jobs:
- name: Configure Taisei (Meson)
run: >
meson setup build/
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/windows-llvm_mingw-x86_64-build-test-ci.ini
--prefix=$(pwd)/build-test
@ -243,6 +246,7 @@ jobs:
source ${{ env.EM_CACHE_FOLDER }}/emsdk_env.sh
meson setup build/
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/emscripten-ephemeral-ci.ini
--cross-file misc/ci/emscripten-build.ini
--prefix=$(pwd)/build-test
@ -280,7 +284,9 @@ jobs:
switch/crossfile.sh > misc/ci/switch-crossfile-ci.ini
meson setup build/
--cross-file=misc/ci/switch-crossfile-ci.ini
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/switch-options.ini
--cross-file misc/ci/switch-crossfile-ci.ini
--prefix=$(pwd)/build-test
- name: Build

View file

@ -74,6 +74,7 @@ jobs:
git fetch --force --tags # see: https://github.com/actions/checkout/issues/290
meson setup build/linux
--native-file misc/ci/common-options.ini
--native-file misc/ci/linux-x86_64-build-release.ini
--prefix=$(pwd)/build-release
@ -238,6 +239,7 @@ jobs:
meson setup build/windows
-Dangle_libegl=$(pwd)/angle-compiled/lib/Windows-x64-dll/libEGL.dll
-Dangle_libgles=$(pwd)/angle-compiled/lib/Windows-x64-dll/libGLESv2.dll
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/windows-llvm_mingw-x86_64-build-release.ini
--prefix=$(pwd)/build-release
@ -316,6 +318,7 @@ jobs:
meson setup build/windows
-Dangle_libegl=$(pwd)/angle-compiled/lib/Windows-x86-dll/libEGL.dll
-Dangle_libgles=$(pwd)/angle-compiled/lib/Windows-x86-dll/libGLESv2.dll
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/windows-llvm_mingw-x86-build-release.ini
--prefix=$(pwd)/build-release
@ -432,6 +435,7 @@ jobs:
source ${{ env.EM_CACHE_FOLDER }}/emsdk_env.sh
meson setup build/emscripten
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/emscripten-build.ini
--cross-file misc/ci/emscripten-ephemeral-ci.ini
--prefix=$(pwd)/build-release
@ -494,7 +498,9 @@ jobs:
switch/crossfile.sh > misc/ci/switch-crossfile-ci.ini
meson setup build/nx
--cross-file=misc/ci/switch-crossfile-ci.ini
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/switch-options.ini
--cross-file misc/ci/switch-crossfile-ci.ini
--prefix=$(pwd)/build-release
- name: Set Package Version

View file

@ -0,0 +1,9 @@
[project options]
deprecation_warnings = 'no-error'
vfs_zip = 'enabled'
docs = 'enabled'
use_libcrypto = 'disabled'
force_vendored_shader_tools = true
validate_glsl = 'disabled'

View file

@ -17,6 +17,10 @@ file_packager = toolchain / 'tools/file_packager'
needs_exe_wrapper = true
source_map_base = 'http://localhost:6931/'
[project options]
validate_glsl = 'enabled'
vfs_zip = 'disabled'
[built-in options]
b_ndebug = 'true'
b_pie = false
@ -34,11 +38,6 @@ default_library = 'static'
optimization = 's'
wrap_mode = 'forcefallback'
[project options]
enable_zip = false
force_vendored_shader_tools = true
package_data = 'false'
[sdl2:project options]
use_audio_alsa = 'disabled'
use_audio_pulseaudio = 'disabled'

View file

@ -5,9 +5,7 @@ cflags = ['-march='+march, '-mtune='+mtune]
ldflags = []
[project options]
deprecation_warnings = 'no-error'
use_libcrypto = 'false'
install_relative = 'true'
install_relocatable = 'enabled'
[built-in options]
c_args = cflags

View file

@ -5,9 +5,6 @@ mtune = 'skylake'
cflags = ['-march='+march, '-mtune='+mtune]
ldflags = []
[project options]
deprecation_warnings = 'no-error'
[built-in options]
c_args = cflags
c_link_args = ldflags

View file

@ -21,7 +21,7 @@ pkgconfig = 'pkg-config'
needs_exe_wrapper = true
[project options]
deprecation_warnings = 'no-error'
install_macos_bundle = 'enabled'
[built-in options]
c_args = cflags

View file

@ -5,9 +5,6 @@ macos_min = '10.9'
cflags = ['-mmacosx-version-min='+macos_min, '-march='+march, '-mtune='+mtune]
ldflags = ['-mmacosx-version-min='+macos_min]
[project options]
deprecation_warnings = 'no-error'
[built-in options]
c_args = cflags
c_link_args = ldflags

View file

@ -7,9 +7,6 @@ cflags = ['-mmacosx-version-min='+macos_min, '-march='+march, '-mtune='+mtune]
# NOTE: might need to pass -sdk_version to the linker as well, not sure how that works...
ldflags = ['-mmacosx-version-min='+macos_min]
[project options]
deprecation_warnings = 'no-error'
[built-in options]
c_args = cflags
c_link_args = ldflags

View file

@ -0,0 +1,4 @@
[project options]
validate_glsl = 'enabled'

View file

@ -34,10 +34,9 @@ windres = exeprefix+'windres'
ld = exeprefix+'ld'
[project options]
deprecation_warnings = 'no-error'
install_angle = true
r_gles30 = true
shader_transpiler = true
r_gles30 = 'enabled'
shader_transpiler = 'enabled'
[built-in options]
c_args = cflags

View file

@ -34,10 +34,9 @@ windres = exeprefix+'windres'
ld = exeprefix+'ld'
[project options]
deprecation_warnings = 'no-error'
install_angle = true
r_gles30 = true
shader_transpiler = true
r_gles30 = 'enabled'
shader_transpiler = 'enabled'
[built-in options]
c_args = cflags

View file

@ -34,9 +34,6 @@ widl = exeprefix+'widl'
windres = exeprefix+'windres'
ld = exeprefix+'ld'
[project options]
deprecation_warnings = 'no-error'
[built-in options]
c_args = cflags
c_link_args = ldflags

View file

@ -5,5 +5,15 @@ set -e
source $(pwd)/.mac_env
mkdir -p $MAC_BUILD_DIR/compiled $MESON_BUILD_ROOT_MACOS_COMBINED
meson setup --native-file $TAISEI_ROOT/misc/ci/macos-x86_64-build-release.ini --prefix $MESON_BUILD_ROOT_MACOS_X64_COMPILED $MESON_BUILD_ROOT_MACOS_X64 $TAISEI_ROOT
meson setup --cross-file $TAISEI_ROOT/misc/ci/macos-aarch64-build-release.ini --prefix $MESON_BUILD_ROOT_MACOS_AARCH64_COMPILED $MESON_BUILD_ROOT_MACOS_AARCH64 $TAISEI_ROOT
meson setup \
--native-file $TAISEI_ROOT/misc/ci/common-options.ini \
--native-file $TAISEI_ROOT/misc/ci/macos-x86_64-build-release.ini \
--prefix $MESON_BUILD_ROOT_MACOS_X64_COMPILED \
$MESON_BUILD_ROOT_MACOS_X64 \
$TAISEI_ROOT
meson setup \
--cross-file $TAISEI_ROOT/misc/ci/common-options.ini \
--cross-file $TAISEI_ROOT/misc/ci/macos-aarch64-build-release.ini \
--prefix $MESON_BUILD_ROOT_MACOS_AARCH64_COMPILED \
$MESON_BUILD_ROOT_MACOS_AARCH64 \
$TAISEI_ROOT

View file

@ -33,9 +33,6 @@ pkgconfig = '$(bin_path pkg-config)'
elf2nro = '$(which elf2nro)'
nacptool = '$(which nacptool)'
[project options]
deprecation_warnings = 'no-error'
[built-in options]
c_args = [$(meson_arg_list $CPPFLAGS $CFLAGS)]
c_link_args = [$(meson_arg_list $LDFLAGS $LIBS $ADDITIONAL_LINK_FLAGS)]