Delete xrCoreStatic.

OpenXRay · Nov 1, 2015 · a4a74e1 · a4a74e1
1 parent 09c8acb
commit a4a74e1
Show file tree

Hide file tree

Showing 40 changed files with 224 additions and 2,170 deletions.
diff --git a/src/editors/ECore/Editor/ELog.cpp b/src/editors/ECore/Editor/ELog.cpp
@@ -23,7 +23,7 @@
 #ifdef _LW_EXPORT
 	#include <lwhost.h>
 	extern "C" LWMessageFuncs	*g_msg;
-	void ELogCallback(LPCSTR txt)
+	void ELogCallback(void *context, LPCSTR txt)
 	{
 		if (0==txt[0])	return;
 		bool bDlg 		= ('#'==txt[0])||((0!=txt[1])&&('#'==txt[1]));
@@ -38,7 +38,7 @@
 #endif
 #ifdef _MAX_EXPORT
 	#include "NetDeviceLog.h"
-	void ELogCallback(LPCSTR txt)
+    void ELogCallback(void *context, LPCSTR txt)
 	{
  		if (0!=txt[0]){
 			if (txt[0]=='!')EConsole.print(mtError,txt+1);
@@ -47,7 +47,7 @@
 	}
 #endif
 #ifdef _MAYA_PLUGIN
-	void ELogCallback(LPCSTR txt)
+    void ELogCallback(void *context, LPCSTR txt)
 	{
  		if (0!=txt[0]){
 			if (txt[0]=='!')std::cerr << "XR-Error: " << txt+1 << "\n";

diff --git a/src/editors/ECore/Editor/ELog.h b/src/editors/ECore/Editor/ELog.h
@@ -15,7 +15,7 @@ class ECORE_API CLog{
 	int 		DlgMsg 	(TMsgDlgType mt, TMsgDlgButtons btn, LPCSTR _Format, ...);
 };
 
-void ECORE_API ELogCallback(LPCSTR txt);
+void ECORE_API ELogCallback(void *context, LPCSTR txt);
 
 extern ECORE_API CLog ELog;
 

diff --git a/src/engine.sln b/src/engine.sln
@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL32", "3rd party\opena
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrD3D9-Null", "xrD3D9-Null\xrD3D9-Null.vcxproj", "{0899B131-F1D4-4876-9BA1-67AC821DB9E1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrCoreStatic", "xrCore\xrCoreStatic.vcxproj", "{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompressionTest", "utils\CompressionTest\CompressionTest.vcxproj", "{C961EA19-716C-4A6D-BB13-689F8FB78B01}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctool", "utils\ctool\ctool.vcxproj", "{2FAAC8BA-369F-465E-B465-2235963FD377}"
@@ -216,27 +214,6 @@ Global
 		{0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release|Win32.ActiveCfg = Release|Win32
 		{0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release|Win32.Build.0 = Release|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Win32.Build.0 = Debug|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Mixed|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed_Dedicated|Mixed Platforms.Build.0 = Mixed|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed_Dedicated|Win32.ActiveCfg = Mixed|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Mixed Platforms.ActiveCfg = Mixed|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Mixed Platforms.Build.0 = Mixed|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Win32.ActiveCfg = Mixed|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Win32.Build.0 = Mixed|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Win32.ActiveCfg = Release|Win32
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Win32.Build.0 = Release|Win32
 		{C961EA19-716C-4A6D-BB13-689F8FB78B01}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
 		{C961EA19-716C-4A6D-BB13-689F8FB78B01}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
 		{C961EA19-716C-4A6D-BB13-689F8FB78B01}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
@@ -1348,7 +1325,6 @@ Global
 		{1BF75FEB-87DD-486C-880B-227987D191C2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{566551F4-4EF1-4CB4-A131-F982E7606907} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{0899B131-F1D4-4876-9BA1-67AC821DB9E1} = {3FC858CB-4888-42FF-ABC5-82DAECB59C2C}
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
 		{C961EA19-716C-4A6D-BB13-689F8FB78B01} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{2FAAC8BA-369F-465E-B465-2235963FD377} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{65CBB9D0-FBC6-41A4-8316-F5E9B5D7FB33} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}

diff --git a/src/plugins/Max/Export/MeshExpPlugin.cpp b/src/plugins/Max/Export/MeshExpPlugin.cpp
@@ -34,7 +34,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 
 	if ( !controlsInit ) {
 		controlsInit = TRUE;
-		Core._initialize("S.T.A.L.K.E.R.Plugin",ELogCallback,FALSE);
+		Core._initialize("S.T.A.L.K.E.R.Plugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
 		FS._initialize	(CLocatorAPI::flScanAppRoot,NULL,"xray_path.ltx");
 		FPU::m64r	(); // íóæíî ÷òîáû ìàêñ íå ñáðàñûâàë êîíòðîëüêè â 0
 		InitCustomControls(hInstance);

diff --git a/src/plugins/Max/Export/Stdafx.h b/src/plugins/Max/Export/Stdafx.h
@@ -12,6 +12,8 @@
 #include "Max.h"
 
 #include "xrCore/xrCore.h"
+#pragma comment(lib, "xrCore.lib")
+#define _BCL
 
 #undef _MIN
 #undef _MAX

diff --git a/src/plugins/Max/MAX_Export60.vcxproj b/src/plugins/Max/MAX_Export60.vcxproj
@@ -90,7 +90,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(DXSDK_DIR)Include;$(SolutionDir);$(XRAY_16X_LIBS)3dsmax/ver-6.0/include;$(XRAY_16X_LIBS)3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_EXPORT;_MAX_EXPORT;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_EXPORT;_MAX_EXPORT;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -112,7 +112,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xray_export.dlu</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(XRAY_16X_LIBS)\bugtrap\bin;$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -135,7 +135,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>$(DXSDK_DIR)Include;$(SolutionDir);$(XRAY_16X_LIBS)3dsmax/ver-6.0/include;$(XRAY_16X_LIBS)3dsmax/ver-6.0/cssdk/include;$(SolutionDir)plugins\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>UTILITY_EXPORTS;WIN32;_WINDOWS;_USRDLL;_MAX_EXPORT;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UTILITY_EXPORTS;WIN32;_WINDOWS;_USRDLL;_MAX_EXPORT;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling />
@@ -158,7 +158,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xray_export.dlu</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(XRAY_16X_LIBS)\bugtrap\bin;$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -268,9 +268,8 @@
     <None Include="Export\Utility.def" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)xrCore\xrCoreStatic.vcxproj">
-      <Project>{f1066eac-ee25-4c7a-9023-5957a6f7ba27}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    <ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
+      <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/src/plugins/Max/MAX_Material60.vcxproj b/src/plugins/Max/MAX_Material60.vcxproj
@@ -65,7 +65,7 @@
       <AdditionalOptions>/LD %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir);$(XRAY_16X_LIBS)3dsmax/ver-6.0/include;$(XRAY_16X_LIBS)3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -85,7 +85,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>Winmm.lib;comctl32.lib;bmm.lib;core.lib;geom.lib;gfx.lib;mesh.lib;maxutil.lib;maxscrpt.lib;manipsys.lib;paramblk2.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Winmm.lib;comctl32.lib;bmm.lib;core.lib;geom.lib;gfx.lib;mesh.lib;maxutil.lib;maxscrpt.lib;manipsys.lib;paramblk2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xray_material.dlt</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)BugTrap\Bin;$(XRAY_16X_LIBS)3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -109,7 +109,7 @@
       <AdditionalOptions>/LD %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(SolutionDir);$(XRAY_16X_LIBS)3dsmax/ver-6.0/include;$(XRAY_16X_LIBS)3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling />
@@ -131,7 +131,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>Winmm.lib;comctl32.lib;core.lib;geom.lib;gfx.lib;mesh.lib;maxutil.lib;maxscrpt.lib;manipsys.lib;paramblk2.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Winmm.lib;comctl32.lib;core.lib;geom.lib;gfx.lib;mesh.lib;maxutil.lib;maxscrpt.lib;manipsys.lib;paramblk2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xray_material.dlt</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)BugTrap\Bin;$(XRAY_16X_LIBS)3dsmax/ver-6.0/lib;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -177,9 +177,8 @@
     <Image Include="Material\dmtlmsk.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)xrCore\xrCoreStatic.vcxproj">
-      <Project>{f1066eac-ee25-4c7a-9023-5957a6f7ba27}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    <ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
+      <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/src/plugins/Max/Material/DllEntry.cpp b/src/plugins/Max/Material/DllEntry.cpp
@@ -18,7 +18,7 @@ BOOL WINAPI DllMain(HINSTANCE   hinstDLL,
 	if(!controlsInit) 
 	{
 		controlsInit = TRUE;
-		Core._initialize("S.T.A.L.K.E.R.Plugin",0,FALSE);
+		Core._initialize("S.T.A.L.K.E.R.Plugin", 0, FALSE, nullptr, true);
 		FS._initialize	(CLocatorAPI::flScanAppRoot,NULL,"xray_path.ltx");
 		FPU::m64r	(); // íóæíî ÷òîáû ìàêñ íå ñáðàñûâàë êîíòðîëüêè â 0
 		InitCustomControls(hInstance);	// Initialize MAX's custom controls

diff --git a/src/plugins/Max/Material/Stdafx.h b/src/plugins/Max/Material/Stdafx.h
@@ -12,6 +12,7 @@
 #include "Max.h"
 
 #include "xrCore/xrCore.h"
+#pragma comment(lib, "xrCore.lib")
 
 #undef _MIN
 #undef _MAX

diff --git a/src/plugins/Maya/Export/Stdafx.h b/src/plugins/Maya/Export/Stdafx.h
@@ -9,12 +9,14 @@
 #define ENGINE_API 
 #define _WIN32_WINNT 0x0500        
 #include "xrCore/xrCore.h"
+#pragma comment(lib, "xrCore.lib")
 
 #pragma warning(push)
 #pragma warning(disable:4995)
 #include <assert.h>
 
 #define REQUIRE_IOSTREAM
+#define _BCL
 #include <maya/MPxLocatorNode.h>
 #include <maya/MFnTransform.h>
 #include <maya/MEulerRotation.h>

diff --git a/src/plugins/Maya/Export/XRayExport.cpp b/src/plugins/Maya/Export/XRayExport.cpp
@@ -47,9 +47,8 @@ void uninitialize(void*)
 MStatus initializePlugin( MObject obj )
 {
 	INIT_OBJ = obj;
-	Core._initialize("XRayMayaPlugin",ELogCallback,FALSE);
+	Core._initialize("XRayMayaPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
 	FS._initialize	(CLocatorAPI::flScanAppRoot,NULL,"xray_path.ltx");
-	R_ASSERT2(0!=Memory.mem_fill,"Incorrect xrCore.dll version.");
 
 	MFnPlugin plugin( obj, "GSC Game World", "1.00", "Any");
 

diff --git a/src/plugins/Maya/Material/Stdafx.h b/src/plugins/Maya/Material/Stdafx.h
@@ -8,6 +8,7 @@
 
 #define _WIN32_WINNT 0x0500        
 #include "xrCore/xrCore.h"
+#pragma comment(lib, "xrCore.lib")
 #include <assert.h>
 
 #pragma warning(push)

diff --git a/src/plugins/Maya/Material/lambertShader.cpp b/src/plugins/Maya/Material/lambertShader.cpp
@@ -1026,9 +1026,8 @@ MStatus initializePlugin( MObject obj )
 	INIT_OBJ = obj;
 	const MString	UserClassify( "shader/surface" );
 
-	Core._initialize("XRayMayaPlugin",ELogCallback,FALSE);
+	Core._initialize("XRayMayaPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
 	FS._initialize	(CLocatorAPI::flScanAppRoot,NULL,"xray_path.ltx");
-	R_ASSERT2(0!=Memory.mem_fill,"Incorrect xrCore.dll version.");
 
 	MString command( "if( `window -exists createRenderNodeWindow` ) {refreshCreateRenderNodeWindow(\"" );
 

diff --git a/src/plugins/Maya/Maya_Export2008.vcxproj b/src/plugins/Maya/Maya_Export2008.vcxproj
@@ -84,7 +84,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xrayMaya_export.mll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)maya/ver-2008/lib;$(XRAY_16X_LIBS)BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -126,7 +126,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xrayMaya_export.mll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)maya/ver-2008/lib;$(XRAY_16X_LIBS)BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -268,6 +268,11 @@
     <None Include="Export\xraySkinExportOptions.mel" />
     <None Include="Export\xraySkinMotionExportOptions.mel" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
+      <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/src/plugins/Maya/Maya_Export2009.vcxproj b/src/plugins/Maya/Maya_Export2009.vcxproj
@@ -85,7 +85,7 @@
     <Link>
       <AdditionalOptions>/MACHINE:I386 /export:initializePlugin /export:uninitializePlugin
  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xrayMaya_export.mll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)maya/ver-2009/lib;$(XRAY_16X_LIBS)BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -127,7 +127,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;xrcorestatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xrayMaya_export.mll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)maya/ver-2009/lib;$(XRAY_16X_LIBS)BugTrap\Bin;$(xrLibDir);$(xrSdkDir)libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -266,6 +266,11 @@
     <None Include="..\..\editors\ECore\WildMagic\WmlVector3.inl" />
     <None Include="..\..\editors\ECore\WildMagic\WmlVector4.inl" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
+      <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/src/plugins/Maya/Maya_Material2008.vcxproj b/src/plugins/Maya/Maya_Material2008.vcxproj
@@ -158,6 +158,11 @@
     <None Include="Material\AElambertShaderTemplate.mel" />
     <None Include="Material\AEXRayMtlTemplate.mel" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
+      <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>