mirror of
https://github.com/PabloMK7/citra.git
synced 2024-12-27 01:46:48 +00:00
Update submodules and build environments (#232)
* Update Vulkan and QT submodules * Undefine FORTIFY_SOURCE before defining again * Update discord-rpc submodule
This commit is contained in:
parent
8656655bb1
commit
8538a57be0
|
@ -235,7 +235,7 @@ find_package(Threads REQUIRED)
|
||||||
|
|
||||||
if (ENABLE_QT)
|
if (ENABLE_QT)
|
||||||
if (NOT USE_SYSTEM_QT)
|
if (NOT USE_SYSTEM_QT)
|
||||||
download_qt(6.6.0)
|
download_qt(6.7.2)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)
|
find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)
|
||||||
|
|
2
externals/discord-rpc
vendored
2
externals/discord-rpc
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 20cc99aeffa08a4834f156b6ab49ed68618cf94a
|
Subproject commit 54eb03c20351f94850bfca3955cb87465a860ef6
|
2
externals/vma
vendored
2
externals/vma
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 0e89587db3ebee4d463f191bd296374c5fafc8ea
|
Subproject commit 009ecd192c1289c7529bff248a16cfe896254816
|
2
externals/vulkan-headers
vendored
2
externals/vulkan-headers
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 5a5c9a643484d888873e32c5d7d484fae8e71d3d
|
Subproject commit 595c8d4794410a4e64b98dc58d27c0310d7ea2fd
|
|
@ -117,7 +117,7 @@ else()
|
||||||
|
|
||||||
if (NOT CMAKE_BUILD_TYPE STREQUAL Debug)
|
if (NOT CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||||
# _FORTIFY_SOURCE can't be used without optimizations.
|
# _FORTIFY_SOURCE can't be used without optimizations.
|
||||||
add_compile_options(-Wp,-D_FORTIFY_SOURCE=2)
|
add_compile_options(-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (CITRA_WARNINGS_AS_ERRORS)
|
if (CITRA_WARNINGS_AS_ERRORS)
|
||||||
|
|
Loading…
Reference in a new issue