Skip to content

Commit b29b6c0

Browse files
intorrintorr
committed
Project dependency fixes. Some vcxproj files cleanup. Dependency xrEngine.lib did not work.
1 parent 56e8db8 commit b29b6c0

36 files changed

+50
-119
lines changed

‎Externals/oalib.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
7878
<PrecompiledHeader />
7979
<WarningLevel>Level3</WarningLevel>
80-
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
8180
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8281
</ClCompile>
8382
</ItemDefinitionGroup>
@@ -92,7 +91,6 @@
9291
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9392
<PrecompiledHeader />
9493
<WarningLevel>Level3</WarningLevel>
95-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
9694
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9795
</ClCompile>
9896
</ItemDefinitionGroup>
@@ -101,7 +99,6 @@
10199
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102100
<PrecompiledHeader />
103101
<WarningLevel>Level3</WarningLevel>
104-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
105102
</ClCompile>
106103
</ItemDefinitionGroup>
107104
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -112,7 +109,6 @@
112109
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113110
<PrecompiledHeader />
114111
<WarningLevel>Level3</WarningLevel>
115-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
116112
</ClCompile>
117113
</ItemDefinitionGroup>
118114
<ItemGroup>

‎Externals/ode/contrib/msvc7/ode_default/default.vcxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,32 +103,26 @@
103103
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
104104
</PropertyGroup>
105105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
106-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
107106
<LinkIncremental>false</LinkIncremental>
108107
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
109108
</PropertyGroup>
110109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
112110
<LinkIncremental>false</LinkIncremental>
113111
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
114112
</PropertyGroup>
115113
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
116-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
117114
<LinkIncremental>false</LinkIncremental>
118115
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
119116
</PropertyGroup>
120117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
122118
<LinkIncremental>false</LinkIncremental>
123119
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
124120
</PropertyGroup>
125121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
126-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
127122
<LinkIncremental>false</LinkIncremental>
128123
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
129124
</PropertyGroup>
130125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
131-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
132126
<LinkIncremental>false</LinkIncremental>
133127
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
134128
</PropertyGroup>

‎src/Layers/xrRenderPC_R1/xrRender_R1.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "Layers/xrRender/dxDebugRender.h"
55

66
#pragma comment(lib, "xrEngine.lib")
7-
#pragma comment(lib, "xrScriptEngine.lib")
87

