Visplanes should be stable now. Added server project to MSVC. Removed…

… OPL and libwince. Ported zone memory rewrite from PrBoom. Minor r_bsp and r_plane changes.
Slipyx · Feb 2, 2012 · fdaa46e · fdaa46e
1 parent 3bee08d
commit fdaa46e
Show file tree

Hide file tree

Showing 54 changed files with 472 additions and 7,827 deletions.
diff --git a/README.OPL b/README.OPL
diff --git a/msvc/MintDoom.sln b/msvc/MintDoom.sln
@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopl", "libopl.vcxproj", "{6F6542FF-D2ED-48E9-8EE3-1219183AA1ED}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcsound", "libpcsound.vcxproj", "{9ABE2881-4D98-467E-9C52-12B63D83011F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtextscreen", "libtextscreen.vcxproj", "{E0C4BA33-26D7-4E5E-B730-E89E0AB9DA90}"
@@ -16,19 +14,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doom", "doom.vcxproj", "{38
 	ProjectSection(ProjectDependencies) = postProject
 		{E0C4BA33-26D7-4E5E-B730-E89E0AB9DA90} = {E0C4BA33-26D7-4E5E-B730-E89E0AB9DA90}
 		{9ABE2881-4D98-467E-9C52-12B63D83011F} = {9ABE2881-4D98-467E-9C52-12B63D83011F}
-		{6F6542FF-D2ED-48E9-8EE3-1219183AA1ED} = {6F6542FF-D2ED-48E9-8EE3-1219183AA1ED}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", "{3FBED9B4-A50B-4D25-B465-6AE226AAB203}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6F6542FF-D2ED-48E9-8EE3-1219183AA1ED}.Debug|Win32.ActiveCfg = Release|Win32
-		{6F6542FF-D2ED-48E9-8EE3-1219183AA1ED}.Debug|Win32.Build.0 = Release|Win32
-		{6F6542FF-D2ED-48E9-8EE3-1219183AA1ED}.Release|Win32.ActiveCfg = Release|Win32
-		{6F6542FF-D2ED-48E9-8EE3-1219183AA1ED}.Release|Win32.Build.0 = Release|Win32
 		{9ABE2881-4D98-467E-9C52-12B63D83011F}.Debug|Win32.ActiveCfg = Release|Win32
 		{9ABE2881-4D98-467E-9C52-12B63D83011F}.Debug|Win32.Build.0 = Release|Win32
 		{9ABE2881-4D98-467E-9C52-12B63D83011F}.Release|Win32.ActiveCfg = Release|Win32
@@ -45,6 +40,10 @@ Global
 		{38A9F56A-8F3E-40CB-B893-2BF69B8B1527}.Debug|Win32.Build.0 = Release|Win32
 		{38A9F56A-8F3E-40CB-B893-2BF69B8B1527}.Release|Win32.ActiveCfg = Release|Win32
 		{38A9F56A-8F3E-40CB-B893-2BF69B8B1527}.Release|Win32.Build.0 = Release|Win32
+		{3FBED9B4-A50B-4D25-B465-6AE226AAB203}.Debug|Win32.ActiveCfg = Release|Win32
+		{3FBED9B4-A50B-4D25-B465-6AE226AAB203}.Debug|Win32.Build.0 = Release|Win32
+		{3FBED9B4-A50B-4D25-B465-6AE226AAB203}.Release|Win32.ActiveCfg = Release|Win32
+		{3FBED9B4-A50B-4D25-B465-6AE226AAB203}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/msvc/MintDoom.suo b/msvc/MintDoom.suo
diff --git a/msvc/_Common.props b/msvc/_Common.props
@@ -7,13 +7,13 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\msvc;..\src;..\textscreen;..\opl;..\pcsound;C:\MyC\SDL-1.2.14\include\SDL</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;..\src;..\textscreen;..\pcsound;C:\MyC\SDL-1.2.14\include\SDL</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <AdditionalLibraryDirectories>C:\MyC\SDL-1.2.14\lib</AdditionalLibraryDirectories>
     </Lib>
     <Link>
-      <AdditionalLibraryDirectories>C:\MyC\SDL-1.2.14\lib;.\Release\libopl;.\Release\libpcsound;.\Release\libtextscreen</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\MyC\SDL-1.2.14\lib;.\Release\libpcsound;.\Release\libtextscreen</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />

diff --git a/msvc/doom.vcxproj b/msvc/doom.vcxproj
@@ -37,13 +37,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <UndefinePreprocessorDefinitions>
+      </UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>SDL.lib;SDLmain.lib;libopl.lib;libpcsound.lib;libtextscreen.lib;SDL_net.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL.lib;SDLmain.lib;libpcsound.lib;libtextscreen.lib;SDL_net.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -76,7 +78,6 @@
     <ClCompile Include="..\src\info.c" />
     <ClCompile Include="..\src\i_joystick.c" />
     <ClCompile Include="..\src\i_main.c" />
-    <ClCompile Include="..\src\i_oplmusic.c" />
     <ClCompile Include="..\src\i_pcsound.c" />
     <ClCompile Include="..\src\i_scale.c" />
     <ClCompile Include="..\src\i_sdlmusic.c" />

diff --git a/msvc/doom.vcxproj.filters b/msvc/doom.vcxproj.filters
@@ -99,9 +99,6 @@
     <ClCompile Include="..\src\i_main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\i_oplmusic.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\i_pcsound.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/msvc/libopl.vcxproj.filters b/msvc/libopl.vcxproj.filters
diff --git a/msvc/libopl.vcxproj → msvc/server.vcxproj b/msvc/libopl.vcxproj → msvc/server.vcxproj
@@ -7,12 +7,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{6F6542FF-D2ED-48E9-8EE3-1219183AA1ED}</ProjectGuid>
-    <RootNamespace>libopl</RootNamespace>
+    <ProjectGuid>{3FBED9B4-A50B-4D25-B465-6AE226AAB203}</ProjectGuid>
+    <RootNamespace>dedicated</RootNamespace>
+    <ProjectName>server</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
@@ -25,45 +26,56 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\$(ProjectName)\</OutDir>
+    <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
+    <TargetName>mint-$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>SDL.lib;SDLmain.lib;SDL_net.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
-    <Lib>
-      <AdditionalDependencies>SDL_mixer.lib</AdditionalDependencies>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\opl\dbopl.c" />
-    <ClCompile Include="..\opl\ioperm_sys.c" />
-    <ClCompile Include="..\opl\opl.c" />
-    <ClCompile Include="..\opl\opl_linux.c" />
-    <ClCompile Include="..\opl\opl_obsd.c" />
-    <ClCompile Include="..\opl\opl_queue.c" />
-    <ClCompile Include="..\opl\opl_sdl.c" />
-    <ClCompile Include="..\opl\opl_timer.c" />
-    <ClCompile Include="..\opl\opl_win32.c" />
+    <ClCompile Include="..\src\d_dedicated.c" />
+    <ClCompile Include="..\src\i_main.c" />
+    <ClCompile Include="..\src\i_timer.c" />
+    <ClCompile Include="..\src\m_argv.c" />
+    <ClCompile Include="..\src\m_misc.c" />
+    <ClCompile Include="..\src\net_common.c" />
+    <ClCompile Include="..\src\net_dedicated.c" />
+    <ClCompile Include="..\src\net_io.c" />
+    <ClCompile Include="..\src\net_packet.c" />
+    <ClCompile Include="..\src\net_query.c" />
+    <ClCompile Include="..\src\net_sdl.c" />
+    <ClCompile Include="..\src\net_server.c" />
+    <ClCompile Include="..\src\net_structrw.c" />
+    <ClCompile Include="..\src\z_zone.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\opl\dbopl.h" />
-    <ClInclude Include="..\opl\ioperm_sys.h" />
-    <ClInclude Include="..\opl\opl.h" />
-    <ClInclude Include="..\opl\opl_internal.h" />
-    <ClInclude Include="..\opl\opl_queue.h" />
-    <ClInclude Include="..\opl\opl_timer.h" />
+    <ClInclude Include="..\src\i_timer.h" />
+    <ClInclude Include="..\src\m_argv.h" />
+    <ClInclude Include="..\src\m_misc.h" />
+    <ClInclude Include="..\src\net_common.h" />
+    <ClInclude Include="..\src\net_dedicated.h" />
+    <ClInclude Include="..\src\net_io.h" />
+    <ClInclude Include="..\src\net_packet.h" />
+    <ClInclude Include="..\src\net_query.h" />
+    <ClInclude Include="..\src\net_sdl.h" />
+    <ClInclude Include="..\src\net_server.h" />
+    <ClInclude Include="..\src\net_structrw.h" />
+    <ClInclude Include="..\src\z_zone.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">