diff options
| author | 2020-05-08 15:09:29 -0600 | |
|---|---|---|
| committer | 2020-05-08 17:09:29 -0400 | |
| commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
| tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /.gitmodules | |
| parent | Merge pull request #3885 from ReinUsesLisp/viewport-swizzles (diff) | |
| download | yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.gz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.xz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.zip | |
Replace externals with Conan (#3735)
* Remove git submodules that will be loaded through conan
* Move custom Find modules to their own folder
* Use conan for downloading missing external dependencies
* CI: Change the yuzu source folder user to the user that the containers run on
* Attempt to remove dirty mingw build hack
* Install conan on the msvc build
* Only set release build type when using not using multi config generator
* Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries
* Add workaround for submodules that use legacy CMAKE variables
* Re-add USE_BUNDLED_QT on the msvc build bot
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/.gitmodules b/.gitmodules index 63bf2cda0..bf3b80d59 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -1,54 +1,30 @@ | |||
| 1 | [submodule "inih"] | 1 | [submodule "inih"] |
| 2 | path = externals/inih/inih | 2 | path = externals/inih/inih |
| 3 | url = https://github.com/svn2github/inih | 3 | url = https://github.com/svn2github/inih |
| 4 | [submodule "boost"] | ||
| 5 | path = externals/boost | ||
| 6 | url = https://github.com/yuzu-emu/ext-boost.git | ||
| 7 | [submodule "catch"] | ||
| 8 | path = externals/catch | ||
| 9 | url = https://github.com/philsquared/Catch.git | ||
| 10 | [submodule "cubeb"] | 4 | [submodule "cubeb"] |
| 11 | path = externals/cubeb | 5 | path = externals/cubeb |
| 12 | url = https://github.com/kinetiknz/cubeb.git | 6 | url = https://github.com/kinetiknz/cubeb.git |
| 13 | [submodule "dynarmic"] | 7 | [submodule "dynarmic"] |
| 14 | path = externals/dynarmic | 8 | path = externals/dynarmic |
| 15 | url = https://github.com/MerryMage/dynarmic.git | 9 | url = https://github.com/MerryMage/dynarmic.git |
| 16 | [submodule "fmt"] | ||
| 17 | path = externals/fmt | ||
| 18 | url = https://github.com/fmtlib/fmt.git | ||
| 19 | [submodule "lz4"] | ||
| 20 | path = externals/lz4 | ||
| 21 | url = https://github.com/lz4/lz4.git | ||
| 22 | [submodule "unicorn"] | 10 | [submodule "unicorn"] |
| 23 | path = externals/unicorn | 11 | path = externals/unicorn |
| 24 | url = https://github.com/yuzu-emu/unicorn | 12 | url = https://github.com/yuzu-emu/unicorn |
| 25 | [submodule "mbedtls"] | ||
| 26 | path = externals/mbedtls | ||
| 27 | url = https://github.com/DarkLordZach/mbedtls | ||
| 28 | [submodule "opus"] | ||
| 29 | path = externals/opus/opus | ||
| 30 | url = https://github.com/xiph/opus.git | ||
| 31 | [submodule "soundtouch"] | 13 | [submodule "soundtouch"] |
| 32 | path = externals/soundtouch | 14 | path = externals/soundtouch |
| 33 | url = https://github.com/citra-emu/ext-soundtouch.git | 15 | url = https://github.com/citra-emu/ext-soundtouch.git |
| 34 | [submodule "libressl"] | ||
| 35 | path = externals/libressl | ||
| 36 | url = https://github.com/citra-emu/ext-libressl-portable.git | ||
| 37 | [submodule "discord-rpc"] | 16 | [submodule "discord-rpc"] |
| 38 | path = externals/discord-rpc | 17 | path = externals/discord-rpc |
| 39 | url = https://github.com/discordapp/discord-rpc.git | 18 | url = https://github.com/discordapp/discord-rpc.git |
| 40 | [submodule "Vulkan-Headers"] | 19 | [submodule "Vulkan-Headers"] |
| 41 | path = externals/Vulkan-Headers | 20 | path = externals/Vulkan-Headers |
| 42 | url = https://github.com/KhronosGroup/Vulkan-Headers.git | 21 | url = https://github.com/KhronosGroup/Vulkan-Headers.git |
| 43 | [submodule "externals/zstd"] | ||
| 44 | path = externals/zstd | ||
| 45 | url = https://github.com/facebook/zstd | ||
| 46 | [submodule "sirit"] | 22 | [submodule "sirit"] |
| 47 | path = externals/sirit | 23 | path = externals/sirit |
| 48 | url = https://github.com/ReinUsesLisp/sirit | 24 | url = https://github.com/ReinUsesLisp/sirit |
| 25 | [submodule "mbedtls"] | ||
| 26 | path = externals/mbedtls | ||
| 27 | url = https://github.com/DarkLordZach/mbedtls | ||
| 49 | [submodule "libzip"] | 28 | [submodule "libzip"] |
| 50 | path = externals/libzip/libzip | 29 | path = externals/libzip/libzip |
| 51 | url = https://github.com/nih-at/libzip.git | 30 | url = https://github.com/nih-at/libzip.git |
| 52 | [submodule "zlib"] | ||
| 53 | path = externals/zlib/zlib | ||
| 54 | url = https://github.com/madler/zlib.git | ||