fix 3ds and switch build options in the build configuration

Author: Totto16

assets/oopetris.desktop.in

@@ -2,7 +2,7 @@
 Version=1.0
 Type=Application
 Name=OOPetris
-Comment=A tetris clone in OOP
+Comment=A Tetris clone in OOP
 Exec=oopetris
 Icon=@APP_NAME@
 Terminal=false

meson.build

@@ -14,7 +14,6 @@ project(
     version: '0.5.3',
 )
 
-
 subdir('tools/options')
 
 subdir('tools/dependencies')
@@ -75,7 +74,6 @@ else
 
 endif
 
-
 if get_option('tests')
     subdir('tests')
 endif

platforms/build-3ds.sh

@@ -45,6 +45,9 @@ export ENDIANESS="little"
 
 export COMMON_FLAGS="'-march=armv6k','-mtune=mpcore','-mfloat-abi=hard', '-mtp=soft','-mword-relocations', '-ffunction-sections', '-fdata-sections'"
 
+# compat flags for some POSIX functions
+export EXTRA_COMPILE_FLAGS="'-DNOSTYLUS','-D_XOPEN_SOURCE'"
+
 export COMPILE_FLAGS="'-D_3DS','-D__3DS__', '-isystem', '$LIBCTRU/include', '-I$PORTLIBS_PATH_3DS/include'"
 
 export LINK_FLAGS="'-L$PORTLIBS_LIB','-L$LIBCTRU_LIB','-fPIE','-specs=$ARCH_DEVKIT_FOLDER/$TOOL_PREFIX/lib/3dsx.specs'"
@@ -85,9 +88,9 @@ sdl2-config='$BIN_DIR/bin/sdl2-config'
 
 [built-in options]
 c_std = 'c11'
-cpp_std = 'c++20'
-c_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
-cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
+cpp_std = 'c++23'
+c_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
+cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
 c_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
 cpp_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
 
@@ -98,9 +101,9 @@ needs_exe_wrapper = true
 library_dirs= ['$LIBCTRU_LIB', '$PORTLIBS_LIB']
 libctru='$LIBCTRU'
 
-APP_NAME	= 'sdl_example'
-APP_AUTHOR 	= 'Totto16'
-APP_DESC = 'SDL Example'
+APP_NAME	= 'oopetris'
+APP_AUTHOR 	= 'coder2k'
+APP_DESC = 'A Tetris clone in OOP'
 
 USE_SMDH    = true
 

platforms/build-switch.sh

@@ -43,6 +43,9 @@ export ENDIANESS="little"
 
 export COMMON_FLAGS="'-ftls-model=local-exec','-march=armv8-a+crc+crypto','-mtune=cortex-a57','-mtp=soft','-ftls-model=local-exec','-fPIC','-ffunction-sections','-fdata-sections'"
 
+# compat flags for some POSIX functions
+export EXTRA_COMPILE_FLAGS="'-DNOSTYLUS','-D_XOPEN_SOURCE'"
+
 export COMPILE_FLAGS="'-D__SWITCH__','-isystem','$LIBNX/include','-I$PORTLIBS_PATH_SWITCH/include'"
 
 export LINK_FLAGS="'-L$PORTLIBS_LIB','-L$LIBNX_LIB','-fPIE','-specs=$DEVKITPRO/libnx/switch.specs'"
@@ -83,9 +86,9 @@ sdl2-config='$BIN_DIR/sdl2-config'
 
 [built-in options]
 c_std = 'c11'
-cpp_std = 'c++20'
-c_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
-cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
+cpp_std = 'c++23'
+c_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
+cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
 c_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
 cpp_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
 
@@ -96,9 +99,9 @@ needs_exe_wrapper = true
 library_dirs= ['$LIBNX_LIB', '$PORTLIBS_LIB']
 libnx='$LIBNX'
 
-APP_NAME	= 'sdl_example'
-APP_AUTHOR 	= 'Totto16'
-APP_VERSION = '1.0'
+APP_NAME	= 'oopetris'
+APP_AUTHOR 	= 'coder2k'
+APP_VERSION = '0.5.3'
 
 USE_NACP    = true
 

tools/dependencies/meson.build

@@ -2,8 +2,8 @@
 
 only_allow_native_libs = false
 if meson.is_cross_build()
-    if host_machine.system() == 'switch'
-        # we do not link to code that was compiled with gcc 10.1, the code we link with is all compiled with gcc 13.2
+    if host_machine.system() == 'switch' or host_machine.system() == '3ds'
+        # we do not link to code that was compiled with gcc 10.1 / gcc 7.1, the code we link with is all compiled with gcc 13.2
         core_lib += {
             'compile_args': [core_lib.get('compile_args'), '-Wno-psabi'],
         }
@@ -14,7 +14,6 @@ endif
 
 
 
