diff options
| author |  James Rowe | 2018-01-15 20:53:53 -0700 |
|---|---|---|
| committer | James Rowe | 2018-01-16 01:15:52 -0700 |
| commit | e026b66bbbb78f3c43c067eb94675d4782fb70b6 (patch) | |
| tree | d64dd737b71c7845c92b598c3e2aee4314343537 /src/core | |
| parent | Merge pull request #25 from chris062689/master (diff) | |
| download | yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar.gz yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar.xz yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.zip | |
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.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ | |||
| 11 | #include "core/hle/kernel/svc.h" | 11 | #include "core/hle/kernel/svc.h" |
| 12 | 12 | ||
| 13 | // Load Unicorn DLL once on Windows using RAII | 13 | // Load Unicorn DLL once on Windows using RAII |
| 14 | #ifdef _WIN32 | 14 | #ifdef MSVC |
| 15 | #include <unicorn_dynload.h> | 15 | #include <unicorn_dynload.h> |
| 16 | struct LoadDll { | 16 | struct LoadDll { |
| 17 | private: | 17 | private: |