commit a9e8b883ceda0cabf7066a39c3a66c68377a1750
Author: GhostlyDeath <GhostlyDeath@users.sourceforge.net>
AuthorDate: Mon May 5 03:44:28 2008 +0000
Commit: GhostlyDeath <GhostlyDeath@users.sourceforge.net>
CommitDate: Mon May 5 03:44:28 2008 +0000
Updated VC++ Project for added files; Manifest should have version
1.1.1.0 not 1.0.0.0; the rc files in the codeblocks folder have been
updated
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1142
---
codeblocks/game-res.rc | 8 ++-
codeblocks/setup-res.rc | 16 +++--
msvc/ChocolateDoom.vcproj | 158 ++++++++++++++++++++++++++++++++++++++++++----
msvc/win32.rc | 7 ++
setup/setup-manifest.xml | 2 +-
src/w_file.h | 2 -
6 files changed, 167 insertions(+), 26 deletions(-)
diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc
index 53ae4df9..5d0319bb 100644
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,19 +1,21 @@
1 ICON "..\\data\\doom.ico"
1 VERSIONINFO
+PRODUCTVERSION 1,1,1,0
+FILEVERSION 1,1,1,0
FILETYPE 1
{
BLOCK "StringFileInfo"
{
BLOCK "040904E4"
{
- VALUE "FileVersion", ""
- VALUE "FileDescription", ""
+ VALUE "FileVersion", "1.1.1"
+ VALUE "FileDescription", "1.1.1"
VALUE "InternalName", "Chocolate-Doom"
VALUE "CompanyName", "Chocolate-Doom"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate-Doom"
- VALUE "ProductVersion", ""
+ VALUE "ProductVersion", "1.1.1"
}
}
}
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index 0c8abe80..0b74d1f9 100644
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -1,19 +1,23 @@
1 ICON "..\\data\\setup.ico"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
+
1 VERSIONINFO
+PRODUCTVERSION 1,1,1,0
+FILEVERSION 1,1,1,0
FILETYPE 1
{
BLOCK "StringFileInfo"
{
BLOCK "040904E4"
{
- VALUE "FileVersion", ""
- VALUE "FileDescription", ""
- VALUE "InternalName", "Chocolate-Setup"
- VALUE "CompanyName", "Chocolate-Setup"
+ VALUE "FileVersion", "1.1.1"
+ VALUE "FileDescription", "Chocolate-Doom Setup"
+ VALUE "InternalName", "chocolate-setup"
+ VALUE "CompanyName", "fraggle@gmail.com"
VALUE "LegalCopyright", "GNU General Public License"
- VALUE "ProductName", "Chocolate-Setup"
- VALUE "ProductVersion", ""
+ VALUE "ProductName", "Chocolate-Doom Setup"
+ VALUE "ProductVersion", "1.1.1"
}
}
}
diff --git a/msvc/ChocolateDoom.vcproj b/msvc/ChocolateDoom.vcproj
index 2660de5d..6302ac86 100644
--- a/msvc/ChocolateDoom.vcproj
+++ b/msvc/ChocolateDoom.vcproj
@@ -3865,20 +3865,6 @@
<File
RelativePath="..\src\m_misc.c"
>
- <FileConfiguration
- Name="Debug Server|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release Server|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
<FileConfiguration
Name="Debug Setup|Win32"
ExcludedFromBuild="true"
@@ -6748,6 +6734,150 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\src\w_file.c"
+ >
+ <FileConfiguration
+ Name="Debug Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\w_file.h"
+ >
+ <FileConfiguration
+ Name="Debug Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\w_file_stdc.c"
+ >
+ <FileConfiguration
+ Name="Debug Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\w_file_win32.c"
+ >
+ <FileConfiguration
+ Name="Debug Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Server|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Setup|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
<File
RelativePath="..\src\w_merge.c"
>
diff --git a/msvc/win32.rc b/msvc/win32.rc
index d637d3f4..668bdb0a 100644
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -51,3 +51,10 @@ BEGIN
END
END
+// GhostlyDeath - Preferebly for codeblocks (if it even uses this RC!)
+#ifdef __MINGW32__
+#ifdef CHOCOLATESETUP
+// RT_MANIFEST might NOT be defined
+1 24 "../setup/setup-manifest.xml"
+#endif
+#endif
diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml
index dacaa311..74dd5493 100644
--- a/setup/setup-manifest.xml
+++ b/setup/setup-manifest.xml
@@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<!-- The "name" field in this tag should be the same as the executable's
name -->
- <assemblyIdentity version="1.0.0.0" processorArchitecture="*"
+ <assemblyIdentity version="1.1.1.0" processorArchitecture="*"
name="chocolate-setup" type="win32"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
diff --git a/src/w_file.h b/src/w_file.h
index 2eb0d492..e0dbb315 100644
--- a/src/w_file.h
+++ b/src/w_file.h
@@ -84,5 +84,3 @@ size_t W_Read(wad_file_t *wad, unsigned int offset,
void *buffer, size_t buffer_len);
#endif /* #ifndef __W_FILE__ */
-
-