Move manifest from xrEngine to xr_3da

Change some references paths to relative ones
OpenXRay · Feb 10, 2018 · 121fe21 · 121fe21
1 parent 59088a6
commit 121fe21
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 36 deletions.
diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj
@@ -83,9 +83,6 @@
  <Link>
  <AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
- <Manifest>
- <AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
- </Manifest>
  <CustomBuildStep>
  <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>
  <Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -101,9 +98,6 @@
  <Link>
  <AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
- <Manifest>
- <AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
- </Manifest>
  <CustomBuildStep>
  <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>
  <Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -119,9 +113,6 @@
  <Link>
  <AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
- <Manifest>
- <AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
- </Manifest>
  <CustomBuildStep>
  <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>
  <Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -137,9 +128,6 @@
  <Link>
  <AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
- <Manifest>
- <AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
- </Manifest>
  <CustomBuildStep>
  <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>
  <Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -156,9 +144,6 @@
  <Link>
  <AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
- <Manifest>
- <AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
- </Manifest>
  <CustomBuildStep>
  <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>
  <Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -174,9 +159,6 @@
  <Link>
  <AdditionalDependencies>vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
- <Manifest>
- <AdditionalManifestFiles>as-invoker-manifest-part.xml;%(AdditionalManifestFiles)</AdditionalManifestFiles>
- </Manifest>
  <CustomBuildStep>
  <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>
  <Outputs>$(OutDir)amd_ags_$(PlatformShortName).dll;%(Outputs)</Outputs>
@@ -413,48 +395,48 @@
  <Text Include="TODO.txt" />
  </ItemGroup>
  <ItemGroup>
- <ProjectReference Include="$(xrExternals)openal\OpenAL-Windows\Router\Router.vcxproj">
+ <ProjectReference Include="..\..\Externals\openal\OpenAL-Windows\Router\Router.vcxproj">
  <Project>{566551f4-4ef1-4cb4-a131-f982e7606907}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)Layers\xrAPI\xrAPI.vcxproj">
+ <ProjectReference Include="..\..\Externals\luabind.vcxproj">
+ <Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\Layers\xrAPI\xrAPI.vcxproj">
  <Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)xrNetServer\xrNetServer.vcxproj">
+ <ProjectReference Include="..\xrNetServer\xrNetServer.vcxproj">
  <Project>{435bac9a-b225-457d-ab40-c9bd0cc8838c}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)xrSound\xrSound.vcxproj">
+ <ProjectReference Include="..\xrSound\xrSound.vcxproj">
  <Project>{ccca7859-eb86-493e-9b53-c4235f45b3c5}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)xrScriptEngine\xrScriptEngine.vcxproj">
+ <ProjectReference Include="..\xrScriptEngine\xrScriptEngine.vcxproj">
  <Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
  </ProjectReference>
- <ProjectReference Include="$(xrExternals)libogg_static.vcxproj">
+ <ProjectReference Include="..\..\Externals\libogg_static.vcxproj">
  <Project>{15cbfeff-7965-41f5-b4e2-21e8795c9159}</Project>
  </ProjectReference>
- <ProjectReference Include="$(xrExternals)libtheora_static.vcxproj">
+ <ProjectReference Include="..\..\Externals\libtheora_static.vcxproj">
  <Project>{653f3841-3f26-49b9-afcf-091db4b67031}</Project>
  </ProjectReference>
- <ProjectReference Include="$(xrExternals)LuaJIT\src\LuaJIT.vcxproj">
+ <ProjectReference Include="..\..\Externals\LuaJIT\src\LuaJIT.vcxproj">
  <Project>{632aeeb6-dc06-4e15-9551-b2b09a4b73c5}</Project>
  </ProjectReference>
- <ProjectReference Include="$(xrExternals)oalib.vcxproj">
+ <ProjectReference Include="..\..\Externals\oalib.vcxproj">
  <Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
+ <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
  <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)xrCDB\xrCDB.vcxproj">
+ <ProjectReference Include="..\xrCDB\xrCDB.vcxproj">
  <Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
+ <ProjectReference Include="..\xrCore\xrCore.vcxproj">
  <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)xrPhysics\xrPhysics.vcxproj">
+ <ProjectReference Include="..\xrPhysics\xrPhysics.vcxproj">
  <Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
  </ProjectReference>
- <ProjectReference Include="$(xrExternals)luabind.vcxproj">
- <Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
- </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">

diff --git a/src/xrEngine/as-invoker-manifest-part.xml → src/xr_3da/as-invoker-manifest-part.xml b/src/xrEngine/as-invoker-manifest-part.xml → src/xr_3da/as-invoker-manifest-part.xml
diff --git a/src/xr_3da/xr_3da.vcxproj b/src/xr_3da/xr_3da.vcxproj
@@ -94,6 +94,9 @@
  <Link>
  <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
  </Link>
+ <Manifest>
+ <AdditionalManifestFiles>as-invoker-manifest-part.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
  </ItemDefinitionGroup>
  <ItemGroup>
  <ClCompile Include="entry_point.cpp" />
@@ -102,10 +105,10 @@
  </ClCompile>
  </ItemGroup>
  <ItemGroup>
- <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
+ <ProjectReference Include="..\xrCore\xrCore.vcxproj">
  <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
  </ProjectReference>
- <ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
+ <ProjectReference Include="..\xrEngine\xrEngine.vcxproj">
  <Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
  </ProjectReference>
  <ProjectReference Include="..\Layers\xrAPI\xrAPI.vcxproj">