summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wasserka <NeoBrainX@gmail.com>2014-11-27 19:09:37 +0100
committerTony Wasserka <NeoBrainX@gmail.com>2014-12-20 18:06:55 +0100
commit056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15 (patch)
tree33ba57e903eae71c0bb481d8bd17456debd5132b
parentPica/DebugUtils: Add an event triggered after loading a vertex. (diff)
downloadyuzu-056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15.tar
yuzu-056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15.tar.gz
yuzu-056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15.tar.bz2
yuzu-056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15.tar.lz
yuzu-056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15.tar.xz
yuzu-056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15.tar.zst
yuzu-056a8f9dfa5f3da3bc3dfc0b032283db0ff6ab15.zip
Diffstat (limited to '')
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt2
m---------externals/nihstro0
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 54714e5cd..a9e0a5c1a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "externals/boost"]
path = externals/boost
url = https://github.com/citra-emu/ext-boost.git
+[submodule "externals/nihstro"]
+ path = externals/nihstro
+ url = https://github.com/neobrain/nihstro.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61d5d524a..638b468a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,6 +141,8 @@ set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih")
include_directories(${INI_PREFIX})
add_subdirectory(${INI_PREFIX})
+include_directories(externals/nihstro/include)
+
# process subdirectories
if(ENABLE_QT)
include_directories(externals/qhexedit)
diff --git a/externals/nihstro b/externals/nihstro
new file mode 160000
+Subproject fc71f8684d26ccf277ad68809c8bd7273141fe8