diff --git a/CMakeLists.txt b/CMakeLists.txt index f68514f..58af670 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build) set(CMAKE_CONFIGURATION_TYPES Debug Release) -add_subdirectory(host) add_subdirectory(GUI) add_subdirectory(minhook) add_subdirectory(vnrhook) diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt index a8bdd13..4a34756 100644 --- a/GUI/CMakeLists.txt +++ b/GUI/CMakeLists.txt @@ -9,9 +9,11 @@ set(gui_SRCS mainwindow.cpp misc.cpp extensions.cpp + host/host.cc + host/textthread.cc ${RESOURCE_FILES} ) add_executable(${PROJECT_NAME} WIN32 ${gui_SRCS}) -target_link_libraries(${PROJECT_NAME} Qt5::Widgets vnrhost) +target_link_libraries(${PROJECT_NAME} Qt5::Widgets) install_qt5_libs(${PROJECT_NAME}) diff --git a/host/host.cc b/GUI/host/host.cc similarity index 98% rename from host/host.cc rename to GUI/host/host.cc index 40b2802..6f54e53 100644 --- a/host/host.cc +++ b/GUI/host/host.cc @@ -8,9 +8,6 @@ #include "../vnrhook/hijack/texthook.h" #include // A2W - -bool operator==(const ThreadParam& one, const ThreadParam& two) { return one.pid == two.pid && one.hook == two.hook && one.retn == two.retn && one.spl == two.spl; } - namespace { struct ProcessRecord diff --git a/host/host.h b/GUI/host/host.h similarity index 100% rename from host/host.h rename to GUI/host/host.h diff --git a/host/textthread.cc b/GUI/host/textthread.cc similarity index 100% rename from host/textthread.cc rename to GUI/host/textthread.cc diff --git a/host/textthread.h b/GUI/host/textthread.h similarity index 100% rename from host/textthread.h rename to GUI/host/textthread.h diff --git a/GUI/mainwindow.h b/GUI/mainwindow.h index bd0f31d..e741f19 100644 --- a/GUI/mainwindow.h +++ b/GUI/mainwindow.h @@ -5,7 +5,7 @@ #include #include #include -#include "../host/host.h" +#include "host/host.h" namespace Ui { diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt deleted file mode 100644 index cf8d5af..0000000 --- a/host/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -set(vnrhost_src - host.cc - textthread.cc -) - -add_library(vnrhost ${vnrhost_src}) - -set_target_properties(vnrhost PROPERTIES LINK_FLAGS /SUBSYSTEM:WINDOWS) - -target_compile_options(vnrhost PRIVATE -# /GR- - $<$:> - $<$:> -) - -target_compile_definitions(vnrhost - PRIVATE - ITH_HAS_CRT - _CRT_NON_CONFORMING_SWPRINTFS -)