Move some import export defines to common engine header

Author: Xottab-DUTY

src/Common/Common.hpp

@@ -1 +1,4 @@
 #pragma once
+
+#include "Common/CommonImportExport.inl"
+

src/Common/Common.vcxproj

@@ -210,6 +210,9 @@
   <ItemGroup>
     <ClCompile Include="NvMender2003\NVMeshMender.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="CommonImportExport.inl" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

src/Common/Common.vcxproj.filters

@@ -102,4 +102,7 @@
       <Filter>NvMender2003</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="CommonImportExport.inl" />
+  </ItemGroup>
 </Project>

src/Common/CommonImportExport.inl

@@ -0,0 +1,61 @@
+#pragma once
+
+#ifdef XRAPI_EXPORTS
+#define XRAPI_API XR_EXPORT
+#else
+#define XRAPI_API XR_IMPORT
+#endif
+
+#ifdef XRAICORE_EXPORTS
+#define XRAICORE_API XR_EXPORT
+#else
+#define XRAICORE_API XR_IMPORT
+#endif
+
+#ifdef XRCDB_EXPORTS
+#define XRCDB_API XR_EXPORT
+#else
+#define XRCDB_API XR_IMPORT
+#endif
+
+#ifdef XRCORE_EXPORTS
+#define XRCORE_API XR_EXPORT
+#else
+#define XRCORE_API XR_IMPORT
+#endif
+
+#ifdef XRGAMESPY_EXPORTS
+#define XRGAMESPY_API XR_EXPORT
+#else
+#define XRGAMESPY_API XR_IMPORT
+#endif
+
+#ifdef XR_NETSERVER_EXPORTS
+#define XRNETSERVER_API XR_EXPORT
+#else
+#define XRNETSERVER_API XR_IMPORT
+#endif
+
+#ifdef XR_PARTICLES_EXPORTS
+#define PARTICLES_API XR_EXPORT
+#else
+#define PARTICLES_API XR_IMPORT
+#endif
+
+#ifdef XRPHYSICS_EXPORTS
+#define XRPHYSICS_API XR_EXPORT
+#else
+#define XRPHYSICS_API XR_IMPORT
+#endif
+
+#ifdef XRSCRIPTENGINE_EXPORTS
+#define XRSCRIPTENGINE_API XR_EXPORT
+#else
+#define XRSCRIPTENGINE_API XR_IMPORT
+#endif
+
+#ifdef XRSOUND_EXPORTS
+#define XRSOUND_API XR_EXPORT
+#else
+#define XRSOUND_API XR_IMPORT
+#endif

src/Include/xrAPI/xrAPI.h

@@ -1,11 +1,5 @@
 #pragma once
 
-#ifdef XRAPI_EXPORTS
-#define XRAPI_API XR_EXPORT
-#else
-#define XRAPI_API XR_IMPORT
-#endif
-
 class IRender;
 class IRenderFactory;
 class IDebugRender;

src/xrAICore/xrAICore.hpp

@@ -1,7 +1 @@
 #pragma once
-
-#ifdef XRAICORE_EXPORTS
-#define XRAICORE_API XR_EXPORT
-#else
-#define XRAICORE_API XR_IMPORT
-#endif

src/xrCDB/xrCDB.h

@@ -4,19 +4,6 @@
 
 #include "xrCore/Threading/Lock.hpp" // XXX: Remove from header. Put in .cpp.
 
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the XRCDB_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// XRCDB_API functions as being imported from a DLL, wheras this DLL sees symbols
-// defined with this macro as being exported.
-
-#ifdef XRCDB_EXPORTS
-#define XRCDB_API XR_EXPORT
-#else
-#define XRCDB_API XR_IMPORT
-#endif
-
 // forward declarations
 class CFrustum;
 namespace Opcode

src/xrCore/FTimer.h

@@ -2,7 +2,6 @@
 #ifndef FTimerH
 #define FTimerH
 #include "_types.h"
-#include "xrCore_impexp.h"
 #include "xrCommon/xr_vector.h"
 //#include "_stl_extensions.h"
 #include "_math.h"

src/xrCore/Threading/Lock.hpp

@@ -1,6 +1,4 @@
 #pragma once
-#include "xrCore/xrCore_impexp.h"
-
 #include <mutex>
 #include <atomic>
 

src/xrCore/_compressed_normal.h

@@ -2,7 +2,6 @@
 #ifndef _COMPR_NORMAL_
 #define _COMPR_NORMAL_
 #include "xrCore/_types.h"
-#include "xrCore/xrCore_impexp.h"
 
 // fwd. decl.
 template <class T> struct _vector3; typedef _vector3<float> Fvector;