adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/win32_install/README
+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 This will generate a reference contour to compare the current CVS build
against. This only needs to be done once (after each release) 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 and should be set appropriately before compiling
2) Build content .zip files and content.nsh 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 to create a full content directory rather than just the upgrade zip
./build_archives.pl contour_0_1 [full] ./build_archives.pl contour_0_1 [full]
This will generate .zip files of the content directory (assuming 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-content.zip
uqm-0.1_to_0.2-voice.zip uqm-0.1_to_0.2-voice.zip
and (if 'full' is specified) 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 ubx. this may break the game and/or installer, and
is not recomended. is not recomended.
MUI_VERSION: The version of UQM you are building. This parameter MUI_VERSION: The version of UQM you are building. This parameter
is normally auto-defined by readinng version.h, but is normally auto-defined by readinng uqmversion.h,
can be manually overridden if needed. but can be manually overridden if needed.
4) run NSIS to build the installer: 4) run NSIS to build the installer:
makensis uqm.nsi makensis uqm.nsi
sc2/build/win32_install/build_archives.pl
+5 -5
View File
@@ -15,9 +15,9 @@ if (! defined ($file) || scalar(@ARGV)) {
# print STDERR "$0 cvs_log_file cvs_tag [full]\n"; # print STDERR "$0 cvs_log_file cvs_tag [full]\n";
exit 1; exit 1;
} }
# fetch the version from version.h # fetch the version from uqmversion.h
if (-f "../../src/version.h") { if (-f "../../src/uqmversion.h") {
open (FH, "../../src/version.h") or die "couldn't read version.h\n"; open (FH, "../../src/uqmversion.h") or die "couldn't read uqmversion.h\n";
while (<FH>) { while (<FH>) {
if (/^\s*\#define\s+UQM_MAJOR_VERSION\s+(\d+)/) { if (/^\s*\#define\s+UQM_MAJOR_VERSION\s+(\d+)/) {
$major = $1; $major = $1;
@@ -31,11 +31,11 @@ if (-f "../../src/version.h") {
} }
close FH; close FH;
if (!defined ($major) || !defined ($minor) || !defined ($extra)) { if (!defined ($major) || !defined ($minor) || !defined ($extra)) {
die "Error reading version.h\n"; die "Error reading uqmversion.h\n";
} }
$version = "$major.${minor}${extra}"; $version = "$major.${minor}${extra}";
} else { } else {
die "couldn't find version.h\n"; die "couldn't find uqmversion.h\n";
} }
if (! defined ($do_full)) { if (! defined ($do_full)) {
sc2/src/msvc++/UrQuanMasters.dsp
+1 -1
View File
@@ -3320,7 +3320,7 @@ SOURCE=..\options.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\version.h SOURCE=..\uqmversion.h
# End Source File # End Source File
# Begin Source File # Begin Source File
sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include "primitives.h" #include "primitives.h"
#include "dcqueue.h" #include "dcqueue.h"
#include "options.h" #include "options.h"
#include "version.h" #include "uqmversion.h"
#include "SDL_thread.h" #include "SDL_thread.h"
#include "libs/graphics/drawcmd.h" #include "libs/graphics/drawcmd.h"
#include "bbox.h" #include "bbox.h"
sc2/src/starcon2.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include "file.h" #include "file.h"
#include "port.h" #include "port.h"
#include "options.h" #include "options.h"
#include "version.h" #include "uqmversion.h"
#include "comm.h" #include "comm.h"
#if defined(GFXMODULE_SDL) || defined(SOUNDMODULE_SDL) #if defined(GFXMODULE_SDL) || defined(SOUNDMODULE_SDL)
sc2/src/version.h → sc2/src/uqmversion.h
+3 -3
View File
@@ -14,8 +14,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifndef VERSION_H #ifndef UQMVERSION_H
#define VERSION_H #define UQMVERSION_H
#define UQM_MAJOR_VERSION 0 #define UQM_MAJOR_VERSION 0
#define UQM_MINOR_VERSION 14 #define UQM_MINOR_VERSION 14
@@ -23,5 +23,5 @@
/* The final version is interpreted as: /* The final version is interpreted as:
printf ("%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION); printf ("%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION);
*/ */
#endif
#endif