Skip to content

Commit 121fe21

Browse files
Xottab-DUTYXottab-DUTY
committed
Move manifest from xrEngine to xr_3da
Change some references paths to relative ones
1 parent 59088a6 commit 121fe21

File tree

3 files changed

+21
-36
lines changed

3 files changed

+21
-36
lines changed

‎src/xrEngine/xrEngine.vcxproj

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@
8383
<Link>
8484
<AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
8585
</Link>
86-
<Manifest>
87-
<AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
88-
</Manifest>
8986
<CustomBuildStep>
9087
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
9188
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -101,9 +98,6 @@
10198
<Link>
10299
<AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
103100
</Link>
104-
<Manifest>
105-
<AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
106-
</Manifest>
107101
<CustomBuildStep>
108102
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
109103
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -119,9 +113,6 @@
119113
<Link>
120114
<AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
121115
</Link>
122-
<Manifest>
123-
<AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
124-
</Manifest>
125116
<CustomBuildStep>
126117
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
127118
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -137,9 +128,6 @@
137128
<Link>
138129
<AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
139130
</Link>
140-
<Manifest>
141-
<AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
142-
</Manifest>
143131
<CustomBuildStep>
144132
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
145133
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -156,9 +144,6 @@
156144
<Link>
157145
<AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
158146
</Link>
159-
<Manifest>
160-
<AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
161-
</Manifest>
162147
<CustomBuildStep>
163148
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
164149
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -174,9 +159,6 @@
174159
<Link>
175160
<AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
176161
</Link>
177-
<Manifest>
178-
<AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
179-
</Manifest>
180162
<CustomBuildStep>
181163
<Command>if not exist "$(OutDir)amd_ags_$(PlatformShortName).dll" copy /y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
182164
<Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -413,48 +395,48 @@
413395
<Text Include="TODO.txt" />
414396
</ItemGroup>
415397
<ItemGroup>
416-
<ProjectReference Include="$(xrExternals)openal\OpenAL-Windows\Router\Router.vcxproj">
398+
<ProjectReference Include="..\..\Externals\openal\OpenAL-Windows\Router\Router.vcxproj">
417399
<Project>{566551f4-4ef1-4cb4-a131-f982e7606907}</Project>
418400
</ProjectReference>
419-
<ProjectReference Include="$(SolutionDir)Layers\xrAPI\xrAPI.vcxproj">
401+
<ProjectReference Include="..\..\Externals\luabind.vcxproj">
402+
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
403+
</ProjectReference>
404+
<ProjectReference Include="..\Layers\xrAPI\xrAPI.vcxproj">
420405
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
421406
</ProjectReference>
422-
<ProjectReference Include="$(SolutionDir)xrNetServer\xrNetServer.vcxproj">
407+
<ProjectReference Include="..\xrNetServer\xrNetServer.vcxproj">
423408
<Project>{435bac9a-b225-457d-ab40-c9bd0cc8838c}</Project>
424409
</ProjectReference>
425-
<ProjectReference Include="$(SolutionDir)xrSound\xrSound.vcxproj">
410+
<ProjectReference Include="..\xrSound\xrSound.vcxproj">
426411
<Project>{ccca7859-eb86-493e-9b53-c4235f45b3c5}</Project>
427412
</ProjectReference>
428-
<ProjectReference Include="$(SolutionDir)xrScriptEngine\xrScriptEngine.vcxproj">
413+
<ProjectReference Include="..\xrScriptEngine\xrScriptEngine.vcxproj">
429414
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
430415
</ProjectReference>
431-
<ProjectReference Include="$(xrExternals)libogg_static.vcxproj">
416+
<ProjectReference Include="..\..\Externals\libogg_static.vcxproj">
432417
<Project>{15cbfeff-7965-41f5-b4e2-21e8795c9159}</Project>
433418
</ProjectReference>
434-
<ProjectReference Include="$(xrExternals)libtheora_static.vcxproj">
419+
<ProjectReference Include="..\..\Externals\libtheora_static.vcxproj">
435420
<Project>{653f3841-3f26-49b9-afcf-091db4b67031}</Project>
436421
</ProjectReference>
437-
<ProjectReference Include="$(xrExternals)LuaJIT\src\LuaJIT.vcxproj">
422+
<ProjectReference Include="..\..\Externals\LuaJIT\src\LuaJIT.vcxproj">
438423
<Project>{632aeeb6-dc06-4e15-9551-b2b09a4b73c5}</Project>
439424
</ProjectReference>
440-
<ProjectReference Include="$(xrExternals)oalib.vcxproj">
425+
<ProjectReference Include="..\..\Externals\oalib.vcxproj">
441426
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
442427
</ProjectReference>
443-
<ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
428+
<ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
444429
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
445430
</ProjectReference>
446-
<ProjectReference Include="$(SolutionDir)xrCDB\xrCDB.vcxproj">
431+
<ProjectReference Include="..\xrCDB\xrCDB.vcxproj">
447432
<Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
448433
</ProjectReference>
449-
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
434+
<ProjectReference Include="..\xrCore\xrCore.vcxproj">
450435
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
451436
</ProjectReference>
452-
<ProjectReference Include="$(SolutionDir)xrPhysics\xrPhysics.vcxproj">
437+
<ProjectReference Include="..\xrPhysics\xrPhysics.vcxproj">
453438
<Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
454439
</ProjectReference>
455-
<ProjectReference Include="$(xrExternals)luabind.vcxproj">
456-
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
457-
</ProjectReference>
458440
</ItemGroup>
459441
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
460442
<ImportGroup Label="ExtensionTargets">

‎src/xrEngine/as-invoker-manifest-part.xml renamed to ‎src/xr_3da/as-invoker-manifest-part.xml

File renamed without changes.

‎src/xr_3da/xr_3da.vcxproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
<Link>
9595
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
9696
</Link>
97+
<Manifest>
98+
<AdditionalManifestFiles>as-invoker-manifest-part.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
99+
</Manifest>
97100
</ItemDefinitionGroup>
98101
<ItemGroup>
99102
<ClCompile Include="entry_point.cpp" />
@@ -102,10 +105,10 @@
102105
</ClCompile>
103106
</ItemGroup>
104107
<ItemGroup>
105-
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
108+
<ProjectReference Include="..\xrCore\xrCore.vcxproj">
106109
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
107110
</ProjectReference>
108-
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
111+
<ProjectReference Include="..\xrEngine\xrEngine.vcxproj">
109112
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
110113
</ProjectReference>
111114
<ProjectReference Include="..\Layers\xrAPI\xrAPI.vcxproj">

0 commit comments

Comments
 (0)