diff options
| author | Simon Howard | 2011-02-12 18:42:10 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-02-12 18:42:10 +0000 |
| commit | 516a7028994df6718289a7e3db4d07a45c95466b (patch) | |
| tree | cf974cb4bd38b8e9d0101a41263b42b8c87e96c7 /codeblocks | |
| parent | a15ba75736d15409876c1f0a44fffc99adf1c192 (diff) | |
| parent | a9996b41e954d85fde5ec5188bbf6a7f4df88011 (diff) | |
| download | chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.gz chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.bz2 chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.zip | |
Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled
temporarily until the netgame changes on raven-branch are finished.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2259
Diffstat (limited to 'codeblocks')
| -rw-r--r-- | codeblocks/config.h | 6 | ||||
| -rw-r--r-- | codeblocks/game-res.rc | 10 | ||||
| -rw-r--r-- | codeblocks/server.cbp | 4 | ||||
| -rw-r--r-- | codeblocks/setup-res.rc | 8 |
4 files changed, 16 insertions, 12 deletions
diff --git a/codeblocks/config.h b/codeblocks/config.h index d092bf73..9026d398 100644 --- a/codeblocks/config.h +++ b/codeblocks/config.h @@ -9,19 +9,19 @@ #define PACKAGE_NAME "Chocolate Doom" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Chocolate Doom 1.4.0" +#define PACKAGE_STRING "Chocolate Doom 1.5.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "chocolate-doom" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.0" +#define PACKAGE_VERSION "1.5.0" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.4.0" +#define VERSION "1.5.0" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc index eef24852..beef1242 100644 --- a/codeblocks/game-res.rc +++ b/codeblocks/game-res.rc @@ -1,21 +1,21 @@ 1 ICON "../data/doom.ico" 1 VERSIONINFO -PRODUCTVERSION 1,4,0,0 -FILEVERSION 1,4,0,0 +PRODUCTVERSION 1,5,0,0 +FILEVERSION 1,5,0,0 FILETYPE 1 { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "FileVersion", "1.4.0" - VALUE "FileDescription", "1.4.0" + VALUE "FileVersion", "1.5.0" + VALUE "FileDescription", "1.5.0" VALUE "InternalName", "Chocolate-Doom" VALUE "CompanyName", "Chocolate-Doom" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate-Doom" - VALUE "ProductVersion", "1.4.0" + VALUE "ProductVersion", "1.5.0" } } } diff --git a/codeblocks/server.cbp b/codeblocks/server.cbp index a34a66dd..8c8adfb8 100644 --- a/codeblocks/server.cbp +++ b/codeblocks/server.cbp @@ -84,6 +84,10 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="..\src\net_packet.h" /> + <Unit filename="..\src\net_query.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="..\src\net_query.h" /> <Unit filename="..\src\net_sdl.c"> <Option compilerVar="CC" /> </Unit> diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc index f1602adb..b3812a74 100644 --- a/codeblocks/setup-res.rc +++ b/codeblocks/setup-res.rc @@ -3,21 +3,21 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml" 1 VERSIONINFO -PRODUCTVERSION 1,4,0,0 -FILEVERSION 1,4,0,0 +PRODUCTVERSION 1,5,0,0 +FILEVERSION 1,5,0,0 FILETYPE 1 { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "FileVersion", "1.4.0" + VALUE "FileVersion", "1.5.0" VALUE "FileDescription", "Chocolate-Doom Setup" VALUE "InternalName", "chocolate-setup" VALUE "CompanyName", "fraggle@gmail.com" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate-Doom Setup" - VALUE "ProductVersion", "1.4.0" + VALUE "ProductVersion", "1.5.0" } } } |