etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2025-02-23 03:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed openal usage and force the 32 bit libdir paths

Browse source
This commit is contained in:
Jacker 2024-02-01 10:57:51 +02:00
parent 21ea542b69
commit f3371620e6
No known key found for this signature in database
GPG key ID: CC846B58E6BDCFF2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -197,6 +197,11 @@ function(etl_setup_cmake_args _list)
list(APPEND ${_list} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>)
endif()
if (NOT "${ARGN}" MATCHES "-DCMAKE_INSTALL_LIBDIR=" AND UNIX)
message(VERBOSE "Appending default 32 bit gnu libdir to the cmake args")
list(APPEND ${_list} -DCMAKE_INSTALL_LIBDIR=<INSTALL_DIR>/lib)
endif()
if (ARGC GREATER 1)
list(APPEND ${_list} ${ARGN})
endif()
@ -605,7 +610,6 @@ if(BUNDLED_OPENAL AND BUILD_CLIENT)
BUILD_BYPRODUCTS ${OPENAL_BUNDLED_LIBRARIES}
CMAKE_ARGS ${BUNDLED_OPENAL_CMAKE_ARGS}
)
ExternalProject_Get_Property(bundled_openal binary_dir)
add_dependencies(bundled_openal_int bundled_openal)
target_link_libraries(bundled_openal_int INTERFACE ${OPENAL_BUNDLED_LIBRARIES})
@ -1090,7 +1094,7 @@ if(BUNDLED_JPEG AND BUILD_CLIENT)
etl_setup_cmake_args(bundled_jpeg_cmake_args
-DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DREQUIRE_SIMD=OFF -DWITH_12BIT=OFF
-DWITH_ARITH_DEC=ON -DWITH_ARITH_ENC=ON -DWITH_JAVA=OFF -DWITH_JPEG7=OFF -DWITH_JPEG8=ON
-DWITH_MEM_SRCDST=ON -DWITH_SIMD=OFF -DWITH_TURBOJPEG=ON -DCMAKE_INSTALL_LIBDIR=<INSTALL_DIR>/lib
-DWITH_MEM_SRCDST=ON -DWITH_SIMD=OFF -DWITH_TURBOJPEG=ON
)
ExternalProject_Add(bundled_jpeg