externals: Use unicorn DLL instead of static lib.
This commit is contained in:
		| @@ -215,7 +215,7 @@ endif() | ||||
| if (YUZU_USE_BUNDLED_UNICORN) | ||||
|     # Detect toolchain and platform | ||||
|     if (MSVC14 AND ARCHITECTURE_x86_64) | ||||
|         set(UNICORN_VER "unicorn-1.0.1-yuzu") | ||||
|         set(UNICORN_VER "unicorn-yuzu") | ||||
|     else() | ||||
|         message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.") | ||||
|     endif() | ||||
| @@ -230,7 +230,8 @@ if (YUZU_USE_BUNDLED_UNICORN) | ||||
|  | ||||
|     set(UNICORN_FOUND YES) | ||||
|     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() | ||||
|     find_package(unicorn REQUIRED) | ||||
| endif() | ||||
|   | ||||
| @@ -29,5 +29,7 @@ endif() | ||||
|  | ||||
| if (MSVC) | ||||
|     include(CopyCitraSDLDeps) | ||||
|     include(CopyYuzuUnicornDeps) | ||||
|     copy_citra_SDL_deps(citra) | ||||
|     copy_yuzu_unicorn_deps(citra) | ||||
| endif() | ||||
|   | ||||
| @@ -109,6 +109,8 @@ endif() | ||||
| if (MSVC) | ||||
|     include(CopyCitraQt5Deps) | ||||
|     include(CopyCitraSDLDeps) | ||||
|     include(CopyYuzuUnicornDeps) | ||||
|     copy_citra_Qt5_deps(citra-qt) | ||||
|     copy_citra_SDL_deps(citra-qt) | ||||
|     copy_yuzu_unicorn_deps(citra-qt) | ||||
| endif() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user