diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e8863ad3..715bf5377 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ jobs: working_directory: ~/repo steps: - checkout - - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DNONET=ON + - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON - run: cmake --build build -j 2 - store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro} 3ds: diff --git a/CMake/switch_defs.cmake b/CMake/switch_defs.cmake index bd3f0d347..d156ffb13 100644 --- a/CMake/switch_defs.cmake +++ b/CMake/switch_defs.cmake @@ -1,3 +1,6 @@ +set(ASAN OFF) +set(UBSAN OFF) + set(NONET ON) set(PREFILL_PLAYER_NAME ON) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8726b50f..7e91daeb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,10 +132,6 @@ if(GPERF) endif() if(NINTENDO_SWITCH) - set(ASAN OFF) - set(UBSAN OFF) - set(NONET ON) - set(PREFILL_PLAYER_NAME ON) include(switch_defs) endif()