diff --git a/CMakeLists.txt b/CMakeLists.txt index 58af670..d5ac899 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,5 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build) set(CMAKE_CONFIGURATION_TYPES Debug Release) add_subdirectory(GUI) -add_subdirectory(minhook) add_subdirectory(vnrhook) add_subdirectory(extensions) diff --git a/vnrhook/CMakeLists.txt b/vnrhook/CMakeLists.txt index 633f091..e2bf28a 100644 --- a/vnrhook/CMakeLists.txt +++ b/vnrhook/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(.) +include_directories(. util) if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") set(vnrhook_src @@ -22,7 +22,7 @@ set(vnrhook_src ) endif() -include_directories(util) +add_subdirectory(libminhook) add_library(vnrhook SHARED ${vnrhook_src}) diff --git a/include/MinHook.h b/vnrhook/MinHook.h similarity index 100% rename from include/MinHook.h rename to vnrhook/MinHook.h diff --git a/minhook/CMakeLists.txt b/vnrhook/libminhook/CMakeLists.txt similarity index 100% rename from minhook/CMakeLists.txt rename to vnrhook/libminhook/CMakeLists.txt diff --git a/minhook/buffer.c b/vnrhook/libminhook/buffer.c similarity index 100% rename from minhook/buffer.c rename to vnrhook/libminhook/buffer.c diff --git a/minhook/buffer.h b/vnrhook/libminhook/buffer.h similarity index 100% rename from minhook/buffer.h rename to vnrhook/libminhook/buffer.h diff --git a/minhook/hde/hde32.c b/vnrhook/libminhook/hde/hde32.c similarity index 100% rename from minhook/hde/hde32.c rename to vnrhook/libminhook/hde/hde32.c diff --git a/minhook/hde/hde32.h b/vnrhook/libminhook/hde/hde32.h similarity index 100% rename from minhook/hde/hde32.h rename to vnrhook/libminhook/hde/hde32.h diff --git a/minhook/hde/hde64.c b/vnrhook/libminhook/hde/hde64.c similarity index 100% rename from minhook/hde/hde64.c rename to vnrhook/libminhook/hde/hde64.c diff --git a/minhook/hde/hde64.h b/vnrhook/libminhook/hde/hde64.h similarity index 100% rename from minhook/hde/hde64.h rename to vnrhook/libminhook/hde/hde64.h diff --git a/minhook/hde/pstdint.h b/vnrhook/libminhook/hde/pstdint.h similarity index 100% rename from minhook/hde/pstdint.h rename to vnrhook/libminhook/hde/pstdint.h diff --git a/minhook/hde/table32.h b/vnrhook/libminhook/hde/table32.h similarity index 100% rename from minhook/hde/table32.h rename to vnrhook/libminhook/hde/table32.h diff --git a/minhook/hde/table64.h b/vnrhook/libminhook/hde/table64.h similarity index 100% rename from minhook/hde/table64.h rename to vnrhook/libminhook/hde/table64.h diff --git a/minhook/hook.c b/vnrhook/libminhook/hook.c similarity index 100% rename from minhook/hook.c rename to vnrhook/libminhook/hook.c diff --git a/minhook/trampoline.c b/vnrhook/libminhook/trampoline.c similarity index 100% rename from minhook/trampoline.c rename to vnrhook/libminhook/trampoline.c diff --git a/minhook/trampoline.h b/vnrhook/libminhook/trampoline.h similarity index 100% rename from minhook/trampoline.h rename to vnrhook/libminhook/trampoline.h