Project (mostly) abstracted from dllimport/dllexport declarations.

Kaffeine · Kaffeine · commit 5066e3e0d27a · 2015-11-06T23:35:12.000+05:00
xrCore/Platform: Introduced XR_IMPORT/EXPORT macros.
diff --git a/src/Include/xrAPI/xrAPI.h b/src/Include/xrAPI/xrAPI.h
@@ -1,9 +1,11 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #ifdef XRAPI_EXPORTS
-#define XRAPI_API __declspec(dllexport)
+#define XRAPI_API XR_EXPORT
 #else
-#define XRAPI_API __declspec(dllimport)
+#define XRAPI_API XR_IMPORT
 #endif
 
 class IRender;
diff --git a/src/utils/xrAI/factory_api.h b/src/utils/xrAI/factory_api.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 extern "C" {
-	typedef __declspec(dllimport)  ISE_Abstract*	__stdcall Factory_Create	(LPCSTR section);
-	typedef __declspec(dllimport)  void				__stdcall Factory_Destroy	(ISE_Abstract *&);
+	typedef XR_IMPORT  ISE_Abstract*	__stdcall Factory_Create	(LPCSTR section);
+	typedef XR_IMPORT  void				__stdcall Factory_Destroy	(ISE_Abstract *&);
 };
 
 extern Factory_Create	*create_entity;
diff --git a/src/utils/xrLC/Build.h b/src/utils/xrLC/Build.h
@@ -1,9 +1,10 @@
 #pragma once
+#include "xrCore/Platform.h"
 #include "xrCore/FS.h"
 #include "utils/Shader_xrLC.h"
 struct STextureParams;
 #pragma comment(lib,"dxt.lib")
-extern "C" bool __declspec(dllimport) __stdcall DXTCompress(LPCSTR out_name, u8* raw_data, u8* normal_map, u32 w, u32 h, u32 pitch, STextureParams* fmt, u32 depth);
+extern "C" bool XR_IMPORT __stdcall DXTCompress(LPCSTR out_name, u8* raw_data, u8* normal_map, u32 w, u32 h, u32 pitch, STextureParams* fmt, u32 depth);
 
 #include "utils/xrLC_Light/b_build_texture.h"
 #include "utils/xrLC_Light/xrfacedefs.h"
diff --git a/src/utils/xrLCUtil/xrLCUtil.hpp b/src/utils/xrLCUtil/xrLCUtil.hpp
@@ -4,10 +4,12 @@
 #pragma comment(lib, "winmm.lib")
 #pragma comment(lib, "comctl32.lib")
 
+#include "xrCore/Platform.h"
+
 #ifdef XRLCUTIL_EXPORTS
-#define XRLCUTIL_API __declspec(dllexport)
+#define XRLCUTIL_API XR_EXPORT
 #else
-#define XRLCUTIL_API __declspec(dllimport)
+#define XRLCUTIL_API XR_IMPORT
 #endif
 
 XRLCUTIL_API std::string make_time(u32 sec);
diff --git a/src/utils/xrLC_Light/xrDXTC.h b/src/utils/xrLC_Light/xrDXTC.h
@@ -1,9 +1,11 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #ifdef XRDXTC_EXPORTS
-#define DXTC_API __declspec(dllexport)
+#define DXTC_API XR_EXPORT
 #else
-#define DXTC_API __declspec(dllimport)
+#define DXTC_API XR_IMPORT
 #endif
 
 enum eDXTC
diff --git a/src/utils/xrLC_Light/xrLC_Light.h b/src/utils/xrLC_Light/xrLC_Light.h
@@ -1,10 +1,11 @@
 #pragma once
 
+#include "xrCore/Platform.h"
 #include "xrCore/xrCore.h"
 #ifdef XRLC_LIGHT_EXPORTS
-#   define XRLC_LIGHT_API __declspec(dllexport)
+#   define XRLC_LIGHT_API XR_EXPORT
 #else
-#   define XRLC_LIGHT_API __declspec(dllimport)
+#   define XRLC_LIGHT_API XR_IMPORT
 #endif
 
 #pragma warning(disable:4995)
diff --git a/src/utils/xrLC_Light/xrLight_Implicit.cpp b/src/utils/xrLC_Light/xrLight_Implicit.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
 
