From e026b66bbbb78f3c43c067eb94675d4782fb70b6 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Mon, 15 Jan 2018 20:53:53 -0700 Subject: Build: Add unicorn as a submodule and build it if needed Adds a cmake custom target that will build unicorn on first compile and uses this in the build scripts as well. Updates Appveyor and Travis build scripts to work with the new unicorn build, and updates the paths to all of the different artifacts. --- src/core/arm/unicorn/arm_unicorn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 13f6c658c..0cd519ea3 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -11,7 +11,7 @@ #include "core/hle/kernel/svc.h" // Load Unicorn DLL once on Windows using RAII -#ifdef _WIN32 +#ifdef MSVC #include struct LoadDll { private: -- cgit v1.2.3