Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OpenAL soft statically linked; uses "fixed" path, leaves dynamic stuf… #224

Merged
merged 1 commit into from May 12, 2022
Merged

OpenAL soft statically linked; uses "fixed" path, leaves dynamic stuf… #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Expand Up @@ -20,3 +20,6 @@
[submodule "extern/glslang"]
path = extern/glslang
url = https://github.com/KhronosGroup/glslang
[submodule "extern/openal-soft"]
path = extern/openal-soft
url = https://github.com/kcat/openal-soft.git
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Expand Up @@ -125,7 +125,7 @@ IF(CONFIG_LINUX_PACKAGING_SUPPORT)

set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.nvidia.com/en-us/geforce/news/quake-ii-rtx-ray-tracing-vulkan-vkray-geforce-rtx/")

set(CPACK_DEBIAN_PACKAGE_DEPENDS "libopenal1, libvulkan1")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libvulkan1")

set(CPACK_DEB_PACKAGE_COMPONENT ON)
set(CPACK_DEB_COMPONENT_INSTALL ON)
Expand Down
5 changes: 5 additions & 0 deletions extern/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -84,3 +84,8 @@ target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb)

add_library(tinyobjloader INTERFACE)
target_include_directories(tinyobjloader INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/tinyobjloader-c)

set(LIBTYPE STATIC)
set(FORCE_STATIC_VCRT TRUE)
add_subdirectory(openal-soft)
set_target_properties(OpenAL PROPERTIES FOLDER extern)
1 change: 1 addition & 0 deletions extern/openal-soft
Open in desktop
Submodule openal-soft added at 2fb753
16 changes: 5 additions & 11 deletions src/CMakeLists.txt
View file
Open in desktop
@@ -1,13 +1,6 @@
cmake_minimum_required (VERSION 3.9)
cmake_policy(SET CMP0069 NEW)

if (UNIX)
FIND_PACKAGE(OpenAL)
if (NOT OPENAL_INCLUDE_DIR)
message(FATAL_ERROR "Can't find OpenAL. Please install the libopenal-dev package.")
endif()
endif()

SET(SRC_BASEQ2
baseq2/g_ai.c
baseq2/g_chase.c
Expand Down Expand Up @@ -124,8 +117,8 @@ SET(SRC_CLIENT
client/sound/mem.c
client/sound/mix.c
client/sound/ogg.c
# client/sound/qal/fixed.c
client/sound/qal/dynamic.c
client/sound/qal/fixed.c
# client/sound/qal/dynamic.c
)

SET(SRC_CLIENT_HTTP
Expand Down Expand Up @@ -388,7 +381,7 @@ ADD_DEFINITIONS(-DVERSION_POINT=${Q2RTX_VERSION_POINT})
ADD_DEFINITIONS(-DVERSION_SHA=${Q2RTX_VERSION_SHA})
ADD_DEFINITIONS(-DVERSION_BRANCH=${Q2RTX_VERSION_BRANCH})

ADD_DEFINITIONS(-DHAVE_CONFIG_H=1 -DCURL_STATICLIB)
ADD_DEFINITIONS(-DHAVE_CONFIG_H=1 -DCURL_STATICLIB -DAL_LIBTYPE_STATIC)

IF(WIN32)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
Expand Down Expand Up @@ -441,7 +434,7 @@ ENDIF()
TARGET_COMPILE_DEFINITIONS(server PRIVATE USE_SERVER=1 USE_CLIENT=0)

IF (TARGET client)
TARGET_COMPILE_DEFINITIONS(client PRIVATE USE_SERVER=1 USE_CLIENT=1)
TARGET_COMPILE_DEFINITIONS(client PRIVATE USE_SERVER=1 USE_CLIENT=1 USE_FIXED_LIBAL=1)

IF(CONFIG_USE_CURL)
TARGET_SOURCES(client PRIVATE ${SRC_CLIENT_HTTP})
Expand Down Expand Up @@ -476,6 +469,7 @@ IF (TARGET client)

TARGET_LINK_LIBRARIES(client stb)
TARGET_LINK_LIBRARIES(client tinyobjloader)
TARGET_LINK_LIBRARIES(client OpenAL)
ENDIF()

SOURCE_GROUP("baseq2\\sources" FILES ${SRC_BASEQ2})
Expand Down