ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correcting a bug with the linker

Browse Source
This commit is contained in:
samuncle 2014-01-22 02:24:37 +01:00
parent 3410b3df6f
commit 65a72f2ba8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -220,6 +220,13 @@ else()
target_link_libraries(supertuxkart ${PTHREAD_LIBRARY}) target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
endif() endif()
# CURL
if(WIN32)
target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/libcurldll.a)
else()
find_package(CURL REQUIRED)
include_directories(${CURL_INCLUDE_DIRS})
endif()
# Common library dependencies # Common library dependencies
target_link_libraries(supertuxkart target_link_libraries(supertuxkart
@ -234,14 +241,6 @@ target_link_libraries(supertuxkart
${OPENAL_LIBRARY} ${OPENAL_LIBRARY}
${OPENGL_LIBRARIES}) ${OPENGL_LIBRARIES})
# CURL
if(WIN32)
target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/libcurldll.a)
else()
find_package(CURL REQUIRED)
include_directories(${CURL_INCLUDE_DIRS})
endif()
if(APPLE) if(APPLE)
# In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has