Move ENGINE_API defines to CommonImportExport.inl

Xottab-DUTY · Xottab-DUTY · commit 61dfab1b72d6 · 2017-11-20T19:52:08.000+05:00
diff --git a/Externals/OPCODE/pch.hpp b/Externals/OPCODE/pch.hpp
@@ -55,5 +55,4 @@ IC void cdelete(T*& ptr)
     }
 }
 
-#define ENGINE_API
-#include "opcode.h"
+#include "Opcode.h"
diff --git a/src/Common/CommonImportExport.inl b/src/Common/CommonImportExport.inl
@@ -14,6 +14,7 @@
 
 #ifdef XRCDB_EXPORTS
 #define XRCDB_API XR_EXPORT
+#define NO_ENGINE_API
 #else
 #define XRCDB_API XR_IMPORT
 #endif
@@ -44,6 +45,7 @@
 
 #ifdef XRPHYSICS_EXPORTS
 #define XRPHYSICS_API XR_EXPORT
+#define NO_ENGINE_API
 #else
 #define XRPHYSICS_API XR_IMPORT
 #endif
@@ -59,3 +61,18 @@
 #else
 #define XRSOUND_API XR_IMPORT
 #endif
+
+#ifndef ENGINE_API
+#ifndef NO_ENGINE_API
+#ifdef ENGINE_BUILD
+#define DLL_API XR_IMPORT
+#define ENGINE_API XR_EXPORT
+#else
+#define DLL_API XR_EXPORT
+#define ENGINE_API XR_IMPORT
+#endif
+#else
+#define ENGINE_API
+#define DLL_API
+#endif // !NO_ENGINE_API
+#endif // !ENGINE_API
diff --git a/src/xrCDB/StdAfx.h b/src/xrCDB/StdAfx.h
@@ -55,7 +55,6 @@ IC void cdelete(T*& ptr)
     }
 }
 
-#define ENGINE_API
 #include "OPCODE/Opcode.h"
 
 //{{AFX_INSERT_LOCATION}}
diff --git a/src/xrCDB/xrCDB.vcxproj b/src/xrCDB/xrCDB.vcxproj
@@ -416,7 +416,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\..\Externals\OPCODE\OPCODE.vcxproj">
-      <Project>{bf40459f-302d-4128-a1b6-c965db90e7f0}</Project>
+      <Project>{dafd6d98-3dcd-40ad-bc85-ec71797b6767}</Project>
     </ProjectReference>
     <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
       <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
diff --git a/src/xrEngine/Engine.h b/src/xrEngine/Engine.h
@@ -1,9 +1,5 @@
 #pragma once
 
-// you must define ENGINE_BUILD then building the engine itself
-// and not define it if you are about to build DLL
-
-#include "Engine_impexp.h"
 #include "engineAPI.h"
 #include "eventAPI.h"
 #include "xrSheduler.h"
diff --git a/src/xrEngine/Engine_impexp.h b/src/xrEngine/Engine_impexp.h
diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj
@@ -760,7 +760,6 @@
     <ClInclude Include="EffectorPP.h" />
     <ClInclude Include="Engine.h" />
     <ClInclude Include="EngineAPI.h" />
-    <ClInclude Include="Engine_impexp.h" />
     <ClInclude Include="engine_impl.hpp" />
     <ClInclude Include="EnnumerateVertices.h" />
     <ClInclude Include="Environment.h" />
diff --git a/src/xrEngine/xrEngine.vcxproj.filters b/src/xrEngine/xrEngine.vcxproj.filters
@@ -561,7 +561,6 @@
     <ClInclude Include="profiler_inline.h">
       <Filter>General\Profiler</Filter>
     </ClInclude>
-    <ClInclude Include="Engine_impexp.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="defines.cpp">
diff --git a/src/xrEngine/xrSheduler.h b/src/xrEngine/xrSheduler.h
@@ -3,7 +3,6 @@
 #define XRSHEDULER_H_INCLUDED
 
 //#include "ISheduled.h"
-#include "Engine_impexp.h"
 class ISheduled;
 
 class ENGINE_API CSheduler
diff --git a/src/xrPhysics/stdafx.h b/src/xrPhysics/stdafx.h
@@ -4,8 +4,6 @@
 #include "Common/Common.hpp"
 
 #define MTL_EXPORT_API
-#define ENGINE_API
-#define DLL_API
 #define ECORE_API
 
 #include "xrCore/xrCore.h"
diff --git a/src/xrSound/stdafx.h b/src/xrSound/stdafx.h
@@ -26,8 +26,6 @@
 #include "xrCDB/xrCDB.h"
 #include "Sound.h"
 
-#undef ENGINE_API
-
 #include "xrCore/xr_resource.h"
 
 #ifdef _EDITOR

Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,4 @@ IC void cdelete(T*& ptr)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-#define ENGINE_API`
`59`		`-#include "opcode.h"`
	`58`	`+#include "Opcode.h"`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ IC void cdelete(T*& ptr)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-#define ENGINE_API`
`59`	`58`	`#include "OPCODE/Opcode.h"`
`60`	`59`
`61`	`60`	`//{{AFX_INSERT_LOCATION}}`