fix usage of object libraries

This commit is contained in:
Walter Julius Hennecke 2019-02-22 22:16:05 +01:00
parent 1606eec96e
commit 125c8f7a56

View file

@ -27,8 +27,8 @@ set(GAME_LIB_NAME "qagame${ARCH}")
file(GLOB_RECURSE GAME_SRC "*.h" "*.c" "*.cpp") file(GLOB_RECURSE GAME_SRC "*.h" "*.c" "*.cpp")
add_library(${GAME_LIB_NAME} SHARED ${GAME_SRC}) add_library(${GAME_LIB_NAME} SHARED ${GAME_SRC} $<TARGET_OBJECTS:base_game>)
target_link_libraries(${GAME_LIB_NAME} base_game) target_link_libraries(${GAME_LIB_NAME})
target_include_directories(${GAME_LIB_NAME} PUBLIC ../lua/include ../json/include) target_include_directories(${GAME_LIB_NAME} PUBLIC ../lua/include ../json/include)
target_compile_options(${GAME_LIB_NAME} PUBLIC -fpermissive) target_compile_options(${GAME_LIB_NAME} PUBLIC -fpermissive)
set_target_properties(${GAME_LIB_NAME} PROPERTIES PREFIX "") set_target_properties(${GAME_LIB_NAME} PROPERTIES PREFIX "")