+#include "xrCore/Platform.h"
+
 #include "xrlight_implicit.h"
 #include "xrLight_ImplicitDeflector.h"
 #include "xrlight_implicitrun.h"
@@ -11,7 +13,7 @@
 #include "net_task_callback.h"
 #include "xrCDB/xrCDB.h"
 
-extern "C" bool __declspec(dllimport) __stdcall DXTCompress(LPCSTR out_name, u8* raw_data, u8* normal_map, u32 w, u32 h, u32 pitch, STextureParams* fmt, u32 depth);
+extern "C" bool XR_IMPORT __stdcall DXTCompress(LPCSTR out_name, u8* raw_data, u8* normal_map, u32 w, u32 h, u32 pitch, STextureParams* fmt, u32 depth);
 
 DEF_MAP(Implicit,u32,ImplicitDeflector);
 
diff --git a/src/utils/xrLC_LightStab/xrLC_LightStab.h b/src/utils/xrLC_LightStab/xrLC_LightStab.h
@@ -1,10 +1,12 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #ifdef XRLC_LIGHT_STAB_EXPORTS
-#	define XRLC_LIGHT_STUB_API __declspec(dllexport)
+#	define XRLC_LIGHT_STUB_API XR_EXPORT
 #else
-#	define XRLC_LIGHT_STUB_API __declspec(dllimport)
+#	define XRLC_LIGHT_STUB_API XR_IMPORT
 #endif
 
 
-#	define XRLC_LIGHT_API __declspec(dllimport)
+#	define XRLC_LIGHT_API XR_IMPORT
diff --git a/src/utils/xrSE_Factory/xrSE_Factory_import_export.h b/src/utils/xrSE_Factory/xrSE_Factory_import_export.h
@@ -1,10 +1,12 @@
 #ifndef XRSE_FACTORY_IMPORT_EXPORTH
 #define XRSE_FACTORY_IMPORT_EXPORTH
 
+#include "xrCore/Platform.h"
+
 #ifdef XRSE_FACTORY_EXPORTS
-#	define FACTORY_API __declspec(dllexport)
+#	define FACTORY_API XR_EXPORT
 #else
-#	define FACTORY_API __declspec(dllimport)
+#	define FACTORY_API XR_IMPORT
 #endif
 
 extern "C" {
diff --git a/src/xrAICore/xrAICore.hpp b/src/xrAICore/xrAICore.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #ifdef XRAICORE_EXPORTS
-#define XRAICORE_API __declspec(dllexport)
+#define XRAICORE_API XR_EXPORT
 #else
-#define XRAICORE_API __declspec(dllimport)
+#define XRAICORE_API XR_IMPORT
 #endif
diff --git a/src/xrCDB/ISpatial.h b/src/xrCDB/ISpatial.h
@@ -2,6 +2,7 @@
 #define XRENGINE_ISPATIAL_H_INCLUDED
 
 //#pragma once
+#include "xrCore/Platform.h"
 #include "xrCore/xrPool.h"
 #include "xr_collide_defs.h"
 
@@ -144,7 +145,7 @@ class 	ISpatial_NODE
 //template <class T, int granularity>
 //class	poolSS;
 #ifndef	DLL_API
-#	define DLL_API					__declspec(dllimport)
+#	define DLL_API					XR_IMPORT
 #endif // #ifndef	DLL_API
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h
@@ -1,17 +1,20 @@
 #ifndef XRCDB_H
 #define XRCDB_H
 
+#include "xrCore/Platform.h"
+
 //#pragma once
 // 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 __declspec(dllexport)
+# define XRCDB_API XR_EXPORT
 #else
-#define XRCDB_API __declspec(dllimport)
+# define XRCDB_API XR_IMPORT
 #endif
 #ifdef M_VISUAL
 #define ALIGN(a) __declspec(align(a))
diff --git a/src/xrCore/FS_impl.h b/src/xrCore/FS_impl.h
@@ -1,6 +1,8 @@
 #ifndef FS_IMPL_H_INCLUDED
 #define FS_IMPL_H_INCLUDED
 
+#include "Platform.h"
+
 // 1: default
 // 1.5: check next chunk first heuristics
 // 2: vector population heuristics
@@ -37,9 +39,9 @@ struct find_chunk_counter
 };
 
 #ifdef INCLUDE_FROM_ENGINE
