ref: a9e8b883ceda0cabf7066a39c3a66c68377a1750
parent: 7be9552290f80d9dd68d03642be2618335a51cde
author: GhostlyDeath <[email protected]>
date: Sun May 4 23:44:28 EDT 2008
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
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,6 +1,8 @@
1 ICON "..\\data\\doom.ico"
1 VERSIONINFO
+PRODUCTVERSION 1,1,1,0
+FILEVERSION 1,1,1,0
FILETYPE 1
{BLOCK "StringFileInfo"
@@ -7,13 +9,13 @@
{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"
}
}
}
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -1,6 +1,10 @@
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"
@@ -7,13 +11,13 @@
{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", "[email protected]"
VALUE "LegalCopyright", "GNU General Public License"
- VALUE "ProductName", "Chocolate-Setup"
- VALUE "ProductVersion", ""
+ VALUE "ProductName", "Chocolate-Doom Setup"
+ VALUE "ProductVersion", "1.1.1"
}
}
}
--- a/msvc/ChocolateDoom.vcproj
+++ b/msvc/ChocolateDoom.vcproj
@@ -3866,20 +3866,6 @@
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"
>
@@ -6745,6 +6731,150 @@
>
<Tool
Name="VCCustomBuildTool"
+ />
+ </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>
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -51,3 +51,10 @@
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
--- 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>
--- a/src/w_file.h
+++ b/src/w_file.h
@@ -84,5 +84,3 @@
void *buffer, size_t buffer_len);
#endif /* #ifndef __W_FILE__ */
-
-