Commit MetaInfo

Révisionb56b00e954431cd5ac0e193c5bb279a02a806eec (tree)
l'heure2019-11-07 05:07:36
Auteur <Kuddel@c0f5...>

Message de Log

Branch/Trunk unification attempt
- Checked Visual Studio 2015 builds.

Change Summary

Modification

diff -r 0d47cde6ac3d -r b56b00e95443 Orbitersdk/D3D9Client/D3D9ClientVS2015.vcxproj
--- a/Orbitersdk/D3D9Client/D3D9ClientVS2015.vcxproj Wed Nov 06 17:27:28 2019 +0000
+++ b/Orbitersdk/D3D9Client/D3D9ClientVS2015.vcxproj Wed Nov 06 20:07:36 2019 +0000
@@ -1,4 +1,4 @@
1-<?xml version="1.0" encoding="utf-8"?>
1+<?xml version="1.0" encoding="utf-8"?>
22 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <ItemGroup Label="ProjectConfigurations">
44 <ProjectConfiguration Include="Debug|Win32">
@@ -95,7 +95,7 @@
9595 <AdditionalDependencies>orbiter.lib;orbitersdk.lib;d3d9.lib;d3dx9.lib;psapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
9696 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
9797 <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SDKLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
98- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
98+ <IgnoreSpecificDefaultLibraries>MSVCRT</IgnoreSpecificDefaultLibraries>
9999 <GenerateDebugInformation>true</GenerateDebugInformation>
100100 <ProgramDatabaseFile>$(Configuration)\$(TargetName).pdb</ProgramDatabaseFile>
101101 <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -156,8 +156,7 @@
156156 <AdditionalDependencies>orbiter.lib;orbitersdk.lib;d3d9.lib;d3dx9.lib;psapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
157157 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
158158 <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SDKLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
159- <IgnoreSpecificDefaultLibraries>
160- </IgnoreSpecificDefaultLibraries>
159+ <IgnoreSpecificDefaultLibraries>MSVCRT</IgnoreSpecificDefaultLibraries>
161160 <RandomizedBaseAddress>false</RandomizedBaseAddress>
162161 <DataExecutionPrevention>
163162 </DataExecutionPrevention>
diff -r 0d47cde6ac3d -r b56b00e95443 Orbitersdk/D3D9Client/D3D9ClientVS2015.vcxproj.filters
--- a/Orbitersdk/D3D9Client/D3D9ClientVS2015.vcxproj.filters Wed Nov 06 17:27:28 2019 +0000
+++ b/Orbitersdk/D3D9Client/D3D9ClientVS2015.vcxproj.filters Wed Nov 06 20:07:36 2019 +0000
@@ -1,4 +1,4 @@
1-<?xml version="1.0" encoding="utf-8"?>
1+<?xml version="1.0" encoding="utf-8"?>
22 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <ItemGroup>
44 <Filter Include="Source Files">
@@ -169,23 +169,23 @@
169169 </ClCompile>
170170 </ItemGroup>
171171 <ItemGroup>
172- <ClInclude Include="$(SrcSdkIncludeDir)\gcAPI.h">
173- <Filter>Externals</Filter>
174- </ClInclude>
175- <ClInclude Include="$(SrcSdkIncludeDir)\gcConst.h">
176- <Filter>Externals</Filter>
172+ <ClInclude Include="$(SDKIncludeDir)\gcAPI.h">
173+ <Filter>Header Files</Filter>
177174 </ClInclude>
178- <ClInclude Include="$(SrcSdkIncludeDir)\GraphicsAPI.h">
179- <Filter>Externals</Filter>
175+ <ClInclude Include="$(SDKIncludeDir)\gcConst.h">
176+ <Filter>Header Files</Filter>
180177 </ClInclude>
181- <ClInclude Include="$(SrcSdkIncludeDir)\OrbiterAPI.h">
182- <Filter>Externals</Filter>
178+ <ClInclude Include="$(SDKIncludeDir)\GraphicsAPI.h">
179+ <Filter>Header Files</Filter>
183180 </ClInclude>
184- <ClInclude Include="$(SrcSdkIncludeDir)\Orbitersdk.h">
185- <Filter>Externals</Filter>
181+ <ClInclude Include="$(SDKIncludeDir)\OrbiterAPI.h">
182+ <Filter>Header Files</Filter>
186183 </ClInclude>
187- <ClInclude Include="$(SrcSdkIncludeDir)\Sketchpad2.h">
188- <Filter>Externals</Filter>
184+ <ClInclude Include="$(SDKIncludeDir)\Orbitersdk.h">
185+ <Filter>Header Files</Filter>
186+ </ClInclude>
187+ <ClInclude Include="$(SDKIncludeDir)\Sketchpad2.h">
188+ <Filter>Header Files</Filter>
189189 </ClInclude>
190190 </ItemGroup>
191191 <ItemGroup>
@@ -335,55 +335,55 @@
335335 </ClInclude>
336336 </ItemGroup>
337337 <ItemGroup>
338- <None Include="$(BuildModuleDir)\D3D9Client\BeaconArray.fx">
339- <Filter>Shaders</Filter>
340- </None>
341- <None Include="$(BuildModuleDir)\D3D9Client\CKBlit.fx">
342- <Filter>Shaders</Filter>
343- </None>
344- <None Include="$(BuildModuleDir)\D3D9Client\D3D9Client.fx">
345- <Filter>Shaders</Filter>
346- </None>
347- <None Include="$(BuildModuleDir)\D3D9Client\HorizonHaze.fx">
348- <Filter>Shaders</Filter>
349- </None>
350- <None Include="$(BuildModuleDir)\D3D9Client\Mesh.fx">
351- <Filter>Shaders</Filter>
352- </None>
353- <None Include="$(BuildModuleDir)\D3D9Client\PBR.fx">
354- <Filter>Shaders</Filter>
355- </None>
356- <None Include="$(BuildModuleDir)\D3D9Client\Particle.fx">
357- <Filter>Shaders</Filter>
358- </None>
359- <None Include="$(BuildModuleDir)\D3D9Client\Planet.fx">
338+ <None Include="$(ModuleDir)\D3D9Client\BeaconArray.fx">
360339 <Filter>Shaders</Filter>
361340 </None>
362- <None Include="$(BuildModuleDir)\D3D9Client\SceneTech.fx">
363- <Filter>Shaders</Filter>
364- </None>
365- <None Include="$(BuildModuleDir)\D3D9Client\Sketchpad.fx">
366- <Filter>Shaders</Filter>
367- </None>
368- <None Include="$(BuildModuleDir)\D3D9Client\Surface.fx">
369- <Filter>Shaders</Filter>
370- </None>
371- <None Include="$(BuildModuleDir)\D3D9Client\Vessel.fx">
341+ <None Include="$(ModuleDir)\D3D9Client\CKBlit.fx">
372342 <Filter>Shaders</Filter>
373343 </None>
374- <None Include="$(BuildModuleDir)\D3D9Client\Common.hlsl">
375- <Filter>Shaders</Filter>
376- </None>
377- <None Include="$(BuildModuleDir)\D3D9Client\EnvMapBlur.hlsl">
344+ <None Include="$(ModuleDir)\D3D9Client\D3D9Client.fx">
378345 <Filter>Shaders</Filter>
379346 </None>
380- <None Include="$(BuildModuleDir)\D3D9Client\IPI.hlsl">
347+ <None Include="$(ModuleDir)\D3D9Client\HorizonHaze.fx">
381348 <Filter>Shaders</Filter>
382349 </None>
383- <None Include="$(BuildModuleDir)\D3D9Client\LensFlare.hlsl">
350+ <None Include="$(ModuleDir)\D3D9Client\Mesh.fx">
384351 <Filter>Shaders</Filter>
385352 </None>
386- <None Include="$(BuildModuleDir)\D3D9Client\LightBlur.hlsl">
353+ <None Include="$(ModuleDir)\D3D9Client\PBR.fx">
354+ <Filter>Shaders</Filter>
355+ </None>
356+ <None Include="$(ModuleDir)\D3D9Client\Particle.fx">
357+ <Filter>Shaders</Filter>
358+ </None>
359+ <None Include="$(ModuleDir)\D3D9Client\Planet.fx">
360+ <Filter>Shaders</Filter>
361+ </None>
362+ <None Include="$(ModuleDir)\D3D9Client\SceneTech.fx">
363+ <Filter>Shaders</Filter>
364+ </None>
365+ <None Include="$(ModuleDir)\D3D9Client\Sketchpad.fx">
366+ <Filter>Shaders</Filter>
367+ </None>
368+ <None Include="$(ModuleDir)\D3D9Client\Surface.fx">
369+ <Filter>Shaders</Filter>
370+ </None>
371+ <None Include="$(ModuleDir)\D3D9Client\Vessel.fx">
372+ <Filter>Shaders</Filter>
373+ </None>
374+ <None Include="$(ModuleDir)\D3D9Client\Common.hlsl">
375+ <Filter>Shaders</Filter>
376+ </None>
377+ <None Include="$(ModuleDir)\D3D9Client\EnvMapBlur.hlsl">
378+ <Filter>Shaders</Filter>
379+ </None>
380+ <None Include="$(ModuleDir)\D3D9Client\IPI.hlsl">
381+ <Filter>Shaders</Filter>
382+ </None>
383+ <None Include="$(ModuleDir)\D3D9Client\LensFlare.hlsl">
384+ <Filter>Shaders</Filter>
385+ </None>
386+ <None Include="$(ModuleDir)\D3D9Client\LightBlur.hlsl">
387387 <Filter>Shaders</Filter>
388388 </None>
389389 </ItemGroup>
Afficher sur ancien navigateur de dépôt.