Fixed Linux CS:GO linker errors

- Added AsmJit include files (we will need them later to create C++
callbacks)
- DynamicHooks is now compiled directly into the code

Author: Ayuto

src/CMakeLists.txt

@@ -252,6 +252,9 @@ Set(SOURCEPYTHON_MEMORY_MODULE_SOURCES
     core/modules/memory/memory_tools.cpp
     core/modules/memory/memory_hooks.cpp
     core/modules/memory/memory_wrap_python.cpp
+    thirdparty/DynamicHooks/asm.cpp
+    thirdparty/DynamicHooks/utilities.cpp
+    thirdparty/DynamicHooks/DynamicHooks.cpp
 )
 
 # ------------------------------------------------------------------

src/core/modules/listeners/listenermanager.h

@@ -12,11 +12,11 @@
 //-----------------------------------------------------------------------------
 // Macros
 //-----------------------------------------------------------------------------
-// This creates a static manager and an inline function that returns a pointer
-// to the manager. Must be used in a *.cpp file!
+// This creates a static manager and a function that returns a pointer to the
+// manager. Must be used in a *.cpp file!
 #define DEFINE_MANAGER_ACCESSOR(name) \
 	static CListenerManager s_##name; \
-	inline CListenerManager* Get##name##ListenerManager() \
+	CListenerManager* Get##name##ListenerManager() \
 	{ return &s_##name; }
 
 // Calls all listeners of the given manager

src/makefiles/linux/linux.base.cmake

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

src/makefiles/shared.cmake

@@ -45,12 +45,17 @@ Set(DYNCALLSDK_LIB       ${DYNCALLSDK}/lib)
 Set(PROTOBUF		${THIRDPARTY_DIR}/protobuf/protobuf-2.3.0)
 Set(PROTOBUF_INCLUDE	${PROTOBUF}/src)
 
+# ------------------------------------------------------------------
+# AsmJit specific.
+# ------------------------------------------------------------------
+Set(ASMJITSDK         ${THIRDPARTY_DIR}/AsmJit)
+Set(ASMJITSDK_INCLUDE ${ASMJITSDK}/include)
+Set(ASMJITSDK_LIB     ${ASMJITSDK}/lib)
+
 # ------------------------------------------------------------------
 # DynamicHooks specific.
 # ------------------------------------------------------------------
-Set(DYNAMICHOOKSSDK         ${THIRDPARTY_DIR}/DynamicHooks)
-Set(DYNAMICHOOKSSDK_INCLUDE ${DYNAMICHOOKSSDK}/include)
-Set(DYNAMICHOOKSSDK_LIB     ${DYNAMICHOOKSSDK}/lib)
+Set(DYNAMICHOOKSSDK ${THIRDPARTY_DIR}/DynamicHooks)
 
 # ------------------------------------------------------------------
 # Include directories
@@ -67,7 +72,8 @@ Include_Directories(
     ${DYNCALLSDK_INCLUDE}
     ${BOOSTSDK_INCLUDE}
     ${PROTOBUF_INCLUDE}
-    ${DYNAMICHOOKSSDK_INCLUDE}
+    ${ASMJITSDK_INCLUDE}
+    ${DYNAMICHOOKSSDK}
     ${CMAKE_CURRENT_SOURCE_DIR}/core # Hack but required.
 )
 

src/makefiles/win32/win32.base.cmake

@@ -62,10 +62,8 @@ Set(SOURCEPYTHON_LINK_LIBRARIES
     ${DYNCALLSDK_LIB}/libdyncall_s.lib
     ${DYNCALLSDK_LIB}/libdyncallback_s.lib
     ${DYNCALLSDK_LIB}/libdynload_s.lib
-    optimized ${DYNAMICHOOKSSDK_LIB}/AsmJit.lib
-    optimized ${DYNAMICHOOKSSDK_LIB}/DynamicHooks.lib
-    debug ${DYNAMICHOOKSSDK_LIB}/AsmJit_d.lib
-    debug ${DYNAMICHOOKSSDK_LIB}/DynamicHooks_d.lib
+    optimized ${ASMJITSDK_LIB}/AsmJit.lib
+    debug ${ASMJITSDK_LIB}/AsmJit_d.lib
 )
 
 # CSGO Engine adds in interfaces.lib

src/sdks/hl2sdk-csgo/public/eiface.h

@@ -208,7 +208,7 @@ abstract_class IVEngineServer
 	// Finish the EntityMessage and dispatch to network layer
 	virtual void		MessageEnd( void ) = 0;
 
-	virtual void		SendUserMessage( IRecipientFilter &filter, int message, const google::protobuf::Message &msg );
+	virtual void		SendUserMessage( IRecipientFilter &filter, int message, const google::protobuf::Message &msg ) = 0;
 
 	// Print szMsg to the client console.
 	virtual void		ClientPrintf( edict_t *pEdict, const char *szMsg ) = 0;

src/thirdparty/AsmJit/include/ApiBegin.h

@@ -0,0 +1,24 @@
+// [AsmJit]
+// Complete JIT Assembler for C++ Language.
+//
+// [License]
+// Zlib - See COPYING file in this package.
+
+// MSVC
+#if defined(_MSC_VER)
+
+// Disable some warnings we know about
+#pragma warning(push)
+#pragma warning(disable: 4127) // conditional expression is constant
+#pragma warning(disable: 4251) // struct needs to have dll-interface to be used
+                               // by clients of struct ...
+#pragma warning(disable: 4275) // non dll-interface struct ... used as base for
+                               // dll-interface struct
+#pragma warning(disable: 4355) // this used in base member initializer list
+#pragma warning(disable: 4800) // forcing value to bool 'true' or 'false'
+
+// Rename symbols.
+#define vsnprintf _vsnprintf
+#define snprintf _snprintf
+
+#endif // _MSC_VER

src/thirdparty/AsmJit/include/ApiEnd.h

@@ -0,0 +1,16 @@
+// [AsmJit]
+// Complete JIT Assembler for C++ Language.
+//
+// [License]
+// Zlib - See COPYING file in this package.
+
+#if defined(_MSC_VER)
+
+// Pop disabled warnings by ApiBegin.h
+#pragma warning(pop)
+
+// Rename symbols back.
+#undef vsnprintf
+#undef snprintf
+
+#endif // _MSC_VER