🔨 CMake: Cleanup Nintendo Switch variables

5 years ago · 7ab16c5c5d
3 changed files with 4 additions and 5 deletions
--- 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:
--- 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)

--- 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()