Merge branch 'master' of https://github.com/gabengaGamer/area51-pc

gabengaGamer · Oct 18, 2024 · 801ef37 · 801ef37
2 parents af91f4b + 5361258
commit 801ef37
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 2,957 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,6 @@
 # Compiled Dynamic libraries
 *.so
 *.dylib
-*.dll
 
 # Fortran module files
 *.mod

diff --git a/Apps/GameApp/A51-PS2-Disk-Config.ccz b/Apps/GameApp/A51-PS2-Disk-Config.ccz
diff --git a/Apps/GameApp/A51.vcproj b/Apps/GameApp/A51.vcproj
@@ -1224,72 +1224,12 @@
 		<File
 			RelativePath=".\main_pc.inl">
 		</File>
-		<File
-			RelativePath=".\main_ps2.inl">
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="OptDebug|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="QA|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Retail|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath=".\main_xbox.inl">
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="OptDebug|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="QA|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Retail|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\Support\NetworkMgr\GameSpy\qr2\qr2.c">
-		</File>
-		<File
-			RelativePath="..\..\Support\NetworkMgr\GameSpy\qr2\qr2regkeys.c">
 		</File>
 		<File
 			RelativePath=".\rtf_handler.cpp">
 		</File>
-		<File
-			RelativePath="..\..\Support\NetworkMgr\GameSpy\serverbrowsing\sb_serverbrowsing.c">
-		</File>
 		<File
 			RelativePath=".\Version.cpp">
 		</File>

diff --git a/Apps/GameApp/A51.vcproj.vspscc_ b/Apps/GameApp/A51.vcproj.vspscc_
diff --git a/Apps/GameApp/A51.vcxproj b/Apps/GameApp/A51.vcxproj
diff --git a/Apps/GameApp/A51.vcxproj.filters b/Apps/GameApp/A51.vcxproj.filters
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
     # Compiled Dynamic libraries
     *.so
     *.dylib
-    *.dll
     # Fortran module files
     *.mod
@@ Expand Down @@