-extern __declspec(dllimport) find_chunk_counter g_find_chunk_counter;
+extern XR_IMPORT find_chunk_counter g_find_chunk_counter;
 #else //INCLUDE_FROM_ENGINE
-extern __declspec(dllexport) find_chunk_counter g_find_chunk_counter;
+extern XR_EXPORT find_chunk_counter g_find_chunk_counter;
 #endif //INCLUDE_FROM_ENGINE
 
 extern bool g_initialize_cpu_called;
diff --git a/src/xrCore/Platform.h b/src/xrCore/Platform.h
@@ -16,6 +16,9 @@
 # define _WIN32_WINNT 0x0501
 #endif
 
+#define XR_EXPORT __declspec(dllexport)
+#define XR_IMPORT __declspec(dllimport)
+
 #ifdef __BORLANDC__
 #include <vcl.h>
 #include <mmsystem.h>
diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
@@ -193,9 +193,9 @@
 
 // Our headers
 #ifdef XRCORE_EXPORTS
-#define XRCORE_API __declspec(dllexport)
+#define XRCORE_API XR_EXPORT
 #else
-#define XRCORE_API __declspec(dllimport)
+#define XRCORE_API XR_IMPORT
 #endif
 
 #include "xrDebug.h"
diff --git a/src/xrD3D9-Null/xrD3D9-Null.h b/src/xrD3D9-Null/xrD3D9-Null.h
@@ -3,11 +3,12 @@
 #include <d3d9caps.h>
 #include "IDirect3D9.h"
 
+#include "xrCore/Platform.h"
 
 #ifdef XRD3D9NULL_EXPORTS
-#define XRD3D9NULL_API __declspec(dllexport)
+#define XRD3D9NULL_API XR_EXPORT
 #else
-#define XRD3D9NULL_API __declspec(dllimport)
+#define XRD3D9NULL_API XR_IMPORT
 #endif
 
 
diff --git a/src/xrEngine/Engine.h b/src/xrEngine/Engine.h
@@ -1,18 +1,20 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 // you must define ENGINE_BUILD then building the engine itself
 // and not define it if you are about to build DLL
 
 // XXX: move all *_API macros to XRayConfig.hpp
 #ifndef ENGINE_API
 #ifndef NO_ENGINE_API
 #ifdef ENGINE_BUILD
-#define DLL_API __declspec(dllimport)
-#define ENGINE_API __declspec(dllexport)
+#define DLL_API XR_IMPORT
+#define ENGINE_API XR_EXPORT
 #else
 #undef DLL_API
-#define DLL_API __declspec(dllexport)
-#define ENGINE_API __declspec(dllimport)
+#define DLL_API XR_EXPORT
+#define ENGINE_API XR_IMPORT
 #endif
 #else
 #define ENGINE_API
diff --git a/src/xrEngine/dedicated_server_only.h b/src/xrEngine/dedicated_server_only.h
@@ -1,12 +1,14 @@
 #ifndef DEDICATED_SERVER_ONLY_H_INCLUDED
 #define DEDICATED_SERVER_ONLY_H_INCLUDED
 
+#include "xrCore/Platform.h"
+
 //#define DEDICATED_SERVER_ONLY
 
 #ifdef DEDICATED_SERVER_ONLY
 # define PROTECT_API
 #else// #ifdef DEDICATED_SERVER_ONLY
-# define PROTECT_API __declspec(dllexport)
+# define PROTECT_API XR_EXPORT
 #endif // #ifdef DEDICATED_SERVER_ONLY
 
 #ifdef BENCHMARK_BUILD
diff --git a/src/xrEngine/psystem.h b/src/xrEngine/psystem.h
@@ -2,10 +2,12 @@
 #define PSystemH
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #ifdef XR_PARTICLES_EXPORTS
-#define PARTICLES_API __declspec(dllexport)
+#define PARTICLES_API XR_EXPORT
 #else
-#define PARTICLES_API __declspec(dllimport)
+#define PARTICLES_API XR_IMPORT
 #ifdef _EDITOR
 #pragma comment(lib,"x:\\xrParticlesB.lib")
 #else