98
extern "C" void XR_EXPORT SetupEnv()
109
{

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@
9696
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9797
</PropertyGroup>
9898
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
99-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
10099
<LinkIncremental>true</LinkIncremental>
101100
</PropertyGroup>
102101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
103-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
104102
<LinkIncremental>true</LinkIncremental>
105103
</PropertyGroup>
106104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -605,15 +603,12 @@
605603
<ItemGroup>
606604
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
607605
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
608-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
609606
</ProjectReference>
610607
<ProjectReference Include="$(SolutionDir)xrParticles\xrParticles.vcxproj">
611608
<Project>{94a1c366-3d19-48e6-8170-4adc2e70df97}</Project>
612-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
613609
</ProjectReference>
614610
<ProjectReference Include="$(SolutionDir)Layers\xrAPI\xrAPI.vcxproj">
615611
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
616-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
617612
</ProjectReference>
618613
<ProjectReference Include="..\..\..\Externals\luabind\src\luabind.vcxproj">
619614
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
@@ -627,10 +622,14 @@
627622
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
628623
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
629624
</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>
630631
<ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
631632
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
632-
<Private>true</Private>
633-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
634633
</ProjectReference>
635634
</ItemGroup>
636635
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎src/Layers/xrRenderPC_R2/xrRender_R2.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "Layers/xrRender/dxDebugRender.h"
77

88
#pragma comment(lib, "xrEngine.lib")
9-
#pragma comment(lib, "xrScriptEngine.lib")
109

1110
extern "C" void XR_EXPORT SetupEnv()
1211
{

‎src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@
9696
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9797
</PropertyGroup>
9898
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
99-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
10099
<LinkIncremental>true</LinkIncremental>
101100
</PropertyGroup>
102101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
103-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
104102
<LinkIncremental>true</LinkIncremental>
105103
</PropertyGroup>
106104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -646,15 +644,12 @@
646644
<ItemGroup>
647645
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
648646
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
649-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
650647
</ProjectReference>
651648
<ProjectReference Include="$(SolutionDir)xrParticles\xrParticles.vcxproj">
652649
<Project>{94a1c366-3d19-48e6-8170-4adc2e70df97}</Project>
653-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
654650
</ProjectReference>
655651
<ProjectReference Include="$(SolutionDir)Layers\xrAPI\xrAPI.vcxproj">
656652
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
657-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
658653
</ProjectReference>
659654
<ProjectReference Include="..\..\..\Externals\luabind\src\luabind.vcxproj">
660655
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
@@ -668,6 +663,12 @@
668663
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
669664
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
670665
</ProjectReference>
666+
<ProjectReference Include="..\..\xrCDB\xrCDB.vcxproj">
667+
<Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
668+
</ProjectReference>
669+
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
670+
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
671+
</ProjectReference>
671672
<ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
672673
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
673674
</ProjectReference>

‎src/Layers/xrRenderPC_R3/xrRender_R3.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "Layers/xrRender/dxDebugRender.h"
77

88
#pragma comment(lib, "xrEngine.lib")
9-
#pragma comment(lib, "xrScriptEngine.lib")
109

1110
extern "C" void XR_EXPORT SetupEnv()
1211
{

‎src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@
9696
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9797
</PropertyGroup>
9898
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
99-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
10099
<LinkIncremental>true</LinkIncremental>
101100
</PropertyGroup>
102101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
103-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
104102
<LinkIncremental>true</LinkIncremental>
105103
</PropertyGroup>
106104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -694,15 +692,12 @@
694692
<ItemGroup>
695693
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
696694
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
697-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
698695
</ProjectReference>
699696
<ProjectReference Include="$(SolutionDir)xrParticles\xrParticles.vcxproj">
700697
<Project>{94a1c366-3d19-48e6-8170-4adc2e70df97}</Project>
701-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
702698
</ProjectReference>
703699
<ProjectReference Include="$(SolutionDir)Layers\xrAPI\xrAPI.vcxproj">
704700
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
705-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
706701
</ProjectReference>
707702
<ProjectReference Include="..\..\..\Externals\luabind\src\luabind.vcxproj">
708703
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
@@ -716,6 +711,12 @@
716711
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
717712
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
718713
</ProjectReference>
714+
<ProjectReference Include="..\..\xrCDB\xrCDB.vcxproj">
715+
<Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
716+
</ProjectReference>
717+
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
718+
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
719+
</ProjectReference>
719720
<ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
720721
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
721722
</ProjectReference>

‎src/Layers/xrRenderPC_R4/xrRender_R4.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "Layers/xrRender/dxDebugRender.h"
77

88
#pragma comment(lib, "xrEngine.lib")
9-
#pragma comment(lib, "xrScriptEngine.lib")
109

1110
extern "C" void XR_EXPORT SetupEnv()
1211
{

‎src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@
9696
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9797
</PropertyGroup>
9898
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
99-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
10099
<LinkIncremental>true</LinkIncremental>
101100
</PropertyGroup>
102101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
103-
<IgnoreImportLibrary>true</IgnoreImportLibrary>
104102
<LinkIncremental>true</LinkIncremental>
105103
</PropertyGroup>
106104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -705,7 +703,6 @@
705703
<ItemGroup>
706704
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
707705
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
708-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
709706
</ProjectReference>
710707
<ProjectReference Include="..\..\..\Externals\luabind\src\luabind.vcxproj">
711708
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
@@ -719,6 +716,9 @@
719716
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
720717
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
721718
</ProjectReference>
719+
<ProjectReference Include="..\..\xrCDB\xrCDB.vcxproj">
720+
<Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
721+
</ProjectReference>
722722
<ProjectReference Include="..\..\xrEngine\xrEngine.vcxproj">
723723
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
724724
</ProjectReference>

0 commit comments

Comments
 (0)