reorganize

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)

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})

GUI/host/host.cc

@@ -8,9 +8,6 @@
 #include "../vnrhook/hijack/texthook.h"
 #include <atlbase.h> // 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

GUI/mainwindow.h

@@ -5,7 +5,7 @@
 #include <QMainWindow>
 #include <QPlainTextEdit>
 #include <QComboBox>
-#include "../host/host.h"
+#include "host/host.h"
 
 namespace Ui
 {

host/CMakeLists.txt

@@ -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-
-  $<$<CONFIG:Release>:>
-  $<$<CONFIG:Debug>:>
-)
-
-target_compile_definitions(vnrhost
-  PRIVATE
-  ITH_HAS_CRT
-  _CRT_NON_CONFORMING_SWPRINTFS
-)