diff --git a/src/xrGameSpy/xrGameSpy.h b/src/xrGameSpy/xrGameSpy.h
@@ -1,13 +1,15 @@
+#include "xrCore/Platform.h"
+
 // 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 XRGAMESPY_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 
 // XRGAMESPY_API functions as being imported from a DLL, whereas this DLL sees symbols
 // defined with this macro as being exported.
 #ifdef XRGAMESPY_EXPORTS
-#define XRGAMESPY_API __declspec(dllexport)
+#define XRGAMESPY_API XR_EXPORT
 #else
-#define XRGAMESPY_API __declspec(dllimport)
+#define XRGAMESPY_API XR_IMPORT
 #endif
 /*
 // This class is exported from the xrGameSpy.dll
diff --git a/src/xrGameSpy/xrGameSpy_MainDefs.h b/src/xrGameSpy/xrGameSpy_MainDefs.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #define QRCDKEY_INTEGRATION
 #define SB_ICMP_SUPPORT
 
@@ -51,7 +53,7 @@
 
 #ifndef XRGAMESPY_API
 	#ifdef XRGAMESPY_EXPORTS
-		#define XRGAMESPY_API				__declspec(dllexport)
+		#define XRGAMESPY_API				XR_EXPORT
 	#endif
 #endif
 
diff --git a/src/xrNetServer/NET_Shared.h b/src/xrNetServer/NET_Shared.h
@@ -1,8 +1,11 @@
 #pragma once
+
+#include "xrCore/Platform.h"
+
 #ifdef XR_NETSERVER_EXPORTS
-	#define XRNETSERVER_API __declspec(dllexport)
+	#define XRNETSERVER_API XR_EXPORT
 #else
-	#define XRNETSERVER_API __declspec(dllimport)
+	#define XRNETSERVER_API XR_IMPORT
 
 	#ifndef _EDITOR
 		#pragma comment(lib,	"xrNetServer"	)
diff --git a/src/xrParticles/psystem.h b/src/xrParticles/psystem.h
@@ -2,10 +2,12 @@
 #define PSystemH
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #ifdef XR_PARTICLES_EXPORTS
-	#define PARTICLES_API __declspec(dllexport)
+	#define PARTICLES_API XR_EXPORT
 #else
-	#define PARTICLES_API __declspec(dllimport)
+	#define PARTICLES_API XR_IMPORT
 	#ifdef _EDITOR
 		#pragma comment(lib,"x:\\xrParticlesB.lib")
 	#else
diff --git a/src/xrPhysics/xrPhysics.h b/src/xrPhysics/xrPhysics.h
@@ -1,9 +1,11 @@
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #ifdef XRPHYSICS_EXPORTS
-#define XRPHYSICS_API __declspec(dllexport)
+#define XRPHYSICS_API XR_EXPORT
 #else
-#define XRPHYSICS_API __declspec(dllimport)
+#define XRPHYSICS_API XR_IMPORT
 	#ifndef	_EDITOR
 		#pragma comment( lib, "xrPhysics.lib"	)
 	#else
diff --git a/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp b/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp
@@ -8,12 +8,14 @@
 
 #pragma once
 
+#include "xrCore/Platform.h"
+
 #include "xrScriptEngine/LuaStudio/Config.hpp"
 
 #define CS_LUA_STUDIO_BACKEND_CALL __stdcall
 
 #ifndef CS_LUA_STUDIO_BACKEND_API
-#define CS_LUA_STUDIO_BACKEND_API __declspec(dllimport)
+#define CS_LUA_STUDIO_BACKEND_API XR_IMPORT
 #endif
 
 #define CS_LUA_STUDIO_BACKEND_FILE_NAME	CS_LIBRARY_NAME(lua_studio_backend, dll)
diff --git a/src/xrScriptEngine/script_thread.cpp b/src/xrScriptEngine/script_thread.cpp
diff --git a/src/xrScriptEngine/xrScriptEngine.hpp b/src/xrScriptEngine/xrScriptEngine.hpp
diff --git a/src/xrServerEntities/xrEProps.h b/src/xrServerEntities/xrEProps.h
diff --git a/src/xrSound/Sound.h b/src/xrSound/Sound.h
diff --git a/src/xrXMLParser/xrXMLParser.h b/src/xrXMLParser/xrXMLParser.h
