Skip to content

Commit 00ad3cc

Browse files
intorrXottab-DUTY
intorr
authored and
Xottab-DUTY
committed
Part 2 of project files refactoring.
1 parent 5248b53 commit 00ad3cc

File tree

6 files changed

+112
-648
lines changed

6 files changed

+112
-648
lines changed

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj‎

Lines changed: 13 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -95,48 +95,14 @@
9595
<PropertyGroup>
9696
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9797
</PropertyGroup>
98-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
99-
<LinkIncremental>true</LinkIncremental>
100-
</PropertyGroup>
101-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
102-
<LinkIncremental>true</LinkIncremental>
103-
</PropertyGroup>
104-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
105-
<LinkIncremental>false</LinkIncremental>
106-
</PropertyGroup>
107-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
108-
<LinkIncremental>false</LinkIncremental>
109-
</PropertyGroup>
110-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
111-
<LinkIncremental>false</LinkIncremental>
112-
</PropertyGroup>
113-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
114-
<LinkIncremental>false</LinkIncremental>
115-
</PropertyGroup>
11698
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
11799
<ClCompile>
118-
<Optimization>Disabled</Optimization>
119-
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
120100
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121101
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122-
<MinimalRebuild>true</MinimalRebuild>
123-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
124-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
125-
<FunctionLevelLinking>true</FunctionLevelLinking>
126-
<FloatingPointModel>Fast</FloatingPointModel>
127-
<RuntimeTypeInfo>true</RuntimeTypeInfo>
128-
<PrecompiledHeader>Use</PrecompiledHeader>
129-
<WarningLevel>Level4</WarningLevel>
130-
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
131102
</ClCompile>
132103
<Link>
133104
<AdditionalDependencies>d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
134-
<SuppressStartupBanner>true</SuppressStartupBanner>
135105
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
136-
<SubSystem>Windows</SubSystem>
137-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
138-
<TargetMachine>MachineX86</TargetMachine>
139-
<LargeAddressAware>true</LargeAddressAware>
140106
</Link>
141107
<PostBuildEvent>
142108
<Message>Copy AGS dll to output directory</Message>
@@ -145,26 +111,12 @@
145111
</ItemDefinitionGroup>
146112
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
147113
<ClCompile>
148-
<Optimization>Disabled</Optimization>
149-
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
150114
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
151115
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
153-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
154-
<FunctionLevelLinking>true</FunctionLevelLinking>
155-
<FloatingPointModel>Fast</FloatingPointModel>
156-
<RuntimeTypeInfo>true</RuntimeTypeInfo>
157-
<PrecompiledHeader>Use</PrecompiledHeader>
158-
<WarningLevel>Level4</WarningLevel>
159-
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
160116
</ClCompile>
161117
<Link>
162118
<AdditionalDependencies>d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
163-
<SuppressStartupBanner>true</SuppressStartupBanner>
164119
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
165-
<SubSystem>Windows</SubSystem>
166-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
167-
<LargeAddressAware>true</LargeAddressAware>
168120
</Link>
169121
<PostBuildEvent>
170122
<Message>Copy AGS dll to output directory</Message>
@@ -173,36 +125,12 @@
173125
</ItemDefinitionGroup>
174126
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
175127
<ClCompile>
176-
<Optimization>MaxSpeed</Optimization>
177-
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
178-
<IntrinsicFunctions>true</IntrinsicFunctions>
179-
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
180-
<OmitFramePointers>true</OmitFramePointers>
181-
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
182-
<WholeProgramOptimization>true</WholeProgramOptimization>
183128
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184129
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185-
<StringPooling>true</StringPooling>
186-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
187-
<BufferSecurityCheck>false</BufferSecurityCheck>
188-
<FunctionLevelLinking>false</FunctionLevelLinking>
189-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
190-
<FloatingPointModel>Fast</FloatingPointModel>
191-
<RuntimeTypeInfo>true</RuntimeTypeInfo>
192-
<PrecompiledHeader>Use</PrecompiledHeader>
193-
<WarningLevel>Level4</WarningLevel>
194-
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
195130
</ClCompile>
196131
<Link>
197132
<AdditionalDependencies>d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
198133
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199-
<SubSystem>Windows</SubSystem>
200-
<OptimizeReferences>true</OptimizeReferences>
201-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
202-
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
203-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
204-
<TargetMachine>MachineX86</TargetMachine>
205-
<LargeAddressAware>true</LargeAddressAware>
206134
</Link>
207135
<PostBuildEvent>
208136
<Message>Copy AGS dll to output directory</Message>
@@ -211,35 +139,12 @@
211139
</ItemDefinitionGroup>
212140
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
213141
<ClCompile>
214-
<Optimization>MaxSpeed</Optimization>
215-
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
216-
<IntrinsicFunctions>true</IntrinsicFunctions>
217-
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
218-
<OmitFramePointers>true</OmitFramePointers>
219-
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
220-
<WholeProgramOptimization>true</WholeProgramOptimization>
221142
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
222143
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223-
<StringPooling>true</StringPooling>
224-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
225-
<BufferSecurityCheck>false</BufferSecurityCheck>
226-
<FunctionLevelLinking>false</FunctionLevelLinking>
227-
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
228-
<FloatingPointModel>Fast</FloatingPointModel>
229-
<RuntimeTypeInfo>true</RuntimeTypeInfo>
230-
<PrecompiledHeader>Use</PrecompiledHeader>
231-
<WarningLevel>Level4</WarningLevel>
232-
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
233144
</ClCompile>
234145
<Link>
235146
<AdditionalDependencies>d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
236147
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
237-
<SubSystem>Windows</SubSystem>
238-
<OptimizeReferences>true</OptimizeReferences>
239-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
240-
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
241-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
242-
<LargeAddressAware>true</LargeAddressAware>
243148
</Link>
244149
<PostBuildEvent>
245150
<Message>Copy AGS dll to output directory</Message>
@@ -248,32 +153,12 @@
248153
</ItemDefinitionGroup>
249154
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
250155
<ClCompile>
251-
<Optimization>Full</Optimization>
252-
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
253-
<IntrinsicFunctions>true</IntrinsicFunctions>
254-
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
255-
<OmitFramePointers>false</OmitFramePointers>
256-
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
257156
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
258157
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259-
<StringPooling>true</StringPooling>
260-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
261-
<BufferSecurityCheck>true</BufferSecurityCheck>
262-
<FunctionLevelLinking>false</FunctionLevelLinking>
263-
<FloatingPointModel>Fast</FloatingPointModel>
264-
<RuntimeTypeInfo>true</RuntimeTypeInfo>
265-
<PrecompiledHeader>Use</PrecompiledHeader>
266-
<WarningLevel>Level4</WarningLevel>
267-
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
268158
</ClCompile>
269159
<Link>
270160
<AdditionalDependencies>d3d9.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
271161
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
272-
<SubSystem>Windows</SubSystem>
273-
<LargeAddressAware>true</LargeAddressAware>
274-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
275-
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
276-
<TargetMachine>MachineX86</TargetMachine>
277162
</Link>
278163
<PostBuildEvent>
279164
<Message>Copy AGS dll to output directory</Message>
@@ -282,31 +167,12 @@
282167
</ItemDefinitionGroup>
283168
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
284169
<ClCompile>
285-
<Optimization>Full</Optimization>
286-
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
287-
<IntrinsicFunctions>true</IntrinsicFunctions>
288-
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
289-
<OmitFramePointers>false</OmitFramePointers>
290-
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
291170
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
292171
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
293-
<StringPooling>true</StringPooling>
294-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
295-
<BufferSecurityCheck>true</BufferSecurityCheck>
296-
<FunctionLevelLinking>false</FunctionLevelLinking>
297-
<FloatingPointModel>Fast</FloatingPointModel>
298-
<RuntimeTypeInfo>true</RuntimeTypeInfo>
299-
<PrecompiledHeader>Use</PrecompiledHeader>
300-
<WarningLevel>Level4</WarningLevel>
301-
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
302172
</ClCompile>
303173
<Link>
304174
<AdditionalDependencies>d3d9.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
305175
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;$(xrExternals)nvapi\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
306-
<SubSystem>Windows</SubSystem>
307-
<LargeAddressAware>true</LargeAddressAware>
308-
<RandomizedBaseAddress>false</RandomizedBaseAddress>
309-
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
310176
</Link>
311177
<PostBuildEvent>
312178
<Message>Copy AGS dll to output directory</Message>
@@ -601,36 +467,36 @@
601467
<Text Include="Pipeline.txt" />
602468
</ItemGroup>
603469
<ItemGroup>
470+
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
471+
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
472+
</ProjectReference>
604473
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
605474
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
606475
</ProjectReference>
607476
<ProjectReference Include="$(SolutionDir)xrParticles\xrParticles.vcxproj">
608477
<Project>{94a1c366-3d19-48e6-8170-4adc2e70df97}</Project>
609478
</ProjectReference>
479+
<ProjectReference Include="$(SolutionDir)xrScriptEngine\xrScriptEngine.vcxproj">
480+
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
481+
</ProjectReference>
610482
<ProjectReference Include="$(SolutionDir)Layers\xrAPI\xrAPI.vcxproj">
611483
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
612484
</ProjectReference>
485+
<ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
486+
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
487+
</ProjectReference>
488+
<ProjectReference Include="$(SolutionDir)xrCDB\xrCDB.vcxproj">
489+
<Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
490+
</ProjectReference>
613491
<ProjectReference Include="..\..\..\Externals\luabind\src\luabind.vcxproj">
614492
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
615493
</ProjectReference>
616-
<ProjectReference Include="..\..\..\Externals\luajit\src\luajit.vcxproj">
494+
<ProjectReference Include="..\..\..\Externals\LuaJIT\src\LuaJIT.vcxproj">
617495
<Project>{632aeeb6-dc06-4e15-9551-b2b09a4b73c5}</Project>
618496
</ProjectReference>
619497
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
620498
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
621499
</ProjectReference>
622-
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
623-
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
624-
</ProjectReference>
625-
<ProjectReference Include="..\..\xrCDB\xrCDB.vcxproj">
626-
<Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
627-
</ProjectReference>
628-
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
629-
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
630-
</ProjectReference>
631-
<ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
632-
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
633-
</ProjectReference>
634500
</ItemGroup>
635501
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
636502
<ImportGroup Label="ExtensionTargets">

0 commit comments

Comments
 (0)