zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 07:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Force STATIC for internal GZDoom libraries

Browse source 
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>).
This commit is contained in:
William Breathitt Gray 2019-05-15 23:58:28 +09:00 committed by Christoph Oelckers
parent 0c40faf0b4
commit 6fafa297bf
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asmjit/CMakeLists.txt
View file

@ -97,7 +97,7 @@ set(ASMJIT_SRCS
asmjit/x86/x86regalloc.cpp 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) set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit)

2
bzip2/CMakeLists.txt
View file

@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
endif() endif()
add_definitions( -DBZ_NO_STDIO ) add_definitions( -DBZ_NO_STDIO )
add_library( bz2 add_library( bz2 STATIC
blocksort.c blocksort.c
bzlib.c bzlib.c
compress.c compress.c

2
game-music-emu/gme/CMakeLists.txt
View file

@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
# Add library to be compiled. # Add library to be compiled.
add_library(gme ${libgme_SRCS}) add_library(gme STATIC ${libgme_SRCS})
if(ZLIB_FOUND) if(ZLIB_FOUND)
message(" ** ZLib library located, compressed file formats will be supported") message(" ** ZLib library located, compressed file formats will be supported")

2
gdtoa/CMakeLists.txt
View file

@ -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 ) set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
endif() endif()
add_library( gdtoa add_library( gdtoa STATIC
${GEN_FP_FILES} ${GEN_FP_FILES}
dmisc.c dmisc.c
dtoa.c dtoa.c

2
glslang/glslang/CMakeLists.txt
View file

@ -120,7 +120,7 @@ endmacro(glslang_pch)
glslang_pch(SOURCES MachineIndependent/pch.cpp) glslang_pch(SOURCES MachineIndependent/pch.cpp)
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY FOLDER glslang)
set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(glslang OGLCompiler OSDependent) target_link_libraries(glslang OGLCompiler OSDependent)

2
glslang/spirv/CMakeLists.txt
View file

@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS)
GLSL.ext.NV.h) GLSL.ext.NV.h)
endif(ENABLE_NV_EXTENSIONS) endif(ENABLE_NV_EXTENSIONS)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY FOLDER glslang)
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(SPIRV PUBLIC ..) target_include_directories(SPIRV PUBLIC ..)

2
jpeg/CMakeLists.txt
View file

@ -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" ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
endif() endif()
add_library( jpeg add_library( jpeg STATIC
jaricom.c jaricom.c
jcomapi.c jcomapi.c
jdapimin.c jdapimin.c

2
lzma/CMakeLists.txt
View file

@ -34,5 +34,5 @@ else()
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" )
endif() endif()
add_library( lzma ${LZMA_FILES} ) add_library( lzma STATIC ${LZMA_FILES} )
target_link_libraries( lzma ) target_link_libraries( lzma )

2
zlib/CMakeLists.txt
View file

@ -137,7 +137,7 @@ if(MINGW)
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif() 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 DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1) set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)