From 3604b540fc2419880827c7c20b1b885af821340f Mon Sep 17 00:00:00 2001 From: Xottab_DUTY Date: Tue, 2 Apr 2019 23:21:50 +0500 Subject: [PATCH] Build system fixes --- .gitignore | 10 ++++---- cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj | 4 +-- .../OpenAL-Windows/Router/Router.vcxproj | 2 -- cs/3rd party/libogg_static.vcxproj | 10 ++++---- cs/3rd party/libtheora_static.vcxproj | 10 ++++---- cs/3rd party/libvorbis_static.vcxproj | 10 ++++---- cs/3rd party/libvorbisfile_static.vcxproj | 10 ++++---- .../layers/xrRenderPC_GL/xrRender_GL.vcxproj | 7 +++--- .../layers/xrRenderPC_R1/xrRender_R1.vcxproj | 19 +++++++++++--- .../layers/xrRenderPC_R2/xrRender_R2.vcxproj | 19 +++++++++++--- .../layers/xrRenderPC_R3/xrRender_R3.vcxproj | 25 +++++++++++++------ cs/engine/plugins/Max/MAX_Export60.vcxproj | 8 +----- cs/engine/plugins/Max/MAX_Material60.vcxproj | 2 -- .../plugins/Maya/Maya_Export2008.vcxproj | 6 ++--- cs/engine/plugins/Maya/Maya_Export85.vcxproj | 6 ++--- .../plugins/Maya/Maya_Material2008.vcxproj | 6 ++--- .../plugins/Maya/Maya_Material85.vcxproj | 9 ++----- cs/engine/plugins/lw/LW_Export70.vcxproj | 6 ----- cs/engine/plugins/lw/LW_Export75.vcxproj | 6 ----- cs/engine/plugins/lw/LW_Export80.vcxproj | 6 ----- cs/engine/plugins/lw/LW_Server.vcxproj | 6 ----- cs/engine/plugins/lw/LW_Shader70.vcxproj | 8 ------ cs/engine/plugins/lw/LW_Shader75.vcxproj | 8 ------ cs/engine/plugins/lw/LW_Shader80.vcxproj | 8 ------ cs/engine/utils/ETools/ETools.vcxproj | 3 +-- cs/engine/utils/xrAI/xrAI.vcxproj | 2 +- cs/engine/utils/xrCompress/xrCompress.vcxproj | 2 +- cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj | 2 +- cs/engine/utils/xrDXT/DXT.vcxproj | 2 +- cs/engine/utils/xrLC/xrLC.vcxproj | 2 +- cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj | 2 +- cs/engine/utils/xrQSlim/xrQSlim.vcxproj | 2 +- .../utils/xrSE_Factory/xrSE_Factory.vcxproj | 10 +++----- cs/engine/xrCDB/xrCDB.vcxproj | 1 - cs/engine/xrCore/xrCore.vcxproj | 1 - cs/engine/xrCore/xrCoreStatic.vcxproj | 2 +- cs/engine/xrEngine/xrEngine.vcxproj | 20 +++++---------- cs/engine/xrGame/xrGame.vcxproj | 3 --- cs/engine/xrNetServer/xrNetServer.vcxproj | 6 ++--- cs/engine/xrSound/xrSound.vcxproj | 7 +++--- 40 files changed, 111 insertions(+), 167 deletions(-) diff --git a/.gitignore b/.gitignore index eac9abc94..c447b072f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ # exclude all dot files except .gitignore .* !.gitignore -./bin/ -./bin_plugs/ -./intermediate/ -./intermediate_plugs/ -./lib/ +bin/* +bin_plugs/* +intermediate/* +intermediate_plugs/* +lib/* diff --git a/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj b/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj index d602a2ff6..98c2a10f7 100644 --- a/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj +++ b/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj @@ -20,7 +20,7 @@ DynamicLibrary - v141 + v140 MultiByte @@ -42,11 +42,9 @@ - true false - true false diff --git a/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj b/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj index 56e4e168f..f8e623f9a 100644 --- a/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj +++ b/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj @@ -87,7 +87,6 @@ true $(OutDir)$(TargetName).pdb true - $(SolutionDir)libraries\$(Configuration)\$(TargetName).lib MachineX86 @@ -137,7 +136,6 @@ $(OutDir)$(TargetName).pdb true UseLinkTimeCodeGeneration - $(SolutionDir)libraries\$(Configuration)\$(TargetName).lib MachineX86 diff --git a/cs/3rd party/libogg_static.vcxproj b/cs/3rd party/libogg_static.vcxproj index 016e5c13a..391fd3318 100644 --- a/cs/3rd party/libogg_static.vcxproj +++ b/cs/3rd party/libogg_static.vcxproj @@ -42,28 +42,28 @@ StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte true - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 diff --git a/cs/3rd party/libtheora_static.vcxproj b/cs/3rd party/libtheora_static.vcxproj index 3890a1d8d..e963f562d 100644 --- a/cs/3rd party/libtheora_static.vcxproj +++ b/cs/3rd party/libtheora_static.vcxproj @@ -42,28 +42,28 @@ StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte true - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 diff --git a/cs/3rd party/libvorbis_static.vcxproj b/cs/3rd party/libvorbis_static.vcxproj index 2579ffe8e..0acbe7aef 100644 --- a/cs/3rd party/libvorbis_static.vcxproj +++ b/cs/3rd party/libvorbis_static.vcxproj @@ -36,22 +36,22 @@ StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary @@ -63,7 +63,7 @@ StaticLibrary MultiByte true - v141 + v140 diff --git a/cs/3rd party/libvorbisfile_static.vcxproj b/cs/3rd party/libvorbisfile_static.vcxproj index a956fb033..d1b0bbcab 100644 --- a/cs/3rd party/libvorbisfile_static.vcxproj +++ b/cs/3rd party/libvorbisfile_static.vcxproj @@ -37,22 +37,22 @@ StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary MultiByte - v141 + v140 StaticLibrary @@ -63,7 +63,7 @@ StaticLibrary MultiByte - v141 + v140 true diff --git a/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj b/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj index 069712861..66869f4fe 100644 --- a/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj +++ b/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj @@ -57,7 +57,6 @@ - true true @@ -93,7 +92,7 @@ opengl32.lib;glu32.lib;glew32.lib;%(AdditionalDependencies) true - $(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + $(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) true false @@ -135,7 +134,7 @@ opengl32.lib;glu32.lib;glew32.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + $(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)$(TargetName).pdb false @@ -178,7 +177,7 @@ opengl32.lib;glu32.lib;glew32.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + $(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) true false $(OutDir)$(TargetName).map diff --git a/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj b/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj index 887378931..2c38d73ec 100644 --- a/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj +++ b/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj @@ -57,7 +57,6 @@ - true true $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(DXSDK_DIR)Lib\x86; @@ -96,7 +95,7 @@ nvapi.lib;atimgpud_mtdll_x86.lib;%(AdditionalDependencies) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true false @@ -139,7 +138,7 @@ nvapi.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true $(OutDir)$(TargetName).pdb false @@ -183,7 +182,7 @@ nvapi.lib;atimgpud_mtdll_x86.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true false $(OutDir)$(TargetName).map @@ -510,9 +509,21 @@ {94a1c366-3d19-48e6-8170-4adc2e70df97} false + + {cc52e0b3-cc35-4934-9302-035b748f3f2c} + + + {f6c4f74a-152c-4612-9e3b-d02346234855} + + + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} + + {ccca7859-eb86-493e-9b53-c4235f45b3c5} + diff --git a/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj b/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj index 20cd67577..cc8198a21 100644 --- a/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj +++ b/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj @@ -57,7 +57,6 @@ - true true @@ -93,7 +92,7 @@ nvapi.lib;atimgpud_mtdll_x86.lib;%(AdditionalDependencies) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true false @@ -135,7 +134,7 @@ nvapi.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true $(OutDir)$(TargetName).pdb false @@ -178,7 +177,7 @@ nvapi.lib;atimgpud_mtdll_x86.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true false $(OutDir)$(TargetName).map @@ -547,9 +546,21 @@ {94a1c366-3d19-48e6-8170-4adc2e70df97} false + + {cc52e0b3-cc35-4934-9302-035b748f3f2c} + + + {f6c4f74a-152c-4612-9e3b-d02346234855} + + + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} + + {ccca7859-eb86-493e-9b53-c4235f45b3c5} + diff --git a/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj b/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj index 3e95bdd7b..13b6b238f 100644 --- a/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj +++ b/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj @@ -57,7 +57,6 @@ - true true @@ -70,7 +69,7 @@ Disabled true - .\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)sdk\DXSDK\Include;$(SolutionDir)3rd party;$(AdditionalIncludeDirectories) + .\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)sdk\DXSDK\Include;$(SolutionDir)3rd party;%(AdditionalIncludeDirectories) MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_DX10;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R3_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) false Sync @@ -93,7 +92,7 @@ d3d10.lib;d3dx10.lib;dxgi.lib;nvapi.lib;atimgpud_mtdll_x86.lib;%(AdditionalDependencies) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true false @@ -112,7 +111,7 @@ true true true - .\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)sdk\DXSDK\Include;$(SolutionDir)3rd party;$(AdditionalIncludeDirectories) + .\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)sdk\DXSDK\Include;$(SolutionDir)3rd party;%(AdditionalIncludeDirectories) USE_DX10;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R3_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -135,7 +134,7 @@ d3d10.lib;d3dx10.lib;dxgi.lib;nvapi.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true $(OutDir)$(TargetName).pdb false @@ -157,7 +156,7 @@ Speed false true - .\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)sdk\DXSDK\Include;$(SolutionDir)3rd party;$(AdditionalIncludeDirectories) + .\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)sdk\DXSDK\Include;$(SolutionDir)3rd party;%(AdditionalIncludeDirectories) USE_DX10;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R3_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -178,7 +177,7 @@ d3d10.lib;d3dx10.lib;dxgi.lib;nvapi.lib;atimgpud_mtdll_x86.lib;%(AdditionalDependencies) - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) true false $(OutDir)$(TargetName).map @@ -598,9 +597,21 @@ {94a1c366-3d19-48e6-8170-4adc2e70df97} false + + {cc52e0b3-cc35-4934-9302-035b748f3f2c} + + + {f6c4f74a-152c-4612-9e3b-d02346234855} + + + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} + + {ccca7859-eb86-493e-9b53-c4235f45b3c5} + diff --git a/cs/engine/plugins/Max/MAX_Export60.vcxproj b/cs/engine/plugins/Max/MAX_Export60.vcxproj index f8142eba1..42705c0f6 100644 --- a/cs/engine/plugins/Max/MAX_Export60.vcxproj +++ b/cs/engine/plugins/Max/MAX_Export60.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 false MultiByte @@ -60,15 +60,12 @@ - true true - true false - true false @@ -115,7 +112,6 @@ true $(OutDir)xray_export.pdb 0x08970000 - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -164,7 +160,6 @@ true 0x08970000 - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -211,7 +206,6 @@ false true 0x08970000 - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/Max/MAX_Material60.vcxproj b/cs/engine/plugins/Max/MAX_Material60.vcxproj index 7cffb0484..cfe77b428 100644 --- a/cs/engine/plugins/Max/MAX_Material60.vcxproj +++ b/cs/engine/plugins/Max/MAX_Material60.vcxproj @@ -91,7 +91,6 @@ $(OutDir)xray_material.pdb Windows 0x3e0e0000 - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -140,7 +139,6 @@ Windows true 0x3e0e0000 - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/Maya/Maya_Export2008.vcxproj b/cs/engine/plugins/Maya/Maya_Export2008.vcxproj index 2937eb971..d40b71e3e 100644 --- a/cs/engine/plugins/Maya/Maya_Export2008.vcxproj +++ b/cs/engine/plugins/Maya/Maya_Export2008.vcxproj @@ -81,7 +81,7 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;OpenMayaUI.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_export.mll @@ -90,7 +90,6 @@ true $(OutDir)xrayMaya_export.pdb Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -127,14 +126,13 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_export.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk/3d_sdk/maya/ver-2008/lib;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\libraries;%(AdditionalLibraryDirectories) Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/Maya/Maya_Export85.vcxproj b/cs/engine/plugins/Maya/Maya_Export85.vcxproj index 0471f4d54..ea4bba13e 100644 --- a/cs/engine/plugins/Maya/Maya_Export85.vcxproj +++ b/cs/engine/plugins/Maya/Maya_Export85.vcxproj @@ -80,7 +80,7 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_export.mll @@ -89,7 +89,6 @@ true $(OutDir)xrayMaya_export.pdb Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -126,14 +125,13 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaAnim.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_export.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk/3d_sdk/maya/ver-8.5/lib;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\libraries;%(AdditionalLibraryDirectories) Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/Maya/Maya_Material2008.vcxproj b/cs/engine/plugins/Maya/Maya_Material2008.vcxproj index f73b7e6af..222a046b0 100644 --- a/cs/engine/plugins/Maya/Maya_Material2008.vcxproj +++ b/cs/engine/plugins/Maya/Maya_Material2008.vcxproj @@ -81,7 +81,7 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_material.mll @@ -90,7 +90,6 @@ true $(OutDir)xrayMaya_material.pdb Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -127,14 +126,13 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_material.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk/3d_sdk/maya/ver-2008/lib;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\libraries;%(AdditionalLibraryDirectories) Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/Maya/Maya_Material85.vcxproj b/cs/engine/plugins/Maya/Maya_Material85.vcxproj index 76fae56da..e7249c560 100644 --- a/cs/engine/plugins/Maya/Maya_Material85.vcxproj +++ b/cs/engine/plugins/Maya/Maya_Material85.vcxproj @@ -81,7 +81,7 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_material.mll @@ -90,7 +90,6 @@ true $(OutDir)xrayMaya_material.pdb Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -115,9 +114,6 @@ true Use $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName) - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName) - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName) Level3 true Default @@ -127,14 +123,13 @@ 0x0409 - /MACHINE:I386 /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) + /export:initializePlugin /export:uninitializePlugin %(AdditionalOptions) odbc32.lib;odbccp32.lib;Foundation.lib;OpenMaya.lib;OpenMayaRender.lib;OpenMayaUI.lib;glu32.lib;opengl32.lib;xrcorestatic.lib;%(AdditionalDependencies) $(OutDir)xrayMaya_material.mll true $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk/3d_sdk/maya/ver-8.5/lib;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\libraries;%(AdditionalLibraryDirectories) Windows - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/lw/LW_Export70.vcxproj b/cs/engine/plugins/lw/LW_Export70.vcxproj index 126eed217..bea2e7274 100644 --- a/cs/engine/plugins/lw/LW_Export70.vcxproj +++ b/cs/engine/plugins/lw/LW_Export70.vcxproj @@ -90,7 +90,6 @@ $(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) Server\serv.def - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -115,9 +114,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ false Level3 @@ -137,7 +133,6 @@ Server\serv.def true $(OutDir)xray_export.pdb - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -303,7 +298,6 @@ $(IntDir)%(Filename)1.xdc - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName) diff --git a/cs/engine/plugins/lw/LW_Export75.vcxproj b/cs/engine/plugins/lw/LW_Export75.vcxproj index 5e819a8b3..0e521a2dd 100644 --- a/cs/engine/plugins/lw/LW_Export75.vcxproj +++ b/cs/engine/plugins/lw/LW_Export75.vcxproj @@ -90,7 +90,6 @@ $(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) Server\serv.def - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -115,9 +114,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ false Level3 @@ -137,7 +133,6 @@ Server\serv.def true $(OutDir)xray_export.pdb - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -303,7 +298,6 @@ $(IntDir)%(Filename)1.xdc - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName) diff --git a/cs/engine/plugins/lw/LW_Export80.vcxproj b/cs/engine/plugins/lw/LW_Export80.vcxproj index c7d734eec..307e6e61e 100644 --- a/cs/engine/plugins/lw/LW_Export80.vcxproj +++ b/cs/engine/plugins/lw/LW_Export80.vcxproj @@ -90,7 +90,6 @@ $(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) Server\serv.def - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -115,9 +114,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ false Level3 @@ -137,7 +133,6 @@ Server\serv.def true $(OutDir)xray_export.pdb - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -303,7 +298,6 @@ $(IntDir)%(Filename).xdc - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName) diff --git a/cs/engine/plugins/lw/LW_Server.vcxproj b/cs/engine/plugins/lw/LW_Server.vcxproj index e1b368c97..c37965dac 100644 --- a/cs/engine/plugins/lw/LW_Server.vcxproj +++ b/cs/engine/plugins/lw/LW_Server.vcxproj @@ -56,9 +56,6 @@ false - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true @@ -85,9 +82,6 @@ false - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true EditAndContinue diff --git a/cs/engine/plugins/lw/LW_Shader70.vcxproj b/cs/engine/plugins/lw/LW_Shader70.vcxproj index 24977277a..c1a6d0b36 100644 --- a/cs/engine/plugins/lw/LW_Shader70.vcxproj +++ b/cs/engine/plugins/lw/LW_Shader70.vcxproj @@ -71,9 +71,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true @@ -90,7 +87,6 @@ $(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) Server\serv.def - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -117,9 +113,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true @@ -138,7 +131,6 @@ Server\serv.def true $(OutDir)xray_shader.pdb - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/lw/LW_Shader75.vcxproj b/cs/engine/plugins/lw/LW_Shader75.vcxproj index e8f95b420..02c3ca45f 100644 --- a/cs/engine/plugins/lw/LW_Shader75.vcxproj +++ b/cs/engine/plugins/lw/LW_Shader75.vcxproj @@ -71,9 +71,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true @@ -90,7 +87,6 @@ $(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) Server\serv.def - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -117,9 +113,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true @@ -138,7 +131,6 @@ Server\serv.def true $(OutDir)xray_shader.pdb - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/plugins/lw/LW_Shader80.vcxproj b/cs/engine/plugins/lw/LW_Shader80.vcxproj index f66d14f9a..5192f98bd 100644 --- a/cs/engine/plugins/lw/LW_Shader80.vcxproj +++ b/cs/engine/plugins/lw/LW_Shader80.vcxproj @@ -71,9 +71,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true @@ -90,7 +87,6 @@ $(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) Server\serv.def - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib @@ -117,9 +113,6 @@ Use stdafx.h $(IntDir)$(ProjectName).pch - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName)\ Level3 true @@ -138,7 +131,6 @@ Server\serv.def true $(OutDir)xray_shader.pdb - $(SolutionDir)intermediate_plugs\$(Configuration)\$(ProjectName).lib diff --git a/cs/engine/utils/ETools/ETools.vcxproj b/cs/engine/utils/ETools/ETools.vcxproj index c42f0e4a8..ab5058d65 100644 --- a/cs/engine/utils/ETools/ETools.vcxproj +++ b/cs/engine/utils/ETools/ETools.vcxproj @@ -21,7 +21,7 @@ DynamicLibrary - v141 + v140 false MultiByte @@ -62,7 +62,6 @@ $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86); - true true $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86); diff --git a/cs/engine/utils/xrAI/xrAI.vcxproj b/cs/engine/utils/xrAI/xrAI.vcxproj index b8de43865..1c92ba6c7 100644 --- a/cs/engine/utils/xrAI/xrAI.vcxproj +++ b/cs/engine/utils/xrAI/xrAI.vcxproj @@ -21,7 +21,7 @@ Application - v141 + v140 false MultiByte diff --git a/cs/engine/utils/xrCompress/xrCompress.vcxproj b/cs/engine/utils/xrCompress/xrCompress.vcxproj index b506f1644..7df243b1c 100644 --- a/cs/engine/utils/xrCompress/xrCompress.vcxproj +++ b/cs/engine/utils/xrCompress/xrCompress.vcxproj @@ -21,7 +21,7 @@ Application - v141 + v140 false MultiByte false diff --git a/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj b/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj index a89046f39..6258c1e0b 100644 --- a/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj +++ b/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj @@ -21,7 +21,7 @@ Application - v141 + v140 false MultiByte diff --git a/cs/engine/utils/xrDXT/DXT.vcxproj b/cs/engine/utils/xrDXT/DXT.vcxproj index 1c9fbb3a8..272b9c4d8 100644 --- a/cs/engine/utils/xrDXT/DXT.vcxproj +++ b/cs/engine/utils/xrDXT/DXT.vcxproj @@ -22,7 +22,7 @@ DynamicLibrary - v141 + v140 false MultiByte true diff --git a/cs/engine/utils/xrLC/xrLC.vcxproj b/cs/engine/utils/xrLC/xrLC.vcxproj index 53ca3b14b..3a74ade2a 100644 --- a/cs/engine/utils/xrLC/xrLC.vcxproj +++ b/cs/engine/utils/xrLC/xrLC.vcxproj @@ -21,7 +21,7 @@ Application - v141 + v140 false false MultiByte diff --git a/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj b/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj index df59ea628..11e3d7588 100644 --- a/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj +++ b/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj @@ -23,7 +23,7 @@ DynamicLibrary - v141 + v140 MultiByte diff --git a/cs/engine/utils/xrQSlim/xrQSlim.vcxproj b/cs/engine/utils/xrQSlim/xrQSlim.vcxproj index 0feef5f05..970b4c20d 100644 --- a/cs/engine/utils/xrQSlim/xrQSlim.vcxproj +++ b/cs/engine/utils/xrQSlim/xrQSlim.vcxproj @@ -23,7 +23,7 @@ StaticLibrary - v141 + v140 MultiByte diff --git a/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj b/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj index 710197dc8..4721da336 100644 --- a/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj +++ b/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj @@ -29,7 +29,7 @@ DynamicLibrary - v141 + v140 false MultiByte @@ -58,7 +58,6 @@ - true true @@ -95,7 +94,7 @@ true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk\;$(SolutionDir)\$(Configuration);%(AdditionalLibraryDirectories) true false @@ -148,9 +147,8 @@ 0x0419 - /MACHINE:I386 %(AdditionalOptions) true - $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk\;$(SolutionDir)\$(Configuration);%(AdditionalLibraryDirectories) true false $(OutDir)$(TargetName).map @@ -188,7 +186,7 @@ ProgramDatabase - $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;$(SolutionDir)sdk\;$(SolutionDir)\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)$(TargetName).pdb false diff --git a/cs/engine/xrCDB/xrCDB.vcxproj b/cs/engine/xrCDB/xrCDB.vcxproj index 47cec206a..b250215c1 100644 --- a/cs/engine/xrCDB/xrCDB.vcxproj +++ b/cs/engine/xrCDB/xrCDB.vcxproj @@ -64,7 +64,6 @@ false - true true diff --git a/cs/engine/xrCore/xrCore.vcxproj b/cs/engine/xrCore/xrCore.vcxproj index 511319264..1a02c803f 100644 --- a/cs/engine/xrCore/xrCore.vcxproj +++ b/cs/engine/xrCore/xrCore.vcxproj @@ -57,7 +57,6 @@ - true true $(VC_IncludePath);$(WindowsSDK_IncludePath); diff --git a/cs/engine/xrCore/xrCoreStatic.vcxproj b/cs/engine/xrCore/xrCoreStatic.vcxproj index a55fd0f71..815f20fa9 100644 --- a/cs/engine/xrCore/xrCoreStatic.vcxproj +++ b/cs/engine/xrCore/xrCoreStatic.vcxproj @@ -23,7 +23,7 @@ StaticLibrary - v141 + v140 MultiByte diff --git a/cs/engine/xrEngine/xrEngine.vcxproj b/cs/engine/xrEngine/xrEngine.vcxproj index 175107c79..e771ac600 100644 --- a/cs/engine/xrEngine/xrEngine.vcxproj +++ b/cs/engine/xrEngine/xrEngine.vcxproj @@ -106,7 +106,6 @@ *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) - true true @@ -118,7 +117,6 @@ $(SolutionDir)binaries\$(Configuration)\dedicated\ *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) - true true @@ -167,11 +165,10 @@ 0x0422 - /MACHINE:I386 %(AdditionalOptions) msacm32.lib;vfw32.lib;%(AdditionalDependencies) NotSet true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) libcmtd;libc;libcd;%(IgnoreSpecificDefaultLibraries) true false @@ -216,10 +213,9 @@ 0x0422 - /MACHINE:I386 %(AdditionalOptions) msacm32.lib;vfw32.lib;%(AdditionalDependencies) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) libcmt;%(IgnoreSpecificDefaultLibraries) true false @@ -270,10 +266,9 @@ 0x0422 - /MACHINE:I386 %(AdditionalOptions) msacm32.lib;vfw32.lib;%(AdditionalDependencies) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) libcmt;%(IgnoreSpecificDefaultLibraries) true $(OutDir)$(TargetName).pdb @@ -325,12 +320,11 @@ 0x0422 - /MACHINE:I386 %(AdditionalOptions) msacm32.lib;vfw32.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) libcmtd;libcd;%(IgnoreSpecificDefaultLibraries) true @@ -376,11 +370,10 @@ 0x0422 - /MACHINE:I386 %(AdditionalOptions) msacm32.lib;vfw32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) libcmt;%(IgnoreSpecificDefaultLibraries) true false @@ -427,11 +420,10 @@ 0x0422 - /MACHINE:I386 %(AdditionalOptions) msacm32.lib;vfw32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true - $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);$(AdditionalLibraryDirectories) + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(SolutionDir)sdk\DXSDK\Lib\$(PlatformShortName);%(AdditionalLibraryDirectories) libcmt;%(IgnoreSpecificDefaultLibraries) true false diff --git a/cs/engine/xrGame/xrGame.vcxproj b/cs/engine/xrGame/xrGame.vcxproj index 6b8da8db3..438b90a14 100644 --- a/cs/engine/xrGame/xrGame.vcxproj +++ b/cs/engine/xrGame/xrGame.vcxproj @@ -60,7 +60,6 @@ *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) - true true @@ -168,7 +167,6 @@ 0x0419 - /MACHINE:I386 %(AdditionalOptions) true $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) true @@ -226,7 +224,6 @@ 0x0419 - /MACHINE:I386 %(AdditionalOptions) true $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) true diff --git a/cs/engine/xrNetServer/xrNetServer.vcxproj b/cs/engine/xrNetServer/xrNetServer.vcxproj index efd498a4a..515e27835 100644 --- a/cs/engine/xrNetServer/xrNetServer.vcxproj +++ b/cs/engine/xrNetServer/xrNetServer.vcxproj @@ -81,7 +81,7 @@ true true true - $(SolutionDir)engine;$(SolutionDir)sdk\include;$(DXSDK_DIR)Include;$(AdditionalIncludeDirectories) + $(SolutionDir)engine;$(SolutionDir)sdk\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;XR_NETSERVER_EXPORTS;_SECURE_SCL=0;$(PreprocessorDefinitions) true @@ -137,7 +137,7 @@ Speed false true - $(SolutionDir)engine;$(SolutionDir)sdk\include;$(DXSDK_DIR)Include;$(AdditionalIncludeDirectories) + $(SolutionDir)engine;$(SolutionDir)sdk\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;XR_NETSERVER_EXPORTS;_SECURE_SCL=0;$(PreprocessorDefinitions) true MultiThreadedDLL @@ -185,7 +185,7 @@ Disabled true - $(SolutionDir)engine;$(SolutionDir)sdk\include;$(DXSDK_DIR)Include;$(AdditionalIncludeDirectories) + $(SolutionDir)engine;$(SolutionDir)sdk\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) DEBUG;WIN32;_WINDOWS;XR_NETSERVER_EXPORTS;$(PreprocessorDefinitions) false false diff --git a/cs/engine/xrSound/xrSound.vcxproj b/cs/engine/xrSound/xrSound.vcxproj index 0dd8bddd6..e8716472e 100644 --- a/cs/engine/xrSound/xrSound.vcxproj +++ b/cs/engine/xrSound/xrSound.vcxproj @@ -56,7 +56,6 @@ - true true @@ -71,7 +70,7 @@ false Neither true - $(SolutionDir)engine;$(SolutionDir)sdk\include;$(AdditionalIncludeDirectories) + $(SolutionDir)engine;$(SolutionDir)sdk\include;%(AdditionalIncludeDirectories) WIN32;DEBUG;_WINDOWS;_USRDLL;XRSOUND_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) false false @@ -118,7 +117,7 @@ true true true - $(SolutionDir)engine;$(SolutionDir)sdk\include;$(AdditionalIncludeDirectories) + $(SolutionDir)engine;$(SolutionDir)sdk\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;XRSOUND_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true @@ -164,7 +163,7 @@ Speed false true - $(SolutionDir)engine;$(SolutionDir)sdk\include;$(AdditionalIncludeDirectories) + $(SolutionDir)engine;$(SolutionDir)sdk\include;%(AdditionalIncludeDirectories) MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRSOUND_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) true MultiThreadedDLL