From 00ad3ccbbe202d104973335f45795bccab95fd6d Mon Sep 17 00:00:00 2001 From: Igor Novikov Date: Thu, 14 Dec 2017 21:19:01 +0500 Subject: [PATCH] Part 2 of project files refactoring. --- src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj | 160 ++-------------- src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj | 158 ++-------------- src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj | 182 +++--------------- src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj | 188 +++---------------- src/xrScriptEngine/xrScriptEngine.vcxproj | 36 ++-- src/xrSound/xrSound.vcxproj | 36 ++-- 6 files changed, 112 insertions(+), 648 deletions(-) diff --git a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj index 5384aeb0180..cc8edb8157f 100644 --- a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj +++ b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj @@ -95,48 +95,14 @@ <_ProjectFileVersion>12.0.30501.0 - - true - - - true - - - false - - - false - - - false - - - false - - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) - true $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - false - MachineX86 - true Copy AGS dll to output directory @@ -145,26 +111,12 @@ - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) - true $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - false - true Copy AGS dll to output directory @@ -173,36 +125,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - MachineX86 - true Copy AGS dll to output directory @@ -211,35 +139,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - true Copy AGS dll to output directory @@ -248,32 +153,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib - MachineX86 Copy AGS dll to output directory @@ -282,31 +167,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib Copy AGS dll to output directory @@ -601,36 +467,36 @@ + + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} + {2578c6d8-660d-48ae-9322-7422f8664f06} {94a1c366-3d19-48e6-8170-4adc2e70df97} + + {132c62de-de85-4978-9675-c78ed4da46f0} + {1daec516-e52c-4a3c-a4da-ae3553e6e0f8} + + {7885cf3c-ee04-4c67-9467-1fbf9a36b037} + + + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} + {ccd4afae-aa10-42c6-a452-fdee497ccdf1} - + {632aeeb6-dc06-4e15-9551-b2b09a4b73c5} {61d4856f-fa82-4f02-bb88-909ddfb1fe74} - - {7885cf3c-ee04-4c67-9467-1fbf9a36b037} - - - {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} - - - {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} - - - {132c62de-de85-4978-9675-c78ed4da46f0} - diff --git a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj index 99ff5ba257e..e3d10e84acb 100644 --- a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj +++ b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj @@ -95,48 +95,14 @@ <_ProjectFileVersion>12.0.30501.0 - - true - - - true - - - false - - - false - - - false - - - false - - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) - true $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - false - MachineX86 - true Copy AGS dll to output directory @@ -145,26 +111,12 @@ - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) - true $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - false - true Copy AGS dll to output directory @@ -173,36 +125,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - true - Use - Level4 - -Zm150 %(AdditionalOptions) - Precise d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - MachineX86 - true Copy AGS dll to output directory @@ -211,35 +139,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - true - Use - Level4 - -Zm150 %(AdditionalOptions) - Precise d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - true Copy AGS dll to output directory @@ -248,32 +153,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib - MachineX86 Copy AGS dll to output directory @@ -282,31 +167,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib Copy AGS dll to output directory @@ -644,15 +510,27 @@ + + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} + {2578c6d8-660d-48ae-9322-7422f8664f06} {94a1c366-3d19-48e6-8170-4adc2e70df97} + + {132c62de-de85-4978-9675-c78ed4da46f0} + {1daec516-e52c-4a3c-a4da-ae3553e6e0f8} + + {7885cf3c-ee04-4c67-9467-1fbf9a36b037} + + + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} + {ccd4afae-aa10-42c6-a452-fdee497ccdf1} @@ -662,18 +540,6 @@ {61d4856f-fa82-4f02-bb88-909ddfb1fe74} - - {7885cf3c-ee04-4c67-9467-1fbf9a36b037} - - - {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} - - - {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} - - - {132c62de-de85-4978-9675-c78ed4da46f0} - diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj index 146cd916a0c..1af342a12d0 100644 --- a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj +++ b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj @@ -95,48 +95,14 @@ <_ProjectFileVersion>12.0.30501.0 - - true - - - true - - - false - - - false - - - false - - - false - - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_DX10;_USRDLL;XRRENDER_R3_EXPORTS;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) + _USRDLL;XRRENDER_R3_EXPORTS;USE_DX10;MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;%(AdditionalDependencies) - true + d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - false - MachineX86 - true Copy AGS dll to output directory @@ -145,26 +111,12 @@ - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_DX10;_USRDLL;XRRENDER_R3_EXPORTS;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) + _USRDLL;XRRENDER_R3_EXPORTS;USE_DX10;MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;%(AdditionalDependencies) - true + d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - false - true Copy AGS dll to output directory @@ -173,36 +125,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - USE_DX10;_USRDLL;XRRENDER_R3_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - true - Use - Level4 - -Zm150 %(AdditionalOptions) - Precise + _USRDLL;XRRENDER_R3_EXPORTS;USE_DX10;%(PreprocessorDefinitions) - d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;%(AdditionalDependencies) + d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - MachineX86 - true Copy AGS dll to output directory @@ -211,35 +139,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - USE_DX10;_USRDLL;XRRENDER_R3_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - true - Use - Level4 - -Zm150 %(AdditionalOptions) - Precise + _USRDLL;XRRENDER_R3_EXPORTS;USE_DX10;%(PreprocessorDefinitions) - d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;%(AdditionalDependencies) + d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - true Copy AGS dll to output directory @@ -248,32 +153,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - USE_DX10;_USRDLL;XRRENDER_R3_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) + _USRDLL;XRRENDER_R3_EXPORTS;USE_DX10;%(PreprocessorDefinitions) - d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;%(AdditionalDependencies) + d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib - MachineX86 Copy AGS dll to output directory @@ -282,31 +167,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - USE_DX10;_USRDLL;XRRENDER_R3_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) + _USRDLL;XRRENDER_R3_EXPORTS;USE_DX10;%(PreprocessorDefinitions) - d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;dxgi.lib;%(AdditionalDependencies) + d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d10.lib;d3dx10.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib Copy AGS dll to output directory @@ -692,15 +558,27 @@ + + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} + {2578c6d8-660d-48ae-9322-7422f8664f06} {94a1c366-3d19-48e6-8170-4adc2e70df97} + + {132c62de-de85-4978-9675-c78ed4da46f0} + {1daec516-e52c-4a3c-a4da-ae3553e6e0f8} + + {7885cf3c-ee04-4c67-9467-1fbf9a36b037} + + + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} + {ccd4afae-aa10-42c6-a452-fdee497ccdf1} @@ -710,18 +588,6 @@ {61d4856f-fa82-4f02-bb88-909ddfb1fe74} - - {7885cf3c-ee04-4c67-9467-1fbf9a36b037} - - - {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} - - - {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} - - - {132c62de-de85-4978-9675-c78ed4da46f0} - diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj index 6eb2085be43..1121ca48432 100644 --- a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj +++ b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj @@ -95,48 +95,14 @@ <_ProjectFileVersion>12.0.30501.0 - - true - - - true - - - false - - - false - - - false - - - false - - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;_USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) + _USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dx11.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;d3d10.lib;%(AdditionalDependencies) - true + d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - false - MachineX86 - true Copy AGS dll to output directory @@ -145,26 +111,12 @@ - Disabled - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;_USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) + _USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;MSAA_DX10_1;MSAA_SAMPLES=4;USE_MSAA;GBUFFER_OPTIMIZATION;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions) - d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dx11.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;d3d10.lib;%(AdditionalDependencies) - true + d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - false - true Copy AGS dll to output directory @@ -173,36 +125,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - USE_DX11;_USRDLL;XRRENDER_R4_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - true - Use - Level4 - -Zm150 %(AdditionalOptions) - Precise + _USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;%(PreprocessorDefinitions) - d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dx11.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;d3d10.lib;%(AdditionalDependencies) + d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - MachineX86 - true Copy AGS dll to output directory @@ -211,35 +139,12 @@ - MaxSpeed - AnySuitable - true - Speed - true - true - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) - USE_DX11;_USRDLL;XRRENDER_R4_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - false - StreamingSIMDExtensions2 - true - Use - Level4 - -Zm150 %(AdditionalOptions) - Precise + _USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;%(PreprocessorDefinitions) - d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dx11.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;d3d10.lib;%(AdditionalDependencies) + d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - true - UseLinkTimeCodeGeneration - false - true Copy AGS dll to output directory @@ -248,32 +153,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) - d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dx11.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;d3d10.lib;amd_ags_x86.lib;%(AdditionalDependencies) + d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;amd_ags_x86.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib - MachineX86 Copy AGS dll to output directory @@ -282,31 +167,12 @@ - Full - AnySuitable - true - Speed - false - true $(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories) _USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - false - Fast - true - Use - Level4 - -Zm150 %(AdditionalOptions) - d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxguid.lib;d3dx11.lib;D3DCompiler.lib;d3d11.lib;dxgi.lib;d3d10.lib;%(AdditionalDependencies) + d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;dxgi.lib;dxguid.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;%(AdditionalDependencies) $(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories) - Windows - true - false - $(xrLibDir)$(TargetName).lib Copy AGS dll to output directory @@ -706,32 +572,32 @@ {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} - - {ccd4afae-aa10-42c6-a452-fdee497ccdf1} + + {2578c6d8-660d-48ae-9322-7422f8664f06} - - {632aeeb6-dc06-4e15-9551-b2b09a4b73c5} + + {94a1c366-3d19-48e6-8170-4adc2e70df97} - - {61d4856f-fa82-4f02-bb88-909ddfb1fe74} + + {132c62de-de85-4978-9675-c78ed4da46f0} + + + {1daec516-e52c-4a3c-a4da-ae3553e6e0f8} - + {7885cf3c-ee04-4c67-9467-1fbf9a36b037} - + {a19b1df2-82ec-4364-8bdf-85d13a1c89b5} - - {2578c6d8-660d-48ae-9322-7422f8664f06} - - - {94a1c366-3d19-48e6-8170-4adc2e70df97} + + {ccd4afae-aa10-42c6-a452-fdee497ccdf1} - - {132c62de-de85-4978-9675-c78ed4da46f0} + + {632aeeb6-dc06-4e15-9551-b2b09a4b73c5} - - {1daec516-e52c-4a3c-a4da-ae3553e6e0f8} + + {61d4856f-fa82-4f02-bb88-909ddfb1fe74} diff --git a/src/xrScriptEngine/xrScriptEngine.vcxproj b/src/xrScriptEngine/xrScriptEngine.vcxproj index 601076c0eba..02b30a1e380 100644 --- a/src/xrScriptEngine/xrScriptEngine.vcxproj +++ b/src/xrScriptEngine/xrScriptEngine.vcxproj @@ -94,13 +94,13 @@ <_ProjectFileVersion>12.0.30501.0 - + pch.hpp _USRDLL;XRSCRIPTENGINE_EXPORTS;%(PreprocessorDefinitions) - + pch.hpp _USRDLL;XRSCRIPTENGINE_EXPORTS;%(PreprocessorDefinitions) @@ -118,32 +118,18 @@ _USRDLL;XRSCRIPTENGINE_EXPORTS;%(PreprocessorDefinitions) - + pch.hpp _USRDLL;XRSCRIPTENGINE_EXPORTS;%(PreprocessorDefinitions) - + pch.hpp _USRDLL;XRSCRIPTENGINE_EXPORTS;%(PreprocessorDefinitions) - - - {1daec516-e52c-4a3c-a4da-ae3553e6e0f8} - - - {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} - - - {ccd4afae-aa10-42c6-a452-fdee497ccdf1} - - - {632aeeb6-dc06-4e15-9551-b2b09a4b73c5} - - @@ -197,6 +183,20 @@ + + + {1daec516-e52c-4a3c-a4da-ae3553e6e0f8} + + + {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} + + + {ccd4afae-aa10-42c6-a452-fdee497ccdf1} + + + {632aeeb6-dc06-4e15-9551-b2b09a4b73c5} + + diff --git a/src/xrSound/xrSound.vcxproj b/src/xrSound/xrSound.vcxproj index d2163683bf5..11d886a187c 100644 --- a/src/xrSound/xrSound.vcxproj +++ b/src/xrSound/xrSound.vcxproj @@ -31,62 +31,62 @@ Win32Proj - + DynamicLibrary v141 MultiByte - + DynamicLibrary v141 MultiByte - + DynamicLibrary v141 MultiByte - true - + DynamicLibrary v141 MultiByte - true - + DynamicLibrary v141 MultiByte + true - + DynamicLibrary v141 MultiByte + true - + - + - + - + - + - + @@ -112,7 +112,7 @@ eax.lib;dsound.lib;%(AdditionalDependencies) - + $(xrExternals)libvorbis\include;$(xrExternals)libogg\include;$(xrExternals)OpenAL\include;%(AdditionalIncludeDirectories) _USRDLL;XRSOUND_EXPORTS;%(PreprocessorDefinitions) @@ -121,7 +121,7 @@ eax.lib;dsound.lib;%(AdditionalDependencies) - + $(xrExternals)libvorbis\include;$(xrExternals)libogg\include;$(xrExternals)OpenAL\include;%(AdditionalIncludeDirectories) _USRDLL;XRSOUND_EXPORTS;%(PreprocessorDefinitions) @@ -130,7 +130,7 @@ eax.lib;dsound.lib;%(AdditionalDependencies) - + $(xrExternals)libvorbis\include;$(xrExternals)libogg\include;$(xrExternals)OpenAL\include;%(AdditionalIncludeDirectories) _USRDLL;XRSOUND_EXPORTS;%(PreprocessorDefinitions) @@ -139,7 +139,7 @@ eax.lib;dsound.lib;%(AdditionalDependencies) - + $(xrExternals)libvorbis\include;$(xrExternals)libogg\include;$(xrExternals)OpenAL\include;%(AdditionalIncludeDirectories) _USRDLL;XRSOUND_EXPORTS;%(PreprocessorDefinitions)