Fixed CMakeLists.txt and System_LNX.cpp.
This commit is contained in:
parent
86a35fd668
commit
2e705627ac
@ -255,14 +255,14 @@ if (IS_OS_LINUX)
|
|||||||
elseif (IS_OS_WINDOWS)
|
elseif (IS_OS_WINDOWS)
|
||||||
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/EHS")
|
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/EHS")
|
||||||
install(TARGETS EHS_Dyn LIBRARY DESTINATION "lib")
|
install(TARGETS EHS_Dyn LIBRARY DESTINATION "lib")
|
||||||
endif ()
|
|
||||||
|
|
||||||
install(TARGETS EHS_Stc DESTINATION "lib")
|
|
||||||
install(TARGETS EHS_Dyn RUNTIME DESTINATION "bin")
|
install(TARGETS EHS_Dyn RUNTIME DESTINATION "bin")
|
||||||
install(TARGETS StrToHash DESTINATION "bin")
|
|
||||||
|
|
||||||
file(GLOB DLL_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.dll")
|
file(GLOB DLL_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.dll")
|
||||||
install(FILES ${DLL_FILES} DESTINATION "bin")
|
install(FILES ${DLL_FILES} DESTINATION "bin")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
install(TARGETS EHS_Stc DESTINATION "lib")
|
||||||
|
install(TARGETS StrToHash DESTINATION "bin")
|
||||||
|
|
||||||
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "include")
|
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "include")
|
||||||
|
|
||||||
@ -295,6 +295,6 @@ elseif (IS_OS_LINUX)
|
|||||||
target_link_libraries(StrToHash xcb xcb-cursor xcb-xfixes xcb-xinput)
|
target_link_libraries(StrToHash xcb xcb-cursor xcb-xfixes xcb-xinput)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
target_link_libraries(EHS_Dyn asound)
|
target_link_libraries(EHS_Dyn z asound)
|
||||||
target_link_libraries(StrToHash z asound EHS_Stc)
|
target_link_libraries(StrToHash z asound EHS_Stc)
|
||||||
endif ()
|
endif ()
|
@ -1,9 +1,9 @@
|
|||||||
#include "ehs/system/System_LNX.h"
|
#include "ehs/system/System_LNX.h"
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
#include "ehs/system/Thread.h"
|
#include "ehs/system/Thread.h"
|
||||||
#include "ehs/Log.h"
|
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user