mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2025-01-18 22:51:39 +00:00
Force STATIC for internal GZDoom libraries
This makes sure the internal versions of these libraries bundled with the GZDoom source code is used. This prevents the system from building GZDoom for dynamic linking with incompatible external libraries (see <https://forum.zdoom.org/viewtopic.php?f=2&t=64633>). # Conflicts: # glslang/glslang/CMakeLists.txt # glslang/spirv/CMakeLists.txt
This commit is contained in:
parent
9191a33d82
commit
f31e0bcd85
7 changed files with 7 additions and 7 deletions
|
@ -97,7 +97,7 @@ set(ASMJIT_SRCS
|
|||
asmjit/x86/x86regalloc.cpp
|
||||
)
|
||||
|
||||
add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
|
||||
add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS})
|
||||
|
||||
set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
|
|||
endif()
|
||||
|
||||
add_definitions( -DBZ_NO_STDIO )
|
||||
add_library( bz2
|
||||
add_library( bz2 STATIC
|
||||
blocksort.c
|
||||
bzlib.c
|
||||
compress.c
|
||||
|
|
|
@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
|
|||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
# Add library to be compiled.
|
||||
add_library(gme ${libgme_SRCS})
|
||||
add_library(gme STATIC ${libgme_SRCS})
|
||||
|
||||
if(ZLIB_FOUND)
|
||||
message(" ** ZLib library located, compressed file formats will be supported")
|
||||
|
|
|
@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE )
|
|||
set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
|
||||
endif()
|
||||
|
||||
add_library( gdtoa
|
||||
add_library( gdtoa STATIC
|
||||
${GEN_FP_FILES}
|
||||
dmisc.c
|
||||
dtoa.c
|
||||
|
|
|
@ -6,7 +6,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
|
|||
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
|
||||
endif()
|
||||
|
||||
add_library( jpeg
|
||||
add_library( jpeg STATIC
|
||||
jaricom.c
|
||||
jcomapi.c
|
||||
jdapimin.c
|
||||
|
|
|
@ -34,5 +34,5 @@ else()
|
|||
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
|
||||
endif()
|
||||
|
||||
add_library( lzma ${LZMA_FILES} )
|
||||
add_library( lzma STATIC ${LZMA_FILES} )
|
||||
target_link_libraries( lzma )
|
||||
|
|
|
@ -137,7 +137,7 @@ if(MINGW)
|
|||
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
|
||||
endif()
|
||||
|
||||
add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
||||
add_library(${ZLIBNAME} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
||||
set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
|
||||
|
||||
set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)
|
||||
|
|
Loading…
Reference in a new issue