mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-04-07 04:53:28 +02:00
fix link issues for many targets
This commit is contained in:
parent
a290017746
commit
9441f9ffb7
4 changed files with 13 additions and 3 deletions
|
@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
|
|||
project(hifi)
|
||||
|
||||
IF (WIN32)
|
||||
add_definitions( -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS )
|
||||
add_definitions( -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS )
|
||||
ENDIF(WIN32)
|
||||
|
||||
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
|
||||
|
|
|
@ -41,3 +41,7 @@ include_directories(${ROOT_DIR}/externals/civetweb/include)
|
|||
if (UNIX)
|
||||
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
|
||||
endif (UNIX)
|
||||
|
||||
IF (WIN32)
|
||||
target_link_libraries(${TARGET_NAME} Winmm)
|
||||
ENDIF(WIN32)
|
||||
|
|
|
@ -37,4 +37,8 @@ link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
|
|||
# link dl library on UNIX for civetweb
|
||||
if (UNIX AND NOT APPLE)
|
||||
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
|
||||
endif (UNIX AND NOT APPLE)
|
||||
endif (UNIX AND NOT APPLE)
|
||||
|
||||
IF (WIN32)
|
||||
target_link_libraries(${TARGET_NAME} Winmm)
|
||||
ENDIF(WIN32)
|
||||
|
|
|
@ -26,4 +26,6 @@ link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
|
|||
# link in the hifi voxels library
|
||||
link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
|
||||
|
||||
|
||||
IF (WIN32)
|
||||
target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
|
||||
ENDIF(WIN32)
|
||||
|
|
Loading…
Reference in a new issue