CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

externals: Use unicorn DLL instead of static lib.

master
bunnei 2018-01-04 13:15:29 +07:00
parent 3f8b9181b5
commit 738845cc0e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
Unescape Escape View File

@ -215,7 +215,7 @@ endif()
if (YUZU_USE_BUNDLED_UNICORN) if (YUZU_USE_BUNDLED_UNICORN)
# Detect toolchain and platform # Detect toolchain and platform
if (MSVC14 AND ARCHITECTURE_x86_64) if (MSVC14 AND ARCHITECTURE_x86_64)
set(UNICORN_VER "unicorn-1.0.1-yuzu") set(UNICORN_VER "unicorn-yuzu")
else() else()
message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.") message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.")
endif() endif()
@ -230,7 +230,8 @@ if (YUZU_USE_BUNDLED_UNICORN)
set(UNICORN_FOUND YES) set(UNICORN_FOUND YES)
set(UNICORN_INCLUDE_DIR "${UNICORN_PREFIX}/include" CACHE PATH "Path to Unicorn headers") set(UNICORN_INCLUDE_DIR "${UNICORN_PREFIX}/include" CACHE PATH "Path to Unicorn headers")
set(UNICORN_LIBRARY "${UNICORN_PREFIX}/lib/x64/unicorn_static.lib" CACHE PATH "Path to Unicorn library") set(UNICORN_LIBRARY "${UNICORN_PREFIX}/lib/x64/unicorn_dynload.lib" CACHE PATH "Path to Unicorn library")
set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/lib/x64/" CACHE PATH "Path to unicorn.dll")
else() else()
find_package(unicorn REQUIRED) find_package(unicorn REQUIRED)
endif() endif()

2
src/citra/CMakeLists.txt
Unescape Escape View File

@ -29,5 +29,7 @@ endif()
if (MSVC) if (MSVC)
include(CopyCitraSDLDeps) include(CopyCitraSDLDeps)
include(CopyYuzuUnicornDeps)
copy_citra_SDL_deps(citra) copy_citra_SDL_deps(citra)
copy_yuzu_unicorn_deps(citra)
endif() endif()

2
src/citra_qt/CMakeLists.txt
Unescape Escape View File

@ -109,6 +109,8 @@ endif()
if (MSVC) if (MSVC)
include(CopyCitraQt5Deps) include(CopyCitraQt5Deps)
include(CopyCitraSDLDeps) include(CopyCitraSDLDeps)
include(CopyYuzuUnicornDeps)
copy_citra_Qt5_deps(citra-qt) copy_citra_Qt5_deps(citra-qt)
copy_citra_SDL_deps(citra-qt) copy_citra_SDL_deps(citra-qt)
copy_yuzu_unicorn_deps(citra-qt)
endif() endif()