diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-08 20:09:27 +1100 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-03-08 20:09:27 +1100 |
commit | 6c562470f3a7cd24ed6501f54422564ed42051ea (patch) | |
tree | 2e422b3316b6e77cbc35085a9ce63b4c6d0912d3 /source/extern | |
parent | 89fe1bf15bc458df6c63f1aaeac42a4883efbfd5 (diff) |
Merge launcher branch
Diffstat (limited to 'source/extern')
-rw-r--r-- | source/extern/CMakeLists.txt | 22 | ||||
m--------- | source/extern/opus | 0 |
2 files changed, 1 insertions, 21 deletions
diff --git a/source/extern/CMakeLists.txt b/source/extern/CMakeLists.txt index 624b837..ec74145 100644 --- a/source/extern/CMakeLists.txt +++ b/source/extern/CMakeLists.txt @@ -1,24 +1,5 @@ -set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) -SET (OPUS_INSTALL_PKG_CONFIG_MODULE OFF) -SET (OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF) -SET (OPUS_X86_MAY_HAVE_SSE ON) -SET (OPUS_X86_MAY_HAVE_AVX ON) -SET (OPUS_X86_MAY_HAVE_SSE4_1 ON) -SET (OPUS_ENABLE_FLOAT_API ON) -SET (OPUS_FLOAT_APPROX ON) -SET (OPUS_STACK_PROTECTOR OFF) -SET (OPUS_NONTHREADSAFE_PSEUDOSTACK OFF) -SET (OPUS_USE_ALLOCA ON) -SET (BUILD_TESTING OFF) # Skip Opus tests, these won't build because the tests don't honor OPUS_FLOAT_APPROX. -ADD_SUBDIRECTORY (opus) - -IF (OPUS_NONTHREADSAFE_PSEUDOSTACK) - MESSAGE (FATAL_ERROR "Opus should not be using NONTHREADSAFE_PSEUDOSTACK") -ENDIF () - INCLUDE_DIRECTORIES ( ${STAR_EXTERN_INCLUDES} - opus/include fmt lua ) @@ -89,5 +70,4 @@ SET (star_extern_SOURCES lua/lzio.c ) -ADD_LIBRARY (star_extern OBJECT ${star_extern_SOURCES} ${star_extern_HEADERS}) -TARGET_LINK_LIBRARIES(star_extern PUBLIC opus)
\ No newline at end of file +ADD_LIBRARY (star_extern OBJECT ${star_extern_SOURCES} ${star_extern_HEADERS})
\ No newline at end of file diff --git a/source/extern/opus b/source/extern/opus deleted file mode 160000 -Subproject 9fc8fc4cf432640f284113ba502ee027268b0d9 |