Filesystem update.

2026-08-12 08:11:10 +02:00 · 2026-05-09 07:37:04 -07:00
parent 53dc4276d5
commit 8c4a087aa9
2076 changed files with 11142 additions and 87 deletions
@@ -6,24 +6,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{347D107C-D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "exes", "exes", "{003B01AB-152D-45C8-BF45-E5A035042D7F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dlls", "dlls", "{1E2B3940-65F8-4D8F-9EEE-85E94EBBC6DF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doom3", "doom3", "{1E2B3940-65F8-4D8F-9EEE-85E94EBBC6DF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "game.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57430}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "doom3\game.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57430}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idLib", "idlib.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57400}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idLib", "engine\idlib.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57400}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CurlLib", "curllib.vcxproj", "{F46F5D4E-C1D4-4ADE-9FAA-5F0CE3AA07F1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CurlLib", "engine\curllib.vcxproj", "{F46F5D4E-C1D4-4ADE-9FAA-5F0CE3AA07F1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DoomDLL", "doomdll.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57420}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DoomDLL", "engine\doomdll.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57420}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MayaImport", "MayaImport.vcxproj", "{49BEC5C6-B964-417A-851E-808886B574F1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MayaImport", "engine\MayaImport.vcxproj", "{49BEC5C6-B964-417A-851E-808886B574F1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl", "opengl\opengl.vcxproj", "{58320C19-5139-47C5-AAFE-4CAD2C8ED14D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl", "engine\opengl\opengl.vcxproj", "{58320C19-5139-47C5-AAFE-4CAD2C8ED14D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "preydlls", "preydlls", "{F65E2305-0208-4A25-BEB0-038C92484211}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PreyGame", "prey\PreyGame.vcxproj", "{6CD8E46D-E28E-493F-BB06-537A637A68C2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "engine", "engine", "{02A5F4CA-646E-404A-805D-2A538D5DF7C4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -100,6 +102,8 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{347D107C-D787-4408-A60D-86FA45997F9B} = {02A5F4CA-646E-404A-805D-2A538D5DF7C4}
+		{003B01AB-152D-45C8-BF45-E5A035042D7F} = {02A5F4CA-646E-404A-805D-2A538D5DF7C4}
 		{49BEC5C6-B964-417A-851E-808886B57430} = {1E2B3940-65F8-4D8F-9EEE-85E94EBBC6DF}
 		{49BEC5C6-B964-417A-851E-808886B57400} = {347D107C-D787-4408-A60D-86FA45997F9B}
 		{F46F5D4E-C1D4-4ADE-9FAA-5F0CE3AA07F1} = {347D107C-D787-4408-A60D-86FA45997F9B}
@@ -93,58 +93,58 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Dedicated Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Dedicated.props" />
-    <Import Project="_Release.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Dedicated.props" />
+    <Import Project="..\engine\_Release.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Dedicated Debug with inlines|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Dedicated.props" />
-    <Import Project="_Debug.props" />
-    <Import Project="_WithInlines.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Dedicated.props" />
+    <Import Project="..\engine\_Debug.props" />
+    <Import Project="..\engine\_WithInlines.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Dedicated Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Dedicated.props" />
-    <Import Project="_Debug.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Dedicated.props" />
+    <Import Project="..\engine\_Debug.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug with inlines and memory log|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Debug.props" />
-    <Import Project="_WithInlines.props" />
-    <Import Project="_WithMemoryLog.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Debug.props" />
+    <Import Project="..\engine\_WithInlines.props" />
+    <Import Project="..\engine\_WithMemoryLog.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Debug.props" />
-    <Import Project="_WithInlines.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Debug.props" />
+    <Import Project="..\engine\_WithInlines.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Release.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Release.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Debug.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Debug.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="_Common.props" />
-    <Import Project="_Game.props" />
-    <Import Project="_Debug.props" />
+    <Import Project="..\engine\_Common.props" />
+    <Import Project="..\engine\_Game.props" />
+    <Import Project="..\engine\_Debug.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
@@ -180,7 +180,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
    </Link>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -195,7 +195,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
    </Link>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -210,7 +210,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
    </Link>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -225,7 +225,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
    </Link>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -240,7 +240,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
    </Link>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -255,7 +255,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
    </Link>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -270,7 +270,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
    </Link>
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -285,7 +285,7 @@
      </Command>
    </PreBuildEvent>
    <Link>
-      <OutputFile>../gamex64.dll</OutputFile>
+      <OutputFile>../../base/gamex64.dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
    <ClCompile>
@@ -364,7 +364,7 @@
    <ClCompile Include="game\Trigger.cpp" />
    <ClCompile Include="game\Weapon.cpp" />
    <ClCompile Include="game\WorldSpawn.cpp" />
-    <ClCompile Include="idlib\precompiled.cpp">
+    <ClCompile Include="..\engine\idlib\precompiled.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Prey Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|x64'">Create</PrecompiledHeader>
@@ -438,15 +438,14 @@
    <ClInclude Include="game\Trigger.h" />
    <ClInclude Include="game\Weapon.h" />
    <ClInclude Include="game\WorldSpawn.h" />
-    <ClInclude Include="idlib\precompiled.h" />
+    <ClInclude Include="..\engine\idlib\precompiled.h" />
  </ItemGroup>
  <ItemGroup>
    <None Include="game\Game.def" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="idlib.vcxproj">
+    <ProjectReference Include="..\engine\idlib.vcxproj">
      <Project>{49bec5c6-b964-417a-851e-808886b57400}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -164,7 +164,7 @@
    <ClCompile Include="game\Trigger.cpp" />
    <ClCompile Include="game\Weapon.cpp" />
    <ClCompile Include="game\WorldSpawn.cpp" />
-    <ClCompile Include="idlib\precompiled.cpp" />
+    <ClCompile Include="..\engine\idlib\precompiled.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="game\ai\AAS.h">
@@ -295,7 +295,7 @@
    <ClInclude Include="game\Trigger.h" />
    <ClInclude Include="game\Weapon.h" />
    <ClInclude Include="game\WorldSpawn.h" />
-    <ClInclude Include="idlib\precompiled.h" />
+    <ClInclude Include="..\engine\idlib\precompiled.h" />
  </ItemGroup>
  <ItemGroup>
    <None Include="game\Game.def" />
@@ -30,7 +30,7 @@ If you have questions concerning this license or the applicable additional terms
 #pragma hdrstop

 #include "../Game_local.h"
-#include "../../MayaImport/maya_main.h"
+#include "../../../engine/MayaImport/maya_main.h"

 /***********************************************************************

--- a/Show More
+++ b/Show More