early-access version 1255

This commit is contained in:
pineappleEA
2020-12-28 15:15:37 +00:00
parent 84b39492d1
commit 78b48028e1
6254 changed files with 1868140 additions and 0 deletions

View File

@@ -0,0 +1,12 @@
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index a021d61f5..15c5dedfb 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -310,7 +310,6 @@ else()
-Wno-error=sign-conversion
-Werror=pessimizing-move
-Werror=redundant-move
- -Werror=shadow
-Werror=switch
-Werror=type-limits
-Werror=unused-variable

View File

@@ -0,0 +1,39 @@
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake
index 311ba1c2e..79315b198 100644
--- a/CMakeModules/GenerateSCMRev.cmake
+++ b/CMakeModules/GenerateSCMRev.cmake
@@ -11,9 +11,9 @@ find_package(Git QUIET PATHS "${GIT_EXECUTABLE}")
# 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_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
@@ -113,4 +113,5 @@ foreach (F IN LISTS HASH_FILES)
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
index d120c8d3d..bf3dcdbf6 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -28,6 +28,11 @@ add_custom_command(OUTPUT scm_rev.cpp
-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}"
-P "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake"
DEPENDS
# WARNING! It was too much work to try and make a common location for this list,

View File

@@ -0,0 +1,21 @@
From 0ce9148a24d8060e226f9815b611ab7852c0730e Mon Sep 17 00:00:00 2001
From: edisionnano <samantas5855@gmail.com>
Date: Thu, 5 Nov 2020 11:22:27 +0200
Subject: [PATCH] Update CMakeLists.txt
---
src/common/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 207c7a0a614..e68cfb6ad8e 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -202,7 +202,7 @@ if (MSVC)
)
else()
target_compile_options(common PRIVATE
- -Werror
+ -W
)
endif()