fixed windows linking errors with libdl and sfml dependencies
This commit is contained in:
parent
28602f22a8
commit
3519bcce6c
@ -171,11 +171,7 @@ if(SFML_MODULES)
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
find_library(SFML_DEP_GDI
|
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_WINDOW} gdi32)
|
||||||
NAMES gdi32
|
|
||||||
PATHS ${LIB_PATHS}
|
|
||||||
)
|
|
||||||
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_WINDOW} ${SFML_DEP_GDI})
|
|
||||||
elseif(UNIX)
|
elseif(UNIX)
|
||||||
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_WINDOW})
|
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_WINDOW})
|
||||||
endif()
|
endif()
|
||||||
@ -253,11 +249,7 @@ if(SFML_MODULES)
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
find_library(SFML_DEP_WINMM
|
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_SYSTEM} winmm)
|
||||||
NAMES winmm
|
|
||||||
PATHS ${LIB_PATHS}
|
|
||||||
)
|
|
||||||
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_SYSTEM} ${SFML_DEP_WINMM})
|
|
||||||
elseif(UNIX)
|
elseif(UNIX)
|
||||||
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_SYSTEM})
|
LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_SYSTEM})
|
||||||
endif()
|
endif()
|
||||||
@ -374,15 +366,16 @@ include_directories(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(LIB_SRC_LIST)
|
if(LIB_SRC_LIST)
|
||||||
|
# please do not add -ldl here for all systems without any explanation
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
${LIBRARY_NAME}
|
${LIBRARY_NAME}
|
||||||
-ldl
|
|
||||||
${LIB_DEPENDENCIES_LIST}
|
${LIB_DEPENDENCIES_LIST}
|
||||||
)
|
)
|
||||||
if(EXEC_SRC_LIST)
|
if(EXEC_SRC_LIST)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
${EXECUTABLE_NAME}
|
${EXECUTABLE_NAME}
|
||||||
${LIBRARY_NAME}
|
${LIBRARY_NAME}
|
||||||
|
${LIB_DEPENDENCIES_LIST}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
elseif(EXEC_SRC_LIST)
|
elseif(EXEC_SRC_LIST)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user