diff options
| author | 2017-05-27 14:22:35 -0700 | |
|---|---|---|
| committer | 2017-05-27 14:26:02 -0700 | |
| commit | a06220682cd4fb56f4db1eec7cdf647d3e21d88a (patch) | |
| tree | 4727b5fcbb7e68a95e99f664a350e27785d46905 | |
| parent | Update dynarmic (diff) | |
| download | yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar.gz yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.tar.xz yuzu-a06220682cd4fb56f4db1eec7cdf647d3e21d88a.zip | |
Add the fmt string formatting library
More info at http://fmtlib.net/
This commit was based on @jroweboy's work on his spdlog branch, but with
modifications.
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 1 | ||||
| m--------- | externals/fmt | 0 |
4 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index f98725622..36caa59f8 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -22,3 +22,6 @@ | |||
| 22 | [submodule "cryptopp"] | 22 | [submodule "cryptopp"] |
| 23 | path = externals/cryptopp/cryptopp | 23 | path = externals/cryptopp/cryptopp |
| 24 | url = https://github.com/weidai11/cryptopp.git | 24 | url = https://github.com/weidai11/cryptopp.git |
| 25 | [submodule "fmt"] | ||
| 26 | path = externals/fmt | ||
| 27 | url = https://github.com/fmtlib/fmt.git | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt index 306959e24..121b0f2f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -258,6 +258,7 @@ add_subdirectory(${INI_PREFIX}) | |||
| 258 | add_subdirectory(externals) | 258 | add_subdirectory(externals) |
| 259 | 259 | ||
| 260 | option(DYNARMIC_TESTS OFF) | 260 | option(DYNARMIC_TESTS OFF) |
| 261 | set(DYNARMIC_NO_BUNDLED_FMT ON) | ||
| 261 | add_subdirectory(externals/dynarmic) | 262 | add_subdirectory(externals/dynarmic) |
| 262 | 263 | ||
| 263 | add_subdirectory(externals/glad) | 264 | add_subdirectory(externals/glad) |
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 309e98464..57fc5d566 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -9,3 +9,4 @@ endif() | |||
| 9 | 9 | ||
| 10 | add_subdirectory(cryptopp) | 10 | add_subdirectory(cryptopp) |
| 11 | 11 | ||
| 12 | add_subdirectory(fmt) | ||
diff --git a/externals/fmt b/externals/fmt new file mode 160000 | |||
| Subproject ac5484c4e7365b59d8c7e14db6778de26635e42 | |||