replace version.h with uqmversion.h to make MSVC6 happy about dependencies

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@762 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
ghaushe
2003-02-17 02:23:21 +00:00
parent 2d861025d5
commit a6847195a2
6 changed files with 15 additions and 15 deletions
+4 -4
View File
@@ -31,7 +31,7 @@ resource hacker: http://www.users.on.net/johnson/resourcehacker/
This will generate a reference contour to compare the current CVS build
against. This only needs to be done once (after each release)
1) Compile uqm.exe. Note that version.h defines the version of UQM to build,
1) Compile uqm.exe. Note that uqmversion.h defines the version of UQM to build,
and should be set appropriately before compiling
2) Build content .zip files and content.nsh
@@ -42,7 +42,7 @@ resource hacker: http://www.users.on.net/johnson/resourcehacker/
to create a full content directory rather than just the upgrade zip
./build_archives.pl contour_0_1 [full]
This will generate .zip files of the content directory (assuming
version.h defines the version as 0.2):
uqmversion.h defines the version as 0.2):
uqm-0.1_to_0.2-content.zip
uqm-0.1_to_0.2-voice.zip
and (if 'full' is specified)
@@ -111,8 +111,8 @@ resource hacker: http://www.users.on.net/johnson/resourcehacker/
ubx. this may break the game and/or installer, and
is not recomended.
MUI_VERSION: The version of UQM you are building. This parameter
is normally auto-defined by readinng version.h, but
can be manually overridden if needed.
is normally auto-defined by readinng uqmversion.h,
but can be manually overridden if needed.
4) run NSIS to build the installer:
makensis uqm.nsi
+5 -5
View File
@@ -15,9 +15,9 @@ if (! defined ($file) || scalar(@ARGV)) {
# print STDERR "$0 cvs_log_file cvs_tag [full]\n";
exit 1;
}
# fetch the version from version.h
if (-f "../../src/version.h") {
open (FH, "../../src/version.h") or die "couldn't read version.h\n";
# fetch the version from uqmversion.h
if (-f "../../src/uqmversion.h") {
open (FH, "../../src/uqmversion.h") or die "couldn't read uqmversion.h\n";
while (<FH>) {
if (/^\s*\#define\s+UQM_MAJOR_VERSION\s+(\d+)/) {
$major = $1;
@@ -31,11 +31,11 @@ if (-f "../../src/version.h") {
}
close FH;
if (!defined ($major) || !defined ($minor) || !defined ($extra)) {
die "Error reading version.h\n";
die "Error reading uqmversion.h\n";
}
$version = "$major.${minor}${extra}";
} else {
die "couldn't find version.h\n";
die "couldn't find uqmversion.h\n";
}
if (! defined ($do_full)) {
+1 -1
View File
@@ -3320,7 +3320,7 @@ SOURCE=..\options.h
# End Source File
# Begin Source File
SOURCE=..\version.h
SOURCE=..\uqmversion.h
# End Source File
# Begin Source File
@@ -25,7 +25,7 @@
#include "primitives.h"
#include "dcqueue.h"
#include "options.h"
#include "version.h"
#include "uqmversion.h"
#include "SDL_thread.h"
#include "libs/graphics/drawcmd.h"
#include "bbox.h"
+1 -1
View File
@@ -36,7 +36,7 @@
#include "file.h"
#include "port.h"
#include "options.h"
#include "version.h"
#include "uqmversion.h"
#include "comm.h"
#if defined(GFXMODULE_SDL) || defined(SOUNDMODULE_SDL)
+3 -3
View File
@@ -14,8 +14,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef VERSION_H
#define VERSION_H
#ifndef UQMVERSION_H
#define UQMVERSION_H
#define UQM_MAJOR_VERSION 0
#define UQM_MINOR_VERSION 14
@@ -23,5 +23,5 @@
/* The final version is interpreted as:
printf ("%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION);
*/
#endif
#endif