From 793d23dfe7e5cbbe4903fcb4f34516cf7540f22c Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Fri, 27 May 2022 02:15:39 +0200 Subject: [PATCH] early-access version 2737 --- README.md | 2 +- patches/inject-git-info.patch | 41 +---------------------------------- src/common/fs/path_util.cpp | 4 +--- 3 files changed, 3 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index c91338827..5faa38408 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2736. +This is the source code for early-access 2737. ## Legal Notice diff --git a/patches/inject-git-info.patch b/patches/inject-git-info.patch index a3c7b5951..34cb37067 100644 --- a/patches/inject-git-info.patch +++ b/patches/inject-git-info.patch @@ -1,40 +1 @@ -diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake ---- a/CMakeModules/GenerateSCMRev.cmake -+++ b/CMakeModules/GenerateSCMRev.cmake -@@ -11,10 +11,10 @@ - - # generate git/build information - include(GetGitRevisionDescription) --get_git_head_revision(GIT_REF_SPEC GIT_REV) --git_describe(GIT_DESC --always --long --dirty) --git_branch_name(GIT_BRANCH) --get_timestamp(BUILD_DATE) -+#get_git_head_revision(GIT_REF_SPEC GIT_REV) -+#git_describe(GIT_DESC --always --long --dirty) -+#git_branch_name(GIT_BRANCH) -+#get_timestamp(BUILD_DATE) - - # Generate cpp with Git revision from template - # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well -@@ -113,4 +113,5 @@ - set(COMBINED "${COMBINED}${TMP}") - endforeach() - string(MD5 SHADER_CACHE_VERSION "${COMBINED}") -+set(BUILD_FULLNAME "${BUILD_FULLNAME} ") - configure_file("${SRC_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY) -diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt ---- a/src/common/CMakeLists.txt -+++ b/src/common/CMakeLists.txt -@@ -28,6 +28,12 @@ - -DBUILD_TAG="${BUILD_TAG}" - -DBUILD_ID="${DISPLAY_VERSION}" - -DGIT_EXECUTABLE="${GIT_EXECUTABLE}" -+ -DGIT_REF_SPEC="${GIT_REF_SPEC}" -+ -DGIT_REV="${GIT_REV}" -+ -DGIT_DESC="${GIT_DESC}" -+ -DGIT_BRANCH="${GIT_BRANCH}" -+ -DBUILD_FULLNAME="${BUILD_FULLNAME}" -+ -DBUILD_DATE="${BUILD_DATE}" - -P "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" - DEPENDS - # WARNING! It was too much work to try and make a common location for this list, +500: Internal Server Error \ No newline at end of file diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 62318e70c..1074f2421 100755 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -232,9 +232,7 @@ void SetYuzuPath(YuzuPath yuzu_path, const fs::path& new_path) { fs::path GetExeDirectory() { wchar_t exe_path[MAX_PATH]; - GetModuleFileNameW(nullptr, exe_path, MAX_PATH); - - if (!exe_path) { + if (GetModuleFileNameW(nullptr, exe_path, MAX_PATH) == 0) { LOG_ERROR(Common_Filesystem, "Failed to get the path to the executable of the current process"); }