diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e312ff..412113e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20 /Zc:__cplusplus") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") -find_package(Qt6 REQUIRED COMPONENTS Widgets Core Gui Core5Compat QUIET) +find_package(Qt6 REQUIRED COMPONENTS Widgets Core Gui Core5Compat Xml QUIET) add_subdirectory(framework) add_subdirectory(injector) \ No newline at end of file diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 49ddd78..44f9475 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -11,8 +11,8 @@ file(GLOB_RECURSE FRAMEWORK_HOOK_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/hook/*.cpp" ) file(GLOB_RECURSE FRAMEWORK_HEADERS CONFIGURE_DEPENDS - "${CMAKE_CURRENT_SOURCE_DIR}/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" + "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp" ) list(FILTER FRAMEWORK_SOURCES EXCLUDE REGEX "/(out|build|cmake-build-|CMakeFiles)/") @@ -30,6 +30,7 @@ function(link_libs_and_set_properties target_name) target_include_directories(${target_name} PUBLIC "${QT6_ROOT_DIR}/include/QtGui") target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/toon_boom") + target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/framework") target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/hooks") target_include_directories(${target_name} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/internal") @@ -38,6 +39,7 @@ function(link_libs_and_set_properties target_name) target_link_libraries(${target_name} PUBLIC "${QT6_ROOT_DIR}/lib/Qt6Gui.lib") target_link_libraries(${target_name} PUBLIC "${QT6_ROOT_DIR}/lib/Qt6Widgets.lib") target_link_libraries(${target_name} PUBLIC "${QT6_ROOT_DIR}/lib/Qt6Core5Compat.lib") + target_link_libraries(${target_name} PUBLIC "${QT6_ROOT_DIR}/lib/Qt6Xml.lib") target_compile_options(${target_name} PUBLIC "/EHsc") target_link_libraries(${target_name} PUBLIC minhook::minhook) set_target_properties(${target_name} PROPERTIES