Windows-related fixes.

This commit is contained in:
Quentin Bazin 2020-04-29 20:50:39 +02:00
parent 6435595762
commit 1662335649
3 changed files with 4 additions and 3 deletions

View File

@ -191,8 +191,9 @@ include_directories(external/gamekit/include)
set(SFML_BUILD_AUDIO FALSE)
set(SFML_BUILD_GRAPHICS FALSE)
set(SFML_BUILD_WINDOW FALSE)
set(SFML_STATIC TRUE)
set(BUILD_SHARED_LIBS ON)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(external/SFML)

View File

@ -50,6 +50,7 @@ endif ()
target_link_libraries(${PROJECT_NAME}
${CMAKE_PROJECT_NAME}_server_lib
${CMAKE_PROJECT_NAME}_common
gamekit
${OPENGL_LIBRARIES}
${SDL2_LIBRARIES}
${SDL2_IMAGE_LIBRARIES}
@ -60,6 +61,5 @@ target_link_libraries(${PROJECT_NAME}
${LUA_LIBRARIES}
sfml-system
sfml-network
gamekit
${UNIX_LIBS})

View File

@ -69,6 +69,7 @@ target_link_libraries(${PROJECT_NAME}_lib sfml-system sfml-network)
target_link_libraries(${PROJECT_NAME}
${PROJECT_NAME}_lib
${CMAKE_PROJECT_NAME}_common
gamekit
${OPENGL_LIBRARIES}
${SDL2_LIBRARIES}
${SDL2_IMAGE_LIBRARIES}
@ -79,6 +80,5 @@ target_link_libraries(${PROJECT_NAME}
${LUA_LIBRARIES}
sfml-system
sfml-network
gamekit
${UNIX_LIBS})