-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1036 from r3claimer/dev
Update Xemu, Cemu, glslang
- Loading branch information
Showing
6 changed files
with
17 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 0 additions & 40 deletions
40
packages/emulators/standalone/cemu-sa/patches/004-left-control.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 11 additions & 16 deletions
27
packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,12 @@ | ||
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt | ||
index 37eecaadd4..0e9037bf7a 100644 | ||
--- a/glslang/CMakeLists.txt | ||
+++ b/glslang/CMakeLists.txt | ||
@@ -254,11 +254,8 @@ if(PROJECT_IS_TOP_LEVEL) | ||
--- a/External/CMakeLists.txt | ||
+++ b/External/CMakeLists.txt | ||
@@ -71,7 +71,8 @@ endif() | ||
if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) | ||
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) | ||
set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") | ||
- add_subdirectory(spirv-tools) | ||
+ set(BUILD_SHARED_LIBS OFF CACHE BOOL "Disable build shared libs" FORCE) | ||
+ add_subdirectory(spirv-tools EXCLUDE_FROM_ALL) | ||
endif() | ||
endif() | ||
|
||
set(PUBLIC_HEADERS | ||
Public/ResourceLimits.h | ||
- Public/ShaderLang.h | ||
Public/resource_limits_c.h | ||
- Include/glslang_c_interface.h | ||
- Include/glslang_c_shader_types.h | ||
- Include/ResourceLimits.h | ||
+ ${GLSLANG_HEADERS} | ||
MachineIndependent/Versions.h) | ||
|
||
foreach(file ${PUBLIC_HEADERS}) |