-
 sdl2_dep = dependency(
     'sdl2',
     'SDL2',
@@ -77,7 +76,7 @@ if mpg123_dep.found()
     sdl2_mixer_flags += {'mpg123': 'enabled'}
     sdl2_mixer_defines += '-DAUDIO_WITH_MP3_SUPPORT'
 else
-    mpg123_dep = cpp.find_library('mpg123', required: only_allow_native_libs)
+    mpg123_dep = cpp.find_library('mpg123', required: false)
     if mpg123_dep.found()
         sdl2_mixer_flags += {'mpg123': 'enabled'}
         sdl2_mixer_defines += '-DAUDIO_WITH_MP3_SUPPORT'
@@ -87,7 +86,6 @@ else
 endif
 
 
-
 sdl2_mixer_dep = dependency(
     'sdl2_mixer',
     'SDL2_mixer',
@@ -100,58 +98,49 @@ graphics_lib += {
     'compile_args': [graphics_lib.get('compile_args'), sdl2_mixer_defines],
 }
 
-if (meson.is_cross_build() and host_machine.system() == 'switch')
-
-    fmt_lib = dependency(
-        'fmt',
-        required: false,
-        allow_fallback: false,
-    )
-
-    if fmt_lib.found()
-        core_lib += {'deps': [core_lib.get('deps'), fmt_lib]}
-    else
-
-        fmt_header_only_dep = dependency(
-            'fmt_header_only',
-            required: true,
-            allow_fallback: true,
-            default_options: {'default_library': 'static'},
-        )
+fmt_use_header_only = false
 
-        meson.override_dependency('fmt', fmt_header_only_dep)
+if (
+    meson.is_cross_build()
+    and (host_machine.system() == 'switch'
+    or host_machine.system() == '3ds')
+)
+    fmt_use_header_only = true
+    # clang with libc++ creates some really long and confusing linker errors, so just use the header only library
+elif cpp.get_id() == 'clang' and build_with_libcpp
+    fmt_use_header_only = true
+endif
 
-        core_lib += {'deps': [core_lib.get('deps'), fmt_header_only_dep]}
-    endif
 
+if fmt_use_header_only
+    fmt_header_only_dep = dependency(
+        'fmt_header_only',
+        required: true,
+        allow_fallback: true,
+    )
+    meson.override_dependency('fmt', fmt_header_only_dep)
+    fmt_dep = fmt_header_only_dep
 else
+    fmt_dep = dependency('fmt', required: true, allow_fallback: true)
+endif
 
-    # clang with libc++ creates some really long and confusing linker errors, so just use the header only library
-    if cpp.get_id() == 'clang' and build_with_libcpp
-        fmt_dep = dependency(
-            'fmt_header_only',
-            required: true,
-            allow_fallback: true,
-            default_options: {'default_library': 'static'},
-        )
-        meson.override_dependency('fmt', fmt_dep)
-    else
-        fmt_dep = dependency(
-            'fmt',
-            required: true,
-        )
-    endif
-
+core_lib += {'deps': [core_lib.get('deps'), fmt_dep]}
 
-    core_lib += {'deps': [core_lib.get('deps'), fmt_dep]}
-endif
 
 spdlog_dep = dependency(
     'spdlog',
     required: true,
     default_options: {'tests': 'disabled'},
 )
-graphics_lib += {'deps': [graphics_lib.get('deps'), spdlog_dep]}
+graphics_lib += {
+    'deps': [graphics_lib.get('deps'), spdlog_dep],
+}
+
+if (meson.is_cross_build() and host_machine.system() == '3ds')
+    graphics_lib += {
+        'compile_args': [graphics_lib.get('compile_args'), '-DSPDLOG_NO_TLS'],
+    }
+endif
 
 nlohmann_json_dep = dependency(
     'nlohmann_json',
@@ -221,7 +210,11 @@ core_lib += {'deps': [core_lib.get('deps'), argparse_dep]}
 online_multiplayer_supported = true
 
 
-if meson.is_cross_build() and host_machine.system() == 'switch'
+if (
+    meson.is_cross_build()
+    and (host_machine.system() == 'switch'
+    or host_machine.system() == '3ds')
+)
     online_multiplayer_supported = false
     core_lib += {
         'compile_args': [
@@ -275,7 +268,6 @@ endif
 discord_sdk_dep = dependency(
     'discord-game-sdk',
     required: not meson.is_cross_build(),
-    default_options: {'clang_libcpp': 'disabled'},
 )
 if discord_sdk_dep.found()
     have_discord_sdk = true

tools/install/meson.build

@@ -2,7 +2,7 @@
 ## TODO: only install needed ones, since sometimes we only need e.g. flacs or mp3 and no icons etc.
 ## install assets
 install_subdir(
-    'assets',
+    meson.project_source_root() / 'assets',
     install_dir: 'share/oopetris',
     exclude_files: ['oopetris.desktop.in', 'OOPetris.svg', 'recordings.magic'],
     exclude_directories: ['icon'],