Merge branch 'master' of ssh://repo.or.cz/d2df-sdl

diff --git a/README b/README
index 820f8236eb935cd25f9feb4776cd6ed2e3a8cb64..69b7baeee6fc8f69d14a4884bf071672e9bf66fc 100644 (file)
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ Requirements:
 Create the "tmp" and "bin" directories beforehand if they don't exist already. Then run
 
 cd src/game
-fpc -O3 -Fi../lib/vampimg -Fi../lib/vampimg/JpegLib -Fi../lib/vampimg/ZLib -Fu../lib/vampimg -Fu../lib/vampimg/JpegLib -Fu../lib/vampimg/ZLib -FE../../bin -FU../../tmp Doom2DF.dpr
+fpc -O3 -Fi../lib/vampimg -Fi../lib/vampimg/JpegLib -Fi../lib/vampimg/ZLib -Fu../lib/vampimg -Fu../lib/vampimg/JpegLib -Fu../lib/vampimg/ZLib -FE../../bin -FU../../tmp Doom2DF.lpr
 
 If you want SDL_mixer instead of FMOD, add -dUSE_MIXER.
 To build a headless (no video/audio, for dedicated servers) executable, add -dHEADLESS.

diff --git a/src/game/CustomRes.rc b/src/game/CustomRes.rc
deleted file mode 100644 (file)
index 9be3bbd..0000000
--- a/src/game/CustomRes.rc
+++ /dev/null
@@ -1 +0,0 @@
-dficon  ICON  "Icon.ico"

diff --git a/src/game/CustomRes.res b/src/game/CustomRes.res
deleted file mode 100644 (file)
index f5fbac3..0000000
Binary files a/src/game/CustomRes.res and /dev/null differ

diff --git a/src/game/Icon.ico b/src/game/Doom2DF.ico
similarity index 100%
rename from src/game/Icon.ico
rename to src/game/Doom2DF.ico

diff --git a/src/game/Doom2DF.lpi b/src/game/Doom2DF.lpi
index 3d42f1c3875fb705735d4808341040bcb2b1faf2..07d7577e5b52158d3ef09c89427a806320e55f21 100644 (file)
--- a/src/game/Doom2DF.lpi
+++ b/src/game/Doom2DF.lpi
@@ -1,27 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
-    <PathDelim Value="\"/>
+    <Version Value="10"/>
     <General>
       <Flags>
+        <MainUnitHasUsesSectionForAllUnits Value="False"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <Title Value="Doom2DF"/>
-      <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
+      <UseXPManifest Value="True"/>
+      <Icon Value="0"/>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
     <VersionInfo>
-      <StringTable ProductVersion=""/>
+      <UseVersionInfo Value="True"/>
+      <MinorVersionNr Value="6"/>
+      <RevisionNr Value="6"/>
+      <BuildNr Value="7"/>
+      <Language Value="0419"/>
+      <CharSet Value="04E3"/>
+      <StringTable CompanyName="www.doom2d.org" FileDescription="Doom 2D: Forever" InternalName="Doom 2D: Forever" LegalCopyright="All rights reserved." OriginalFilename="Doom2DF" ProductName="Doom 2D: Forever" ProductVersion=""/>
     </VersionInfo>
-    <BuildModes Count="1">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes Count="2">
+      <Item1 Name="Debug" Default="True"/>
+      <Item2 Name="Release">
+        <CompilerOptions>
+          <Version Value="11"/>
+          <PathDelim Value="\"/>
+          <Target>
+            <Filename Value="..\..\bin\Doom2DF"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="..\lib\vampimg;..\lib\vampimg\JpegLib;..\lib\vampimg\ZLib;$(ProjOutDir)"/>
+            <OtherUnitFiles Value="..\lib\vampimg;..\lib\vampimg\JpegLib;..\lib\vampimg\ZLib"/>
+            <UnitOutputDirectory Value="..\..\tmp"/>
+          </SearchPaths>
+          <CodeGeneration>
+            <SmartLinkUnit Value="True"/>
+            <Optimizations>
+              <OptimizationLevel Value="3"/>
+            </Optimizations>
+          </CodeGeneration>
+          <Linking>
+            <Debugging>
+              <GenerateDebugInfo Value="False"/>
+              <StripSymbols Value="True"/>
+            </Debugging>
+            <LinkSmart Value="True"/>
+            <Options>
+              <Win32>
+                <GraphicApplication Value="True"/>
+              </Win32>
+            </Options>
+          </Linking>
+          <Other>
+            <Verbosity>
+              <ShoLineNum Value="True"/>
+            </Verbosity>
+          </Other>
+        </CompilerOptions>
+      </Item2>
+      <SharedMatrixOptions Count="1">
+        <Item1 ID="807313141795" Modes="Debug,Release" Value="-dUSE_FMOD"/>
+      </SharedMatrixOptions>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -33,7 +80,7 @@
     </RunParams>
     <Units Count="1">
       <Unit0>
-        <Filename Value="Doom2DF.dpr"/>
+        <Filename Value="Doom2DF.lpr"/>
         <IsPartOfProject Value="True"/>
       </Unit0>
     </Units>
@@ -51,20 +98,33 @@
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
-        <SyntaxMode Value="Delphi"/>
+        <IncludeAssertionCode Value="True"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
-      <Optimizations>
-        <OptimizationLevel Value="2"/>
-      </Optimizations>
+      <Checks>
+        <IOChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
     </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <TrashVariables Value="True"/>
+        <UseValgrind Value="True"/>
+      </Debugging>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
+    </Linking>
     <Other>
-      <CompilerMessages>
-        <MsgFileName Value=""/>
-      </CompilerMessages>
-      <CustomOptions Value="-dUSE_FMOD"/>
-      <CompilerPath Value="$(CompPath)"/>
+      <Verbosity>
+        <ShoLineNum Value="True"/>
+        <ShowHintsForUnusedUnitsInMainSrc Value="True"/>
+        <ShowHintsForSenderNotUsed Value="True"/>
+      </Verbosity>
     </Other>
   </CompilerOptions>
   <Debugging>

diff --git a/src/game/Doom2DF.dpr b/src/game/Doom2DF.lpr
similarity index 99%
rename from src/game/Doom2DF.dpr
rename to src/game/Doom2DF.lpr
index daf5f462bdeb870306b7ec747cfaed79f1700111..5162d93ca16ec6b53360d46a7fc4774d93719f98 100644 (file)
--- a/src/game/Doom2DF.dpr
+++ b/src/game/Doom2DF.lpr
@@ -125,7 +125,6 @@ uses
 
 {$IFDEF WINDOWS}
   {$R *.res}
-  {$R CustomRes.res}
 {$ENDIF}
 
 var

diff --git a/src/game/Doom2DF.rc b/src/game/Doom2DF.rc
deleted file mode 100644 (file)
index 0473fb6..0000000
--- a/src/game/Doom2DF.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-APPVERINFO VERSIONINFO
-FILEVERSION 0,6,6,7
-PRODUCTVERSION 0,6,6,7
-FILETYPE VFT_APP
-{
- BLOCK "StringFileInfo"
- {
-  BLOCK "040904E4"
-  {
-   VALUE "CompanyName",      "www.doom2d.org\0"
-   VALUE "FileDescription",  "Doom 2D: Forever\0"
-   VALUE "FileVersion",      "0.6.6.7\0"
-   VALUE "InternalName",     "Doom 2D: Forever\0"
-   VALUE "LegalCopyright",   "All rights reserved.\0"
-   VALUE "OriginalFilename", "Doom2DF.exe\0"
-   VALUE "ProductName",      "Doom 2D: Forever\0"
-   VALUE "ProductVersion",   "0.6.6.7\0"
-  }
- }
- BLOCK "VarFileInfo"
- {
-  VALUE "Translation", LANG_RUSSIAN, 1251
- }
-}

diff --git a/src/game/Doom2DF.res b/src/game/Doom2DF.res
deleted file mode 100644 (file)
index 497f06d..0000000
Binary files a/src/game/Doom2DF.res and /dev/null differ

diff --git a/src/game/MakeRes.bat b/src/game/MakeRes.bat
deleted file mode 100644 (file)
index d3da940..0000000
--- a/src/game/MakeRes.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-gorc.exe CustomRes.rc
-"C:\Program Files (x86)\Borland\Delphi7\Bin\brcc32.exe" Doom2DF.rc
-pause