Browse Source

cmake: update vgui path.

hl_urbicide
Andrey Akhmichin 2 years ago
parent
commit
b0b68d5755
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
  1. 10
      cl_dll/CMakeLists.txt

10
cl_dll/CMakeLists.txt

@ -156,8 +156,8 @@ include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_
if (USE_VGUI) if (USE_VGUI)
SET(CMAKE_SKIP_RPATH TRUE) SET(CMAKE_SKIP_RPATH TRUE)
link_directories(${CMAKE_SOURCE_DIR}/vgui-dev/lib) link_directories(${CMAKE_SOURCE_DIR}/vgui_support/vgui-dev/lib)
include_directories(../vgui-dev/include) include_directories(../vgui_support/vgui-dev/include)
else() else()
include_directories(../utils/false_vgui/include) include_directories(../utils/false_vgui/include)
endif() endif()
@ -178,11 +178,11 @@ endif()
if (USE_VGUI) if (USE_VGUI)
if (WIN32) if (WIN32)
add_library(vgui SHARED IMPORTED) add_library(vgui SHARED IMPORTED)
set_property(TARGET vgui PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/vgui-dev/lib/win32_vc6/vgui.dll") set_property(TARGET vgui PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/vgui_support/vgui-dev/lib/win32_vc6/vgui.dll")
set_property(TARGET vgui PROPERTY IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/vgui-dev/lib/win32_vc6/vgui.lib") set_property(TARGET vgui PROPERTY IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/vgui_support/vgui-dev/lib/win32_vc6/vgui.lib")
target_link_libraries(${CLDLL_LIBRARY} vgui) target_link_libraries(${CLDLL_LIBRARY} vgui)
elseif(APPLE) elseif(APPLE)
target_link_libraries(${CLDLL_LIBRARY} "-Wl,--no-undefined -L${CMAKE_SOURCE_DIR}/vgui-dev/lib vgui.dylib") target_link_libraries(${CLDLL_LIBRARY} "-Wl,--no-undefined -L${CMAKE_SOURCE_DIR}/vgui_support/vgui-dev/lib vgui.dylib")
else() else()
target_link_libraries(${CLDLL_LIBRARY} :vgui.so) target_link_libraries(${CLDLL_LIBRARY} :vgui.so)
endif() endif()

Loading…
Cancel
Save