2.2.0 Release

hendrikp · Oct 11, 2015 · 814fe3e · 814fe3e
1 parent 4cf84a4
commit 814fe3e
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 36 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+Plugin SDK 2.2.0 (11.10.2015)
+-----------------------------
+Stable Release for CryEngine 3.8.3 (32/64 bit)
+
+New:
+* Verfied 3.8.3 compatibility
+
 Plugin SDK 2.1.0 (24.05.2015)
 -----------------------------
 Stable Release for CryEngine 3.6.16+ (32/64 bit)

diff --git a/disasm-lib/misc.h b/disasm-lib/misc.h
@@ -10,6 +10,8 @@ extern "C" {
 #include <stdarg.h>
 #include <assert.h>
 
+#undef MIN
+#undef MAX
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 

diff --git a/inc/CDKVersion.h b/inc/CDKVersion.h
@@ -68,4 +68,12 @@ ILINE SInputPortConfig InputPortConfig_Null()
 #define MAX_PLAYER_LIMIT DETAILED_SESSION_MAX_PLAYERS
 #endif
 
+#ifndef CrySharedLibrayExtension
+#define CrySharedLibrayExtension CrySharedLibraryExtension
+#endif
+
+#ifndef ESYSTEM_EVENT_SHUTDOWN
+#define ESYSTEM_EVENT_SHUTDOWN ESYSTEM_EVENT_FULL_SHUTDOWN
+#endif
+
 #endif
diff --git a/inc/CPluginBase.hpp b/inc/CPluginBase.hpp
@@ -12,7 +12,6 @@
 #include <Nodes/G2FlowBaseNode.h>
 #include <CPluginBaseMinimal.hpp>
 #include <PMUtils.hpp>
-#include <HookTool.hpp>
 
 namespace PluginManager
 {

diff --git a/inc/CPluginBaseMinimal.hpp b/inc/CPluginBaseMinimal.hpp
@@ -10,6 +10,8 @@
 #include <CPluginManager.h>
 #endif
 
+#include <HookTool.hpp>
+
 namespace PluginManager
 {
     /**

diff --git a/inc/IPluginBase.h b/inc/IPluginBase.h
@@ -266,6 +266,9 @@ extern "C"
 }
 
 /** Now some macros required for entity classes */
+
+/* This causes a redefinition error when using uber files
+
 #ifndef REGISTER_GAME_OBJECT_EXTENSION
 
 #define HIDE_FROM_EDITOR(className)                                                                                                                                             \
@@ -339,4 +342,6 @@ extern "C"
         framework->GetIGameObjectSystem()->RegisterExtension(#name, &_creator, NULL);\
     }
 
-#endif
+#endif
+
+*/
diff --git a/inc/IPluginManager.h b/inc/IPluginManager.h
@@ -8,7 +8,7 @@
 
 // Needed for some Windows types
 #include <platform.h>
-#if defined(WIN32) || defined(WIN64)
+#if defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
 #define WIN_INTERCEPTORS
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -187,34 +187,6 @@ namespace PluginManager
         */
         virtual void RegisterStaticInterface( void* pInterface, const char* sName, const char* sVersion = NULL ) = 0;
 
-#if defined(WIN_INTERCEPTORS)
-        /**
-        * @brief Redirect unprocessed Message to interceptors
-        * Can manipulate the parameters and skip the default implementation.
-        * @return If true doen't process the original WinProc
-        */
-        virtual bool PreWinProcInterceptor( HWND& hWnd, UINT& msg, WPARAM& wParam, LPARAM& lParam ) const = 0;
-
-        /**
-        * @brief Redirect processed Message to interceptors
-        * Can manipulate the LRESULT.
-        * @param lResult original WinProc LRESULT
-        */
-        virtual LRESULT PostWinProcInterceptor( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT lResult ) const = 0;
-
-        /**
-        * @brief Register a WinProc Message Interceptor
-        * @param pInterceptor Interceptor to register
-        */
-        virtual void RegisterWinProcInterceptor( IPluginWinProcInterceptor* pInterceptor ) = 0;
-
-        /**
-        * @brief Unregister a WinProc Message Interceptor
-        * @param pInterceptor Interceptor to unregister
-        */
-        virtual void UnregisterWinProcInterceptor( IPluginWinProcInterceptor* pInterceptor ) = 0;
-#endif
-
         /**
         * @brief Delay the call of the function
         * can be used if you don't need full control over delayed execution (the plugin manager will handle it)
@@ -290,6 +262,35 @@ namespace PluginManager
         * @return success
         */
         virtual bool RegisterTypesPluginRange( int nBeginAtMode = IM_Min, int nEndAtMode = IM_Max, int nFactoryType = int( FT_None ), bool bUnregister = false ) = 0;
+
+#if defined(WIN_INTERCEPTORS)
+        /**
+        * @brief Redirect unprocessed Message to interceptors
+        * Can manipulate the parameters and skip the default implementation.
+        * @return If true doen't process the original WinProc
+        */
+        virtual bool PreWinProcInterceptor( HWND& hWnd, UINT& msg, WPARAM& wParam, LPARAM& lParam ) const = 0;
+
+        /**
+        * @brief Redirect processed Message to interceptors
+        * Can manipulate the LRESULT.
+        * @param lResult original WinProc LRESULT
+        */
+        virtual LRESULT PostWinProcInterceptor( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT lResult ) const = 0;
+
+        /**
+        * @brief Register a WinProc Message Interceptor
+        * @param pInterceptor Interceptor to register
+        */
+        virtual void RegisterWinProcInterceptor( IPluginWinProcInterceptor* pInterceptor ) = 0;
+
+        /**
+        * @brief Unregister a WinProc Message Interceptor
+        * @param pInterceptor Interceptor to unregister
+        */
+        virtual void UnregisterWinProcInterceptor( IPluginWinProcInterceptor* pInterceptor ) = 0;
+#endif
+
     };
 }
 

diff --git a/inc/PMUtils.hpp b/inc/PMUtils.hpp
@@ -9,7 +9,7 @@
 
 #include <StdAfx.h>
 
-#if defined(WIN32) || defined(WIN64)
+#if defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 // get rid of (really) annoying MS defines

diff --git a/project/Plugin_Settings.props b/project/Plugin_Settings.props
@@ -7,12 +7,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\inc;$(ProjectDir)..\src;$(ProjectDir)..\..\SDKs;$(ProjectDir)..\..\Plugin_SDK\inc;$(ProjectDir)..\..\SDKs\boost;$(DXSDK_DIR)Include\;$(ProjectDir)..\..\CryEngine\CryCommon;$(ProjectDir)..\..\CryEngine\CryAction;$(ProjectDir)..\..\Game\GameDll;$(ProjectDir)..\..\GameSDK\GameDll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\inc;$(ProjectDir)..\..\Libs;$(ProjectDir)..\..\Libs\yasli;$(ProjectDir)..\src;$(ProjectDir)..\..\SDKs;$(ProjectDir)..\..\Plugin_SDK\inc;$(ProjectDir)..\..\SDKs\boost;$(ProjectDir)..\..\SDKs\yasli;$(DXSDK_DIR)Include\;$(ProjectDir)..\..\CryEngine\CryCommon;$(ProjectDir)..\..\CryEngine\CryAction;$(ProjectDir)..\..\Game\GameDll;$(ProjectDir)..\..\GameSDK\GameDll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(DXSDK_DIR)Lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     </Link>

diff --git a/src/CPluginManager.cpp b/src/CPluginManager.cpp
@@ -317,9 +317,8 @@ namespace PluginManager
         m_sRootDirectory = sCurrentDirectory;
 
         // The binary directory depends on dll type
-
         /*
-		// keep for linux
+        // keep for linux
         m_sBinaryDirectory = sCurrentDirectory;
         m_sBinaryDirectory += PATH_SEPERATOR "Bin";