mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-07 00:28:56 +00:00
Merge #15
This commit is contained in:
parent
7d8fe0f105
commit
871da4e307
275 changed files with 33002 additions and 27474 deletions
2
Externals/VulkanMemoryAllocator
vendored
2
Externals/VulkanMemoryAllocator
vendored
|
@ -1 +1 @@
|
|||
Subproject commit c351692490513cdb0e5a2c925aaf7ea4a9b672f4
|
||||
Subproject commit 498e20dfd1343d99b9115201034bb0219801cdec
|
19
Externals/libiconv-1.14/CMakeLists.txt
vendored
19
Externals/libiconv-1.14/CMakeLists.txt
vendored
|
@ -1,10 +1,13 @@
|
|||
include_directories(include)
|
||||
include_directories(libcharset/include)
|
||||
|
||||
set(SRCS lib/iconv.c
|
||||
lib/relocatable.c
|
||||
libcharset/lib/localcharset.c
|
||||
add_library(iconv STATIC
|
||||
lib/iconv.c
|
||||
lib/relocatable.c
|
||||
libcharset/lib/localcharset.c
|
||||
)
|
||||
target_include_directories(iconv
|
||||
PUBLIC
|
||||
include
|
||||
PRIVATE
|
||||
libcharset/include
|
||||
)
|
||||
|
||||
add_library(iconv STATIC ${SRCS})
|
||||
dolphin_disable_warnings_msvc(iconv)
|
||||
add_library(Iconv::Iconv ALIAS iconv)
|
||||
|
|
6
Externals/mbedtls/CMakeLists.txt
vendored
6
Externals/mbedtls/CMakeLists.txt
vendored
|
@ -48,7 +48,8 @@ option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
|
|||
option(ENABLE_PROGRAMS "Build mbed TLS programs." OFF)
|
||||
|
||||
option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF)
|
||||
option(MBEDTLS_FATAL_WARNINGS "Compiler warnings treated as errors" ON)
|
||||
# Dolphin: werror makes updating compilers painful
|
||||
option(MBEDTLS_FATAL_WARNINGS "Compiler warnings treated as errors" OFF)
|
||||
|
||||
string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
|
||||
string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${CMAKE_C_COMPILER_ID}")
|
||||
|
@ -233,8 +234,7 @@ endif(CMAKE_COMPILER_IS_MSVC)
|
|||
|
||||
if(MBEDTLS_FATAL_WARNINGS)
|
||||
if(CMAKE_COMPILER_IS_MSVC)
|
||||
# Dolphin/MSVC: we want to disable all warnings for externals
|
||||
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
||||
endif(CMAKE_COMPILER_IS_MSVC)
|
||||
|
||||
if(CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNU)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue