include fixes

geode-sdk · May 26, 2024 · 40d632d · 40d632d
1 parent b566e02
commit 40d632d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/target/Windows32Target.cpp b/src/target/Windows32Target.cpp
@@ -7,6 +7,15 @@ using namespace tulip::hook;
 
 #if defined(TULIP_HOOK_WINDOWS)
 
+#if defined(TULIP_HOOK_X86)
+
+Target& Target::get() {
+	static Windows32Target ret;
+	return ret;
+}
+
+#endif
+
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
@@ -54,11 +63,6 @@ uint32_t Windows32Target::getWritableProtection() {
 	return PAGE_READWRITE;
 }
 
-Target& Target::get() {
-	static Windows32Target ret;
-	return ret;
-}
-
 Result<csh> Windows32Target::openCapstone() {
 	cs_err status;
 

diff --git a/src/target/Windows64Target.cpp b/src/target/Windows64Target.cpp
@@ -1,5 +1,6 @@
 #include "Windows64Target.hpp"
 
+#include <memory>
 #include <Platform.hpp>
 
 using namespace tulip::hook;

diff --git a/src/target/Windows64Target.hpp b/src/target/Windows64Target.hpp
@@ -4,13 +4,13 @@
 
 #if defined(TULIP_HOOK_WINDOWS) && defined(TULIP_HOOK_X64)
 
-#include "../generator/X86Generator.hpp"
+#include "../generator/X64Generator.hpp"
 #include "Windows32Target.hpp"
 
 namespace tulip::hook {
 	class Windows64Target : public Windows32Target {
 	public:
-		using Target::Target;
+		using Windows32Target::Windows32Target;
 
 		Result<csh> openCapstone() override;
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -11,7 +11,7 @@ enable_testing()
 add_executable(${PROJECT_NAME} Assembler86.cpp Assembler64.cpp Hook.cpp)
 target_link_libraries(${PROJECT_NAME} PUBLIC GTest::gtest_main TulipHook)
 
-if(WIN32)
+if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/INCREMENTAL:NO")
 
 	# add_executable(WinTest misc/WinTest.cpp)