octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2732 from yuriks/add-fmt 

Add the fmt string formatting library
This commit is contained in:
Yuri Kunde Schlesner 2017-05-27 15:03:53 -07:00 committed by GitHub
parent 96528b3aab a06220682c
commit ec8dfc8fb7
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -22,3 +22,6 @@
[submodule "cryptopp"] [submodule "cryptopp"]
path = externals/cryptopp/cryptopp path = externals/cryptopp/cryptopp
url = https://github.com/weidai11/cryptopp.git url = https://github.com/weidai11/cryptopp.git
[submodule "fmt"]
path = externals/fmt
url = https://github.com/fmtlib/fmt.git

1
CMakeLists.txt
View File

@ -258,6 +258,7 @@ add_subdirectory(${INI_PREFIX})
add_subdirectory(externals) add_subdirectory(externals)
option(DYNARMIC_TESTS OFF) option(DYNARMIC_TESTS OFF)
set(DYNARMIC_NO_BUNDLED_FMT ON)
add_subdirectory(externals/dynarmic) add_subdirectory(externals/dynarmic)
add_subdirectory(externals/glad) add_subdirectory(externals/glad)

1
externals/CMakeLists.txt vendored
View File

@ -9,3 +9,4 @@ endif()
add_subdirectory(cryptopp) add_subdirectory(cryptopp)
add_subdirectory(fmt)

2
externals/dynarmic vendored

@ -1 +1 @@
Subproject commit 358cf7c32205a5114964865c86a8455daf810732 Subproject commit 7707ff13e981b0aecf87f3156ee0b641469f7bb3

1
externals/fmt vendored Submodule

@ -0,0 +1 @@
Subproject commit ac5484c4e7365b59d8c7e14db6778de26635e428