ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch: mojoal on switch by default

Browse Source
This commit is contained in:
Mary Strodl 2021-07-15 17:55:36 -04:00
parent feb8ba51ab
commit abdad11a71
No known key found for this signature in database
GPG Key ID: 23B7FC1590D8E30E
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -19,11 +19,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "STKRelease") set(CMAKE_BUILD_TYPE "STKRelease")
endif() endif()
option(USE_SWITCH "Build targeting switch" OFF) CMAKE_DEPENDENT_OPTION(USE_SWITCH "Build targeting switch" OFF "NOT NINTENDO_SWITCH" ON)
if(NINTENDO_SWITCH)
set(USE_SWITCH ON)
endif()
if(WIN32) if(WIN32)
option(USE_DIRECTX "Build DirectX 9 driver (requires DirectX SDK)" OFF) option(USE_DIRECTX "Build DirectX 9 driver (requires DirectX SDK)" OFF)
@ -52,7 +48,7 @@ CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of t
CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
"NOT SERVER_ONLY;NOT CYGWIN;NOT USE_SWITCH;NOT MSVC" OFF) "NOT SERVER_ONLY;NOT CYGWIN;NOT USE_SWITCH;NOT MSVC" OFF)
CMAKE_DEPENDENT_OPTION(USE_DNS_C "Build bundled dns resolver" OFF "NOT CYGWIN;NOT USE_SWITCH" ON) CMAKE_DEPENDENT_OPTION(USE_DNS_C "Build bundled dns resolver" OFF "NOT CYGWIN;NOT USE_SWITCH" ON)
CMAKE_DEPENDENT_OPTION(USE_MOJOAL "Use bundled MojoAL instead of system OpenAL" OFF "NOT APPLE" ON) CMAKE_DEPENDENT_OPTION(USE_MOJOAL "Use bundled MojoAL instead of system OpenAL" OFF "NOT APPLE;NOT USE_SWITCH" ON)
if (DLOPEN_MOLTENVK) if (DLOPEN_MOLTENVK)
ADD_DEFINITIONS(-DDLOPEN_MOLTENVK) ADD_DEFINITIONS(-DDLOPEN_MOLTENVK)

1
switch/make.sh
View File

@ -13,7 +13,6 @@ fi
cd "${STK_DIR}/cmake_build" cd "${STK_DIR}/cmake_build"
"${DEVKITPRO}/portlibs/switch/bin/aarch64-none-elf-cmake" -G"Unix Makefiles" \ "${DEVKITPRO}/portlibs/switch/bin/aarch64-none-elf-cmake" -G"Unix Makefiles" \
-DUSE_SWITCH=ON -DUSE_MOJOAL=ON \
-DCMAKE_INSTALL_PREFIX=/ \ -DCMAKE_INSTALL_PREFIX=/ \
../ ../