From c883b80be156779dc34fdeb012af4842b2b564df Mon Sep 17 00:00:00 2001 From: Ghabry Date: Thu, 10 Oct 2024 13:58:33 +0200 Subject: [PATCH] CMake Presets: Add WiiU preset, disable tools when targetting homebrew --- CMakePresets.json | 140 ++++++++++++------------ builds/cmake/CMakePresets.json.template | 19 +++- 2 files changed, 88 insertions(+), 71 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 45aa431f..b7719ea9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -49,7 +49,7 @@ "name": "linux-parent", "toolchainFile": "${sourceDir}/builds/cmake/LinuxToolchain.cmake", "cacheVariables": { - "CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/linux-static" + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/linux-static" }, "hidden": true, "inherits": "base-user" @@ -79,34 +79,34 @@ ] }, { - "name": "windows-x86-parent", + "name": "windows-parent", "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x86-windows-static" + "VCPKG_TARGET_TRIPLET": "$env{VSCMD_ARG_TGT_ARCH}-windows-static" }, "inherits": "win-user", "hidden": true }, { - "name": "windows-x86-debug", - "displayName": "Windows (x86) (Debug)", + "name": "windows-debug", + "displayName": "Windows (Debug)", "inherits": [ - "windows-x86-parent", + "windows-parent", "type-debug" ] }, { - "name": "windows-x86-relwithdebinfo", - "displayName": "Windows (x86) (RelWithDebInfo)", + "name": "windows-relwithdebinfo", + "displayName": "Windows (RelWithDebInfo)", "inherits": [ - "windows-x86-parent", + "windows-parent", "type-relwithdebinfo" ] }, { - "name": "windows-x86-release", - "displayName": "Windows (x86) (Release)", + "name": "windows-release", + "displayName": "Windows (Release)", "inherits": [ - "windows-x86-parent", + "windows-parent", "type-release" ] }, @@ -144,39 +144,6 @@ "type-release" ] }, - { - "name": "windows-x64-parent", - "architecture": "x64", - "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x64-windows-static" - }, - "inherits": "win-user", - "hidden": true - }, - { - "name": "windows-x64-debug", - "displayName": "Windows (x64) (Debug)", - "inherits": [ - "windows-x64-parent", - "type-debug" - ] - }, - { - "name": "windows-x64-relwithdebinfo", - "displayName": "Windows (x64) (RelWithDebInfo)", - "inherits": [ - "windows-x64-parent", - "type-relwithdebinfo" - ] - }, - { - "name": "windows-x64-release", - "displayName": "Windows (x64) (Release)", - "inherits": [ - "windows-x64-parent", - "type-release" - ] - }, { "name": "windows-x64-vs2022-parent", "generator": "Visual Studio 17 2022", @@ -214,7 +181,7 @@ { "name": "macos-parent", "cacheVariables": { - "CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/osx", + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/osx", "CMAKE_OSX_DEPLOYMENT_TARGET": "10.9" }, "condition": { @@ -254,7 +221,7 @@ "toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/emscripten/emsdk-portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake", "cacheVariables": { "LIBLCF_ENABLE_TOOLS": "OFF", - "CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/emscripten", + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/emscripten", "CMAKE_FIND_ROOT_PATH": "$env{EASYRPG_BUILDSCRIPTS}/emscripten" }, "hidden": true, @@ -288,7 +255,8 @@ "name": "3ds-parent", "toolchainFile": "$env{DEVKITPRO}/cmake/3DS.cmake", "cacheVariables": { - "CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/3ds" + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/3ds", + "LIBLCF_ENABLE_TOOLS": "OFF" }, "inherits": "dkp-user", "hidden": true @@ -321,7 +289,8 @@ "name": "switch-parent", "toolchainFile": "$env{DEVKITPRO}/cmake/Switch.cmake", "cacheVariables": { - "CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/switch" + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/switch", + "LIBLCF_ENABLE_TOOLS": "OFF" }, "inherits": "dkp-user", "hidden": true @@ -354,7 +323,8 @@ "name": "wii-parent", "toolchainFile": "$env{DEVKITPRO}/cmake/Wii.cmake", "cacheVariables": { - "CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/wii" + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wii", + "LIBLCF_ENABLE_TOOLS": "OFF" }, "inherits": "dkp-user", "hidden": true @@ -383,6 +353,40 @@ "type-release" ] }, + { + "name": "wiiu-parent", + "toolchainFile": "$env{DEVKITPRO}/cmake/WiiU.cmake", + "cacheVariables": { + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wiiu", + "LIBLCF_ENABLE_TOOLS": "OFF" + }, + "inherits": "dkp-user", + "hidden": true + }, + { + "name": "wiiu-debug", + "displayName": "Nintendo WiiU (Debug)", + "inherits": [ + "wiiu-parent", + "type-debug" + ] + }, + { + "name": "wiiu-relwithdebinfo", + "displayName": "Nintendo WiiU (RelWithDebInfo)", + "inherits": [ + "wiiu-parent", + "type-relwithdebinfo" + ] + }, + { + "name": "wiiu-release", + "displayName": "Nintendo WiiU (Release)", + "inherits": [ + "wiiu-parent", + "type-release" + ] + }, { "name": "psvita-parent", "toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/vita/vitasdk/share/vita.toolchain.cmake", @@ -575,16 +579,16 @@ "configurePreset": "linux-release" }, { - "name": "windows-x86-debug", - "configurePreset": "windows-x86-debug" + "name": "windows-debug", + "configurePreset": "windows-debug" }, { - "name": "windows-x86-relwithdebinfo", - "configurePreset": "windows-x86-relwithdebinfo" + "name": "windows-relwithdebinfo", + "configurePreset": "windows-relwithdebinfo" }, { - "name": "windows-x86-release", - "configurePreset": "windows-x86-release" + "name": "windows-release", + "configurePreset": "windows-release" }, { "name": "windows-x86-vs2022-debug", @@ -598,18 +602,6 @@ "name": "windows-x86-vs2022-release", "configurePreset": "windows-x86-vs2022-release" }, - { - "name": "windows-x64-debug", - "configurePreset": "windows-x64-debug" - }, - { - "name": "windows-x64-relwithdebinfo", - "configurePreset": "windows-x64-relwithdebinfo" - }, - { - "name": "windows-x64-release", - "configurePreset": "windows-x64-release" - }, { "name": "windows-x64-vs2022-debug", "configurePreset": "windows-x64-vs2022-debug" @@ -682,6 +674,18 @@ "name": "wii-release", "configurePreset": "wii-release" }, + { + "name": "wiiu-debug", + "configurePreset": "wiiu-debug" + }, + { + "name": "wiiu-relwithdebinfo", + "configurePreset": "wiiu-relwithdebinfo" + }, + { + "name": "wiiu-release", + "configurePreset": "wiiu-release" + }, { "name": "psvita-debug", "configurePreset": "psvita-debug" diff --git a/builds/cmake/CMakePresets.json.template b/builds/cmake/CMakePresets.json.template index 38a3304f..39d0c51b 100644 --- a/builds/cmake/CMakePresets.json.template +++ b/builds/cmake/CMakePresets.json.template @@ -77,7 +77,8 @@ "displayName": "Nintendo 3DS", "toolchainFile": "$env{DEVKITPRO}/cmake/3DS.cmake", "cacheVariables": { - "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/3ds" + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/3ds", + "LIBLCF_ENABLE_TOOLS": "OFF" }, "inherits": "dkp-user" }, @@ -86,7 +87,8 @@ "displayName": "Nintendo Switch", "toolchainFile": "$env{DEVKITPRO}/cmake/Switch.cmake", "cacheVariables": { - "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/switch" + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/switch", + "LIBLCF_ENABLE_TOOLS": "OFF" }, "inherits": "dkp-user" }, @@ -95,7 +97,18 @@ "displayName": "Nintendo Wii", "toolchainFile": "$env{DEVKITPRO}/cmake/Wii.cmake", "cacheVariables": { - "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wii" + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wii", + "LIBLCF_ENABLE_TOOLS": "OFF" + }, + "inherits": "dkp-user" + }, + { + "name": "wiiu", + "displayName": "Nintendo WiiU", + "toolchainFile": "$env{DEVKITPRO}/cmake/WiiU.cmake", + "cacheVariables": { + "LIBLCF_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wiiu", + "LIBLCF_ENABLE_TOOLS": "OFF" }, "inherits": "dkp-user" },