Skip to content

Commit a4a74e1

Browse files
author
nitrocaster
committed
Delete xrCoreStatic.
1 parent 09c8acb commit a4a74e1

40 files changed

+224
-2170
lines changed

‎src/editors/ECore/Editor/ELog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifdef _LW_EXPORT
2424
#include <lwhost.h>
2525
extern "C" LWMessageFuncs *g_msg;
26-
void ELogCallback(LPCSTR txt)
26+
void ELogCallback(void *context, LPCSTR txt)
2727
{
2828
if (0==txt[0]) return;
2929
bool bDlg = ('#'==txt[0])||((0!=txt[1])&&('#'==txt[1]));
@@ -38,7 +38,7 @@
3838
#endif
3939
#ifdef _MAX_EXPORT
4040
#include "NetDeviceLog.h"
41-
void ELogCallback(LPCSTR txt)
41+
void ELogCallback(void *context, LPCSTR txt)
4242
{
4343
if (0!=txt[0]){
4444
if (txt[0]=='!')EConsole.print(mtError,txt+1);
@@ -47,7 +47,7 @@
4747
}
4848
#endif
4949
#ifdef _MAYA_PLUGIN
50-
void ELogCallback(LPCSTR txt)
50+
void ELogCallback(void *context, LPCSTR txt)
5151
{
5252
if (0!=txt[0]){
5353
if (txt[0]=='!')std::cerr << "XR-Error: " << txt+1 << "\n";

‎src/editors/ECore/Editor/ELog.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ECORE_API CLog{
1515
int DlgMsg (TMsgDlgType mt, TMsgDlgButtons btn, LPCSTR _Format, ...);
1616
};
1717

18-
void ECORE_API ELogCallback(LPCSTR txt);
18+
void ECORE_API ELogCallback(void *context, LPCSTR txt);
1919

2020
extern ECORE_API CLog ELog;
2121

‎src/engine.sln‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL32", "3rd party\opena
2222
EndProject
2323
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrD3D9-Null", "xrD3D9-Null\xrD3D9-Null.vcxproj", "{0899B131-F1D4-4876-9BA1-67AC821DB9E1}"
2424
EndProject
25-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrCoreStatic", "xrCore\xrCoreStatic.vcxproj", "{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}"
26-
EndProject
2725
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompressionTest", "utils\CompressionTest\CompressionTest.vcxproj", "{C961EA19-716C-4A6D-BB13-689F8FB78B01}"
2826
EndProject
2927
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctool", "utils\ctool\ctool.vcxproj", "{2FAAC8BA-369F-465E-B465-2235963FD377}"
@@ -216,27 +214,6 @@ Global
216214
{0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release|Mixed Platforms.Build.0 = Release|Win32
217215
{0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release|Win32.ActiveCfg = Release|Win32
218216
{0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release|Win32.Build.0 = Release|Win32
219-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
220-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
221-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
222-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
223-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Mixed Platforms.Build.0 = Debug|Win32
224-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Win32.ActiveCfg = Debug|Win32
225-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Debug|Win32.Build.0 = Debug|Win32
226-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Mixed|Win32
227-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed_Dedicated|Mixed Platforms.Build.0 = Mixed|Win32
228-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed_Dedicated|Win32.ActiveCfg = Mixed|Win32
229-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Mixed Platforms.ActiveCfg = Mixed|Win32
230-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Mixed Platforms.Build.0 = Mixed|Win32
231-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Win32.ActiveCfg = Mixed|Win32
232-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Mixed|Win32.Build.0 = Mixed|Win32
233-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
234-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
235-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
236-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Mixed Platforms.ActiveCfg = Release|Win32
237-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Mixed Platforms.Build.0 = Release|Win32
238-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Win32.ActiveCfg = Release|Win32
239-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27}.Release|Win32.Build.0 = Release|Win32
240217
{C961EA19-716C-4A6D-BB13-689F8FB78B01}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
241218
{C961EA19-716C-4A6D-BB13-689F8FB78B01}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
242219
{C961EA19-716C-4A6D-BB13-689F8FB78B01}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
@@ -1348,7 +1325,6 @@ Global
13481325
{1BF75FEB-87DD-486C-880B-227987D191C2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
13491326
{566551F4-4EF1-4CB4-A131-F982E7606907} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
13501327
{0899B131-F1D4-4876-9BA1-67AC821DB9E1} = {3FC858CB-4888-42FF-ABC5-82DAECB59C2C}
1351-
{F1066EAC-EE25-4C7A-9023-5957A6F7BA27} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
13521328
{C961EA19-716C-4A6D-BB13-689F8FB78B01} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
13531329
{2FAAC8BA-369F-465E-B465-2235963FD377} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
13541330
{65CBB9D0-FBC6-41A4-8316-F5E9B5D7FB33} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}

‎src/plugins/Max/Export/MeshExpPlugin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
3434

3535
if ( !controlsInit ) {
3636
controlsInit = TRUE;
37-
Core._initialize("S.T.A.L.K.E.R.Plugin",ELogCallback,FALSE);
37+
Core._initialize("S.T.A.L.K.E.R.Plugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
3838
FS._initialize (CLocatorAPI::flScanAppRoot,NULL,"xray_path.ltx");
3939
FPU::m64r (); // íóæíî ÷òîáû ìàêñ íå ñáðàñûâàë êîíòðîëüêè â 0
4040
InitCustomControls(hInstance);

‎src/plugins/Max/Export/Stdafx.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#include "Max.h"
1313

1414
#include "xrCore/xrCore.h"
15+
#pragma comment(lib, "xrCore.lib")
16+
#define _BCL
1517

1618
#undef _MIN
1719
#undef _MAX

‎src/plugins/Max/MAX_Export60.vcxproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<ClCompile>
9191
<Optimization>Disabled</Optimization>
9292
<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>
93-
<PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_EXPORT;_MAX_EXPORT;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_EXPORT;_MAX_EXPORT;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<StringPooling>true</StringPooling>
9595
<ExceptionHandling>Sync</ExceptionHandling>
9696
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -112,7 +112,7 @@
112112
</ResourceCompile>
113113
<Link>
114114
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
115-
<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>
115+
<AdditionalDependencies>mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
116116
<OutputFile>$(OutDir)xray_export.dlu</OutputFile>
117117
<SuppressStartupBanner>true</SuppressStartupBanner>
118118
<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 @@
135135
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
136136
<WholeProgramOptimization>true</WholeProgramOptimization>
137137
<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>
138-
<PreprocessorDefinitions>UTILITY_EXPORTS;WIN32;_WINDOWS;_USRDLL;_MAX_EXPORT;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
138+
<PreprocessorDefinitions>UTILITY_EXPORTS;WIN32;_WINDOWS;_USRDLL;_MAX_EXPORT;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139139
<StringPooling>true</StringPooling>
140140
<MinimalRebuild>false</MinimalRebuild>
141141
<ExceptionHandling />
@@ -158,7 +158,7 @@
158158
</ResourceCompile>
159159
<Link>
160160
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
161-
<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>
161+
<AdditionalDependencies>mesh.lib;geom.lib;gfx.lib;maxutil.lib;core.lib;paramblk2.lib;comctl32.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
162162
<OutputFile>$(OutDir)xray_export.dlu</OutputFile>
163163
<SuppressStartupBanner>true</SuppressStartupBanner>
164164
<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 @@
268268
<None Include="Export\Utility.def" />
269269
</ItemGroup>
270270
<ItemGroup>
271-
<ProjectReference Include="$(SolutionDir)xrCore\xrCoreStatic.vcxproj">
272-
<Project>{f1066eac-ee25-4c7a-9023-5957a6f7ba27}</Project>
273-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
271+
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
272+
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
274273
</ProjectReference>
275274
</ItemGroup>
276275
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎src/plugins/Max/MAX_Material60.vcxproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<AdditionalOptions>/LD %(AdditionalOptions)</AdditionalOptions>
6666
<Optimization>Disabled</Optimization>
6767
<AdditionalIncludeDirectories>$(SolutionDir);$(XRAY_16X_LIBS)3dsmax/ver-6.0/include;$(XRAY_16X_LIBS)3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
68-
<PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
68+
<PreprocessorDefinitions>DEBUG;WIN32;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6969
<StringPooling>true</StringPooling>
7070
<ExceptionHandling>Sync</ExceptionHandling>
7171
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -85,7 +85,7 @@
8585
</ResourceCompile>
8686
<Link>
8787
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
88-
<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>
88+
<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>
8989
<OutputFile>$(OutDir)xray_material.dlt</OutputFile>
9090
<SuppressStartupBanner>true</SuppressStartupBanner>
9191
<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 @@
109109
<AdditionalOptions>/LD %(AdditionalOptions)</AdditionalOptions>
110110
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
111111
<AdditionalIncludeDirectories>$(SolutionDir);$(XRAY_16X_LIBS)3dsmax/ver-6.0/include;$(XRAY_16X_LIBS)3dsmax/ver-6.0/cssdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
112-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;XRCORE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_MAX_MATERIAL;_MAX_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113113
<StringPooling>true</StringPooling>
114114
<MinimalRebuild>false</MinimalRebuild>
115115
<ExceptionHandling />
@@ -131,7 +131,7 @@
131131
</ResourceCompile>
132132
<Link>
133133
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
134-
<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>
134+
<AdditionalDependencies>Winmm.lib;comctl32.lib;core.lib;geom.lib;gfx.lib;mesh.lib;maxutil.lib;maxscrpt.lib;manipsys.lib;paramblk2.lib;%(AdditionalDependencies)</AdditionalDependencies>
135135
<OutputFile>$(OutDir)xray_material.dlt</OutputFile>
136136
<SuppressStartupBanner>true</SuppressStartupBanner>
137137
<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 @@
177177
<Image Include="Material\dmtlmsk.bmp" />
178178
</ItemGroup>
179179
<ItemGroup>
180-
<ProjectReference Include="$(SolutionDir)xrCore\xrCoreStatic.vcxproj">
181-
<Project>{f1066eac-ee25-4c7a-9023-5957a6f7ba27}</Project>
182-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
180+
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
181+
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
183182
</ProjectReference>
184183
</ItemGroup>
185184
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎src/plugins/Max/Material/DllEntry.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,
1818
if(!controlsInit)
1919
{
2020
controlsInit = TRUE;
21-
Core._initialize("S.T.A.L.K.E.R.Plugin",0,FALSE);
21+
Core._initialize("S.T.A.L.K.E.R.Plugin", 0, FALSE, nullptr, true);
2222
FS._initialize (CLocatorAPI::flScanAppRoot,NULL,"xray_path.ltx");
2323
FPU::m64r (); // íóæíî ÷òîáû ìàêñ íå ñáðàñûâàë êîíòðîëüêè â 0
2424
InitCustomControls(hInstance); // Initialize MAX's custom controls

‎src/plugins/Max/Material/Stdafx.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "Max.h"
1313

1414
#include "xrCore/xrCore.h"
15+
#pragma comment(lib, "xrCore.lib")
1516

1617
#undef _MIN
1718
#undef _MAX

‎src/plugins/Maya/Export/Stdafx.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
#define ENGINE_API
1010
#define _WIN32_WINNT 0x0500
1111
#include "xrCore/xrCore.h"
12+
#pragma comment(lib, "xrCore.lib")
1213

1314
#pragma warning(push)
1415
#pragma warning(disable:4995)
1516
#include <assert.h>
1617

1718
#define REQUIRE_IOSTREAM
19+
#define _BCL
1820
#include <maya/MPxLocatorNode.h>
1921
#include <maya/MFnTransform.h>
2022
#include <maya/MEulerRotation.h>

0 commit comments

Comments
 (0)