diff --git a/CMakeLists.txt b/CMakeLists.txt index 22eed40..505948c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,8 +61,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/version) include(generate_product_version) set(VERSION_MAJOR 3) -set(VERSION_MINOR 2) -set(VERSION_PATCH 3) +set(VERSION_MINOR 3) +set(VERSION_PATCH 0) set(VERSION_REVISION 0) if(BUILD_CORE) diff --git a/LunaHook/CMakeLists.txt b/LunaHook/CMakeLists.txt index 6d8befe..90e93fd 100644 --- a/LunaHook/CMakeLists.txt +++ b/LunaHook/CMakeLists.txt @@ -51,4 +51,4 @@ target_precompile_headers(LunaHook REUSE_FROM pchhook) set_target_properties(LunaHook PROPERTIES OUTPUT_NAME "LunaHook${bitappendix}") -target_link_libraries(LunaHook pch minhook commonengine utils ${YY_Thunks_for_WinXP} ${Detours}) \ No newline at end of file +target_link_libraries(LunaHook Shlwapi pch minhook commonengine utils ${YY_Thunks_for_WinXP} ${Detours}) \ No newline at end of file diff --git a/libs/libs.cmake b/libs/libs.cmake index 7656575..ddc5c92 100644 --- a/libs/libs.cmake +++ b/libs/libs.cmake @@ -1,7 +1,11 @@ if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) set(Detours ${CMAKE_CURRENT_LIST_DIR}/Detours-4.0.1/lib.X64/detours.lib) else() + if(NOT DEFINED WINXP) + set(YY_Thunks_for_WinXP) + else() set(YY_Thunks_for_WinXP ${CMAKE_CURRENT_LIST_DIR}/YY-Thunks-1.0.7-Binary/objs/X86/YY_Thunks_for_WinXP.obj) + endif() set(Detours ${CMAKE_CURRENT_LIST_DIR}/Detours-4.0.1/lib.X86/detours.lib) endif()