diff --git a/CMakeLists.txt b/CMakeLists.txt index 2651d36..59ccc15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,15 +255,15 @@ if (IS_OS_LINUX) elseif (IS_OS_WINDOWS) set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/EHS") install(TARGETS EHS_Dyn LIBRARY DESTINATION "lib") + install(TARGETS EHS_Dyn RUNTIME DESTINATION "bin") + + file(GLOB DLL_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.dll") + install(FILES ${DLL_FILES} DESTINATION "bin") endif () install(TARGETS EHS_Stc DESTINATION "lib") -install(TARGETS EHS_Dyn RUNTIME DESTINATION "bin") install(TARGETS StrToHash DESTINATION "bin") -file(GLOB DLL_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.dll") -install(FILES ${DLL_FILES} DESTINATION "bin") - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "include") find_package(ZLIB REQUIRED) @@ -295,6 +295,6 @@ elseif (IS_OS_LINUX) target_link_libraries(StrToHash xcb xcb-cursor xcb-xfixes xcb-xinput) endif () - target_link_libraries(EHS_Dyn asound) + target_link_libraries(EHS_Dyn z asound) target_link_libraries(StrToHash z asound EHS_Stc) endif () \ No newline at end of file diff --git a/src/system/System_LNX.cpp b/src/system/System_LNX.cpp index f837345..dfaff88 100644 --- a/src/system/System_LNX.cpp +++ b/src/system/System_LNX.cpp @@ -1,9 +1,9 @@ #include "ehs/system/System_LNX.h" +#include #include #include "ehs/system/Thread.h" -#include "ehs/Log.h" namespace ehs {