early-access version 2816
This commit is contained in:
parent
c1c1aa518f
commit
f3d9b67d42
5 changed files with 29 additions and 2 deletions
|
@ -627,6 +627,14 @@ add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
|
||||||
-DBOOST_DATE_TIME_NO_LIB
|
-DBOOST_DATE_TIME_NO_LIB
|
||||||
-DBOOST_REGEX_NO_LIB
|
-DBOOST_REGEX_NO_LIB
|
||||||
)
|
)
|
||||||
|
# Adjustments for MSVC + Ninja
|
||||||
|
if (MSVC AND CMAKE_GENERATOR STREQUAL "Ninja")
|
||||||
|
add_compile_options(
|
||||||
|
/wd4711 # function 'function' selected for automatic inline expansion
|
||||||
|
/wd4464 # relative include path contains '..'
|
||||||
|
/wd4820 # 'identifier1': '4' bytes padding added after data member 'identifier2'
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
enable_testing()
|
enable_testing()
|
||||||
add_subdirectory(externals)
|
add_subdirectory(externals)
|
||||||
|
|
|
@ -2,5 +2,6 @@ function(copy_yuzu_FFmpeg_deps target_dir)
|
||||||
include(WindowsCopyFiles)
|
include(WindowsCopyFiles)
|
||||||
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
|
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
|
||||||
file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
|
file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
|
||||||
|
string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS)
|
||||||
windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
|
windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
|
||||||
endfunction(copy_yuzu_FFmpeg_deps)
|
endfunction(copy_yuzu_FFmpeg_deps)
|
||||||
|
|
12
CMakeModules/MSVCCache.cmake
Executable file
12
CMakeModules/MSVCCache.cmake
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
# buildcache wrapper
|
||||||
|
OPTION(USE_CCACHE "Use buildcache for compilation" OFF)
|
||||||
|
IF(USE_CCACHE)
|
||||||
|
FIND_PROGRAM(CCACHE buildcache)
|
||||||
|
IF (CCACHE)
|
||||||
|
MESSAGE(STATUS "Using buildcache found in PATH")
|
||||||
|
SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
|
||||||
|
SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
|
||||||
|
ELSE(CCACHE)
|
||||||
|
MESSAGE(WARNING "USE_CCACHE enabled, but no buildcache executable found")
|
||||||
|
ENDIF(CCACHE)
|
||||||
|
ENDIF(USE_CCACHE)
|
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2815.
|
This is the source code for early-access 2816.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,6 @@ if (MSVC)
|
||||||
# /GT - Supports fiber safety for data allocated using static thread-local storage
|
# /GT - Supports fiber safety for data allocated using static thread-local storage
|
||||||
add_compile_options(
|
add_compile_options(
|
||||||
/MP
|
/MP
|
||||||
/Zi
|
|
||||||
/Zm200
|
/Zm200
|
||||||
/Zo
|
/Zo
|
||||||
/permissive-
|
/permissive-
|
||||||
|
@ -79,6 +78,13 @@ if (MSVC)
|
||||||
/we5245 # 'function': unreferenced function with internal linkage has been removed
|
/we5245 # 'function': unreferenced function with internal linkage has been removed
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_CCACHE)
|
||||||
|
# when caching, we need to use /Z7 to downgrade debug info to use an older but more cachable format
|
||||||
|
add_compile_options(/Z7)
|
||||||
|
else()
|
||||||
|
add_compile_options(/Zi)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (ARCHITECTURE_x86_64)
|
if (ARCHITECTURE_x86_64)
|
||||||
add_compile_options(/QIntel-jcc-erratum)
|
add_compile_options(/QIntel-jcc-erratum)
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in a new issue