Added DynamicHooks back again as a static library

Author: Ayuto

src/CMakeLists.txt

@@ -249,11 +249,8 @@ Set(SOURCEPYTHON_MEMORY_MODULE_SOURCES
     core/modules/memory/memory_scanner.cpp
     core/modules/memory/memory_tools.cpp
     core/modules/memory/memory_hooks.cpp
-    core/modules/memory/memory_wrap_python.cpp
     core/modules/memory/memory_callback.cpp
-    thirdparty/DynamicHooks/asm.cpp
-    thirdparty/DynamicHooks/utilities.cpp
-    thirdparty/DynamicHooks/DynamicHooks.cpp
+    core/modules/memory/memory_wrap_python.cpp
 )
 
 # ------------------------------------------------------------------

src/makefiles/linux/linux.base.cmake

@@ -96,11 +96,13 @@ Set(SOURCEPYTHON_LINK_LIBRARIES_RELEASE
     ${BOOSTSDK_LIB}/libboost_python.a
     ${PYTHONSDK_LIB}/libpython3.3m.so.1.0
     ${ASMJITSDK_LIB}/libAsmJit.a
+    ${DYNAMICHOOKSSDK_LIB}/libDynamicHooks.a
 )
 
 Set(SOURCEPYTHON_LINK_LIBRARIES_DEBUG
     ${PYTHONSDK_LIB}/libpython3.3dm.a
     ${BOOSTSDK_LIB}/libboost_python_d.a
     ${PYTHONSDK_LIB}/libpython3.3dm.so.1.0
     ${ASMJITSDK_LIB}/libAsmJit_d.a
-)
+    ${DYNAMICHOOKSSDK_LIB}/libDynamicHooks.a
+)

src/makefiles/shared.cmake

@@ -49,7 +49,9 @@ Set(ASMJITSDK_LIB     ${ASMJITSDK}/lib)
 # ------------------------------------------------------------------
 # DynamicHooks specific.
 # ------------------------------------------------------------------
-Set(DYNAMICHOOKSSDK ${THIRDPARTY_DIR}/DynamicHooks)
+Set(DYNAMICHOOKSSDK           ${THIRDPARTY_DIR}/DynamicHooks)
+Set(DYNAMICHOOKSSDK_INCLUDE   ${DYNAMICHOOKSSDK}/include)
+Set(DYNAMICHOOKSSDK_LIB       ${DYNAMICHOOKSSDK}/lib)
 
 # ------------------------------------------------------------------
 # Include directories
@@ -67,7 +69,7 @@ Include_Directories(
     ${DYNCALLSDK_INCLUDE}
     ${BOOSTSDK_INCLUDE}
     ${ASMJITSDK_INCLUDE}
-    ${DYNAMICHOOKSSDK}
+    ${DYNAMICHOOKSSDK_INCLUDE}
     ${CMAKE_CURRENT_SOURCE_DIR}/core # Hack but required.
 )
 

src/makefiles/win32/win32.base.cmake

@@ -64,6 +64,7 @@ Set(SOURCEPYTHON_LINK_LIBRARIES
     ${DYNCALLSDK_LIB}/libdynload_s.lib
     optimized ${ASMJITSDK_LIB}/AsmJit.lib
     debug ${ASMJITSDK_LIB}/AsmJit_d.lib
+    ${DYNAMICHOOKSSDK_LIB}/DynamicHooks.lib
 )
 
 # CSGO Engine adds in interfaces.lib