Merge branch 'master' of https://github.com/yuzu-emu/yuzu into GDBWork

This commit is contained in:
Jarek Syrylak
2018-08-05 02:41:41 +01:00
236 changed files with 5625 additions and 1984 deletions

View File

@@ -35,6 +35,10 @@ set(LZ4_BUNDLED_MODE ON)
add_subdirectory(lz4/contrib/cmake_unofficial)
target_include_directories(lz4_static INTERFACE ./lz4/lib)
# mbedtls
add_subdirectory(mbedtls)
target_include_directories(mbedtls PUBLIC ./mbedtls/include)
# MicroProfile
add_library(microprofile INTERFACE)
target_include_directories(microprofile INTERFACE ./microprofile)
@@ -50,3 +54,13 @@ if (ARCHITECTURE_x86_64)
target_include_directories(xbyak INTERFACE ./xbyak/xbyak)
target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
endif()
# Opus
add_subdirectory(opus)
target_include_directories(opus INTERFACE ./opus/include)
# Cubeb
if(ENABLE_CUBEB)
set(BUILD_TESTS OFF CACHE BOOL "")
add_subdirectory(cubeb)
endif()

1
externals/cubeb vendored Submodule

Submodule externals/cubeb added at 12b78c0edf

1
externals/mbedtls vendored Submodule

Submodule externals/mbedtls added at 06442b840e

1
externals/opus vendored Submodule

Submodule externals/opus added at b2871922a1