From 733cf56a1e01e65453cdd996633ad1398cc76846 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Tue, 25 May 2021 11:47:36 +0100
Subject: [PATCH] use upstream devkitPro cmake machinery

---
 .circleci/config.yml                 |   5 +-
 CMake/switch/FindLIBNX.cmake         |  44 -------
 CMake/switch/devkita64-libnx.cmake   |  53 --------
 CMake/switch/nx-utils.cmake          | 186 ---------------------------
 CMake/switch/utils.cmake             |  17 ---
 CMake/{switch => }/switch_defs.cmake |   0
 CMakeLists.txt                       |  42 +++---
 7 files changed, 25 insertions(+), 322 deletions(-)
 delete mode 100644 CMake/switch/FindLIBNX.cmake
 delete mode 100644 CMake/switch/devkita64-libnx.cmake
 delete mode 100644 CMake/switch/nx-utils.cmake
 delete mode 100644 CMake/switch/utils.cmake
 rename CMake/{switch => }/switch_defs.cmake (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 78c2aca86..3e8863ad3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,10 +37,7 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run: dkp-pacman -Syu --noconfirm
-      # Install cmake files (https://github.com/devkitPro/docker/issues/3)
-      - run: dkp-pacman -S --needed --noconfirm --quiet devkitpro-pkgbuild-helpers
-      - run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/switch/devkita64-libnx.cmake
+      - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DNONET=ON
       - run: cmake --build build -j 2
       - store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro}
   3ds:
diff --git a/CMake/switch/FindLIBNX.cmake b/CMake/switch/FindLIBNX.cmake
deleted file mode 100644
index 4ea272955..000000000
--- a/CMake/switch/FindLIBNX.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-# https://github.com/switchpy/libnx-template/blob/7037982c77e1767410143103d5963d0ddc77fb64/cmake/FindLIBNX.cmake
-
-# Tries to find libnx
-# Once done, this will define:
-# > LIBNX_FOUND - The system has libnx
-# > LIBNX_INCLUDE_DIRS - The libnx include directories
-# > LIBNX_LIBRARIES - The libnx libraries required for using it
-#
-# It also adds an imported target named `switch::libnx`.
-
-include(utils) # <- devilutionX patch
-
-if (NOT SWITCH)
-    cmake_panic("This helper can only be used if you are using the Switch toolchain file.")
-endif ()
-
-set(LIBNX_PATHS $ENV{LIBNX} libnx ${LIBNX} ${DEVKITPRO}/libnx)
-
-find_path(LIBNX_INCLUDE_DIR switch.h
-        PATHS ${LIBNX_PATHS}
-        PATH_SUFFIXES include)
-
-find_library(LIBNX_LIBRARY NAMES libnx.a
-        PATHS ${LIBNX_PATHS}
-		PATH_SUFFIXES lib)
-
-set(LIBNX_INCLUDE_DIRS ${LIBNX_INCLUDE_DIR})
-set(LIBNX_LIBRARIES ${LIBNX_LIBRARY})
-
-# Handle the QUIETLY and REQUIRED arguments and set LIBNX_FOUND to TRUE if all above variables are TRUE.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LIBNX DEFAULT_MSG
-        LIBNX_INCLUDE_DIR LIBNX_LIBRARY)
-
-mark_as_advanced(LIBNX_INCLUDE_DIR LIBNX_LIBRARY)
-if (LIBNX_FOUND)
-    set(LIBNX ${LIBNX_INCLUDE_DIR}/..)
-    cmake_info("Setting LIBNX to ${LIBNX}")
-
-    add_library(switch::libnx STATIC IMPORTED GLOBAL)
-    set_target_properties(switch::libnx PROPERTIES
-            IMPORTED_LOCATION ${LIBNX_LIBRARY}
-            INTERFACE_INCLUDE_DIRECTORIES ${LIBNX_INCLUDE_DIR})
-endif ()
diff --git a/CMake/switch/devkita64-libnx.cmake b/CMake/switch/devkita64-libnx.cmake
deleted file mode 100644
index 8cd546041..000000000
--- a/CMake/switch/devkita64-libnx.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-if(NOT DEFINED ENV{DEVKITPRO})
-  message(FATAL_ERROR "Please set the DEVKITPRO env var to <path to devkitpro>")
-endif()
-
-# devkitPro paths are broken on Windows. We need to use this macro to fix those.
-# from https://github.com/switchpy/libnx-template/blob/7037982c77e1767410143103d5963d0ddc77fb64/devkita64-libnx.cmake
-macro(msys_to_cmake_path msys_path resulting_path)
-    if (WIN32)
-        string(REGEX REPLACE "^/([a-zA-Z])/" "\\1:/" ${resulting_path} ${msys_path})
-    else ()
-        set(${resulting_path} ${msys_path})
-    endif ()
-endmacro()
-msys_to_cmake_path($ENV{DEVKITPRO} DEVKITPRO)
-
-# Default devkitpro cmake
-include(${DEVKITPRO}/switch.cmake)
-
-# Set root paths:
-set(DEVKITA64 ${DEVKITPRO}/devkitA64)
-set(LIBNX ${DEVKITPRO}/libnx)
-set(PORTLIBS_PATH ${DEVKITPRO}/portlibs)
-set(PORTLIBS ${PORTLIBS_PATH}/switch)
-set(CMAKE_FIND_ROOT_PATH ${DEVKITA64} ${LIBNX} ${PORTLIBS})
-
-# FIXME
-# Workarounds to fix various linker errors
-set(CMAKE_EXE_LINKER_FLAGS_INIT "-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE -ftls-model=local-exec -L${DEVKITPRO}/portlibs/switch/lib -L${DEVKITPRO}/libnx/lib -specs=${DEVKITPRO}/libnx/switch.specs")
-set(CMAKE_MODULE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_INIT}")
-set(CMAKE_EXE_MODULE_FLAGS "${CMAKE_EXE_MODULE_FLAGS_INIT}")
-
-# Set absolute tool paths:
-set(TOOLCHAIN_PREFIX ${DEVKITA64}/bin/aarch64-none-elf-)
-if(WIN32)
-  set(TOOLCHAIN_SUFFIX ".exe")
-else()
-  set(TOOLCHAIN_SUFFIX "")
-endif()
-set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc${TOOLCHAIN_SUFFIX})
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++${TOOLCHAIN_SUFFIX})
-set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}as${TOOLCHAIN_SUFFIX})
-set(PKG_CONFIG_EXECUTABLE ${DEVKITPRO}/portlibs/switch/bin/aarch64-none-elf-pkg-config)
-set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar${TOOLCHAIN_SUFFIX} CACHE STRING "")
-set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib${TOOLCHAIN_SUFFIX} CACHE STRING "")
-set(CMAKE_LD "/${TOOLCHAIN_PREFIX}ld${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "")
-set(CMAKE_OBJCOPY "${TOOLCHAIN_PREFIX}objcopy${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "")
-set(CMAKE_SIZE_UTIL "${TOOLCHAIN_PREFIX}size${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "")
-
-set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available")
-
-set(SWITCH ON)
-add_definitions(-D__SWITCH__ -DSWITCH)
diff --git a/CMake/switch/nx-utils.cmake b/CMake/switch/nx-utils.cmake
deleted file mode 100644
index d82754a02..000000000
--- a/CMake/switch/nx-utils.cmake
+++ /dev/null
@@ -1,186 +0,0 @@
-# https://github.com/vbe0201/libnx-template/blob/5283aabad32789675542ef98dad9c91838a3e729/cmake/nx-utils.cmake
-
-if (NOT SWITCH)
-    cmake_panic("These utils can only be used if you are using the Switch toolchain file.")
-endif ()
-
-#############
-## ELF2NRO ##
-#############
-if (NOT ELF2NRO)
-    find_program(ELF2NRO elf2nro ${DEVKITPRO}/tools/bin)
-    if (ELF2NRO)
-        cmake_info("elf2nro: ${ELF2NRO} - found")
-    else ()
-        cmake_warning("elf2nro - not found")
-    endif ()
-endif ()
-
-#############
-## ELF2KIP ##
-#############
-if (NOT ELF2KIP)
-    find_program(ELF2KIP elf2kip ${DEVKITPRO}/tools/bin)
-    if (ELF2KIP)
-        cmake_info("elf2kip: ${ELF2KIP} - found")
-    else ()
-        cmake_warning("elf2kip - not found")
-    endif ()
-endif ()
-
-#############
-## ELF2NSO ##
-#############
-if (NOT ELF2NSO)
-    find_program(ELF2NSO elf2nso ${DEVKITPRO}/tools/bin)
-    if (ELF2NSO)
-        cmake_info("elf2nso: ${ELF2NSO} - found")
-    else ()
-        cmake_warning("elf2nso - not found")
-    endif ()
-endif ()
-
-#############
-##  BIN2S  ##
-#############
-if (NOT BIN2S)
-    find_program(BIN2S bin2s ${DEVKITPRO}/tools/bin)
-    if (BIN2S)
-        cmake_info("bin2s: ${BIN2S} - found")
-    else ()
-        cmake_warning("bin2s - not found")
-    endif ()
-endif ()
-
-#############
-##  RAW2C  ##
-#############
-if (NOT RAW2C)
-    find_program(RAW2C raw2c ${DEVKITPRO}/tools/bin)
-    if (RAW2C)
-        cmake_info("raw2c: ${RAW2C} - found")
-    else ()
-        cmake_warning("raw2c - not found")
-    endif ()
-endif ()
-
-##################
-##  BUILD_PFS0  ##
-##################
-if (NOT BUILD_PFS0)
-    find_program(BUILD_PFS0 build_pfs0 ${DEVKITPRO}/tools/bin)
-    if (BUILD_PFS0)
-        cmake_info("build_pfs0: ${BUILD_PFS0} - found")
-    else ()
-        cmake_warning("build_pfs0 - not found")
-    endif ()
-endif ()
-
-################
-##  NACPTOOL  ##
-################
-if (NOT NACPTOOL)
-    find_program(NACPTOOL nacptool ${DEVKITPRO}/tools/bin)
-    if (NACPTOOL)
-        cmake_info("nacptool: ${NACPTOOL} - found")
-    else ()
-        cmake_warning("nacptool - not found")
-    endif ()
-endif ()
-
-macro(acquire_homebrew_icon target)
-    # This basically imitates the behavior of the Makefiles
-    # from the switchbrew/switch-examples repository.
-    if (EXISTS ${target}.jpg)
-        set(APP_ICON ${target}.jpg)
-    elseif (EXISTS ${PROJECT_SOURCE_DIR}/assets/icon.jpg)
-        set(APP_ICON ${PROJECT_SOURCE_DIR}/assets/icon.jpg)
-    elseif (LIBNX)
-        set(APP_ICON ${LIBNX}/default_icon.jpg)
-    else ()
-        cmake_panic("No icon found, please provide one!")
-    endif ()
-endmacro()
-
-function(add_nso_target target)
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}.nso
-            COMMAND ${ELF2NSO} ${CMAKE_CURRENT_BINARY_DIR}/${target}.elf ${CMAKE_CURRENT_BINARY_DIR}/${target}.nso
-            DEPENDS ${target}.elf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            VERBATIM)
-
-    if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-        add_custom_target(${target}.nso ALL SOURCES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}.nso)
-    else ()
-        add_custom_target(${target}.nso ALL SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${target}.nso)
-    endif ()
-endfunction()
-
-function(add_nacp target)
-    set(__NACP_COMMAND ${NACPTOOL} --create ${APP_TITLE} ${APP_AUTHOR} ${APP_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/${target})
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}
-            COMMAND ${__NACP_COMMAND}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            VERBATIM)
-endfunction()
-
-function(add_nro_target target)
-    set(__NRO_COMMAND
-            ${ELF2NRO} $<TARGET_FILE:${target}.elf> ${CMAKE_CURRENT_BINARY_DIR}/${target}.nro --nacp=${CMAKE_CURRENT_BINARY_DIR}/${target}.nacp --icon=${APP_ICON})
-
-    if (NOT ${CMAKE_CURRENT_BINARY_DIR}/${target}.nacp)
-        add_nacp(${target}.nacp)
-    endif ()
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}.nro
-            COMMAND ${__NRO_COMMAND}
-            DEPENDS ${target}.elf ${CMAKE_CURRENT_BINARY_DIR}/${target}.nacp
-            VERBATIM)
-
-    if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-        add_custom_target(${target}.nro ALL SOURCES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}.nro)
-    else ()
-        add_custom_target(${target}.nro ALL SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${target}.nro)
-    endif ()
-endfunction()
-
-function(build_switch_binaries target)
-    get_filename_component(target_we ${target} NAME_WE)
-
-    if (NOT APP_TITLE)
-        if (${ARGC} GREATER 1)
-            set(APP_TITLE ${ARGV1})
-        else ()
-            set(APP_TITLE ${target_we})
-        endif ()
-    endif ()
-
-    if (NOT APP_AUTHOR)
-        if (${ARGC} GREATER 2)
-            set(APP_AUTHOR ${ARGV2})
-        else ()
-            set(APP_AUTHOR "Unspecified Author")
-        endif ()
-    endif ()
-
-    if (NOT APP_ICON)
-        if (${ARGC} GREATER 4)
-            set(APP_ICON ${ARGV4})
-        else ()
-            acquire_homebrew_icon(${target_we})
-        endif ()
-    endif ()
-
-    if (NOT APP_VERSION)
-        if (${ARGC} GREATER 3)
-            set(APP_VERSION ${ARGV3})
-        else ()
-            set(APP_VERSION "1.0.0")
-        endif ()
-    endif ()
-
-    # Build the binaries
-    add_nso_target(${target_we})
-    add_nro_target(${target_we})
-endfunction()
diff --git a/CMake/switch/utils.cmake b/CMake/switch/utils.cmake
deleted file mode 100644
index 304259586..000000000
--- a/CMake/switch/utils.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# https://github.com/switchpy/libnx-template/blob/7037982c77e1767410143103d5963d0ddc77fb64/cmake/utils.cmake
-
-function(cmake_info message)
-    if (cmake_VERBOSE)
-        message("Build-Info: ${message}")
-    endif ()
-endfunction()
-
-function(cmake_warning message)
-    if (cmake_VERBOSE)
-        message(WARNING "${message}")
-    endif ()
-endfunction()
-
-function(cmake_panic message)
-    message(FATAL_ERROR "${message}")
-endfunction()
diff --git a/CMake/switch/switch_defs.cmake b/CMake/switch_defs.cmake
similarity index 100%
rename from CMake/switch/switch_defs.cmake
rename to CMake/switch_defs.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 147a5b779..d8726b50f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,12 +131,11 @@ if(GPERF)
   endif()
 endif()
 
-if(SWITCH)
+if(NINTENDO_SWITCH)
   set(ASAN OFF)
   set(UBSAN OFF)
-
-  list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DIR}/CMake/switch")
-  find_package(LIBNX REQUIRED)
+  set(NONET ON)
+  set(PREFILL_PLAYER_NAME ON)
   include(switch_defs)
 endif()
 
@@ -470,12 +469,11 @@ endif()
 
 set(BIN_TARGET devilutionx)
 
-if(SWITCH)
+if(NINTENDO_SWITCH)
   list(APPEND libdevilutionx_SRCS
     Source/platform/switch/network.cpp
     Source/platform/switch/keyboard.cpp
     Source/platform/switch/docking.cpp)
-  set(BIN_TARGET devilutionx.elf)
 endif()
 
 if(VITA)
@@ -728,11 +726,6 @@ if(NOT NOSOUND)
   target_link_libraries(libdevilutionx PUBLIC SDL_audiolib)
 endif()
 
-if(SWITCH)
-  target_link_libraries(libdevilutionx PUBLIC switch::libnx
-    -lfreetype -lEGL -lglapi -ldrm_nouveau -lpng -lbz2 -lz -lnx)
-endif()
-
 if(AMIGA)
   target_link_libraries(libdevilutionx PUBLIC
     ${FREETYPE_LIBRARY}
@@ -840,13 +833,26 @@ if(APPLE)
   set(CPACK On)
 endif()
 
-if(SWITCH)
-  set(APP_TITLE "DevilutionX")
-  set(APP_AUTHOR "Devilution Team")
-  set(APP_ICON "${PROJECT_SOURCE_DIR}/Packaging/switch/icon.jpg")
-  set(APP_VERSION ${PROJECT_VERSION})
-  include(nx-utils)
-  build_switch_binaries(${BIN_TARGET})
+if(NINTENDO_SWITCH)
+
+  target_link_libraries(libdevilutionx PUBLIC
+        freetype
+        png
+        bz2
+        z
+  )
+
+  nx_generate_nacp (${BIN_TARGET}.nacp
+    NAME    "DevilutionX"
+    AUTHOR  "Devilution Team"
+    VERSION "${PROJECT_VERSION}"
+  )
+
+  nx_create_nro(${BIN_TARGET}
+    NACP ${BIN_TARGET}.nacp
+    ICON "${PROJECT_SOURCE_DIR}/Packaging/switch/icon.jpg"
+  )
+
 endif()
 
 if(VITA)