summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/CMakeLists.txt17
-rw-r--r--src/common/fs/path_util.h2
2 files changed, 10 insertions, 9 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 7a4d9e354..2d403d471 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -21,14 +21,14 @@ find_package(Git QUIET)
21 21
22add_custom_command(OUTPUT scm_rev.cpp 22add_custom_command(OUTPUT scm_rev.cpp
23 COMMAND ${CMAKE_COMMAND} 23 COMMAND ${CMAKE_COMMAND}
24 -DSRC_DIR="${CMAKE_SOURCE_DIR}" 24 -DSRC_DIR=${CMAKE_SOURCE_DIR}
25 -DBUILD_REPOSITORY="${BUILD_REPOSITORY}" 25 -DBUILD_REPOSITORY=${BUILD_REPOSITORY}
26 -DTITLE_BAR_FORMAT_IDLE="${TITLE_BAR_FORMAT_IDLE}" 26 -DTITLE_BAR_FORMAT_IDLE=${TITLE_BAR_FORMAT_IDLE}
27 -DTITLE_BAR_FORMAT_RUNNING="${TITLE_BAR_FORMAT_RUNNING}" 27 -DTITLE_BAR_FORMAT_RUNNING=${TITLE_BAR_FORMAT_RUNNING}
28 -DBUILD_TAG="${BUILD_TAG}" 28 -DBUILD_TAG=${BUILD_TAG}
29 -DBUILD_ID="${DISPLAY_VERSION}" 29 -DBUILD_ID=${DISPLAY_VERSION}
30 -DGIT_EXECUTABLE="${GIT_EXECUTABLE}" 30 -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
31 -P "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" 31 -P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake
32 DEPENDS 32 DEPENDS
33 # WARNING! It was too much work to try and make a common location for this list, 33 # WARNING! It was too much work to try and make a common location for this list,
34 # so if you need to change it, please update CMakeModules/GenerateSCMRev.cmake as well 34 # so if you need to change it, please update CMakeModules/GenerateSCMRev.cmake as well
@@ -92,6 +92,7 @@ add_custom_command(OUTPUT scm_rev.cpp
92 "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h" 92 "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h"
93 # technically we should regenerate if the git version changed, but its not worth the effort imo 93 # technically we should regenerate if the git version changed, but its not worth the effort imo
94 "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" 94 "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake"
95 VERBATIM
95) 96)
96 97
97add_library(common STATIC 98add_library(common STATIC
diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h
index 14e8c35d7..f956ac9a2 100644
--- a/src/common/fs/path_util.h
+++ b/src/common/fs/path_util.h
@@ -209,7 +209,7 @@ void SetYuzuPath(YuzuPath yuzu_path, const std::filesystem::path& new_path);
209 209
210#ifdef _WIN32 210#ifdef _WIN32
211template <typename Path> 211template <typename Path>
212[[nodiscard]] void SetYuzuPath(YuzuPath yuzu_path, const Path& new_path) { 212void SetYuzuPath(YuzuPath yuzu_path, const Path& new_path) {
213 if constexpr (IsChar<typename Path::value_type>) { 213 if constexpr (IsChar<typename Path::value_type>) {
214 SetYuzuPath(yuzu_path, ToU8String(new_path)); 214 SetYuzuPath(yuzu_path, ToU8String(new_path));
215 } else { 215 } else {