From b7ee02a06c44eb061e95187df29a3acd3e32452e Mon Sep 17 00:00:00 2001 From: georges <> Date: Tue, 9 Jan 2001 04:26:27 +0000 Subject: [PATCH] *** empty log message *** --- dtool/src/dtoolbase/version.h | 5 +++++ dtool/src/dtoolbase/version.rc | 32 ++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 dtool/src/dtoolbase/version.h diff --git a/dtool/src/dtoolbase/version.h b/dtool/src/dtoolbase/version.h new file mode 100644 index 0000000000..8667c82caa --- /dev/null +++ b/dtool/src/dtoolbase/version.h @@ -0,0 +1,5 @@ +#define PANDA_VERSION_MAJOR 0 +#define PANDA_VERSION_MINOR 0 +#define PANDA_VERSION_BUILDSUBVERSION 0 +#define PANDA_VERSION_BUILDSUBSUBVERSION 1 + diff --git a/dtool/src/dtoolbase/version.rc b/dtool/src/dtoolbase/version.rc index 4d2dab8fcc..e8129c7f81 100644 --- a/dtool/src/dtoolbase/version.rc +++ b/dtool/src/dtoolbase/version.rc @@ -3,20 +3,32 @@ // rc's cpp doesnt support __DATE__,__TIME__ macros, so must use external generated file to get BUILD_DATE #include "verdate.h" +#include "version.h" // these should also be externally generated eventually -#define BUILD_MAJOR 0 -#define BUILD_MINOR 0 -#define BUILD_NUMBER 0 -#define BUILD_REVISION 1 +#ifndef PANDA_VERSION_MAJOR +#define PANDA_VERSION_MAJOR 0 +#endif -#define BUILD_MAJOR_STR "0" -#define BUILD_MINOR_STR "0" -#define BUILD_NUMBER_STR "0" -#define BUILD_REVISION_STR "1" +#ifndef PANDA_VERSION_MINOR +#define PANDA_VERSION_MINOR 0 +#endif -#define VER_FILEVERSION BUILD_MAJOR,BUILD_MINOR,BUILD_NUMBER,BUILD_REVISION -#define VER_FILEVERSION_STR BUILD_MAJOR_STR "." BUILD_MINOR_STR "." BUILD_NUMBER_STR "." BUILD_REVISION_STR +#ifndef PANDA_VERSION_BUILDSUBVERSION +#define PANDA_VERSION_BUILDSUBVERSION 0 +#endif + +#ifndef PANDA_VERSION_BUILDSUBSUBVERSION +#define PANDA_VERSION_BUILDSUBSUBVERSION 0 +#endif + +#define PANDA_VERSION_MAJOR_STR "PANDA_VERSION_MAJOR" +#define PANDA_VERSION_MINOR_STR "PANDA_VERSION_MINOR" +#define PANDA_VERSION_BUILDSUBVERSION_STR "PANDA_VERSION_BUILDSUBVERSION" +#define PANDA_VERSION_BUILDSUBSUBVERSION_STR "PANDA_VERSION_BUILDSUBSUBVERSION" + +#define VER_FILEVERSION PANDA_VERSION_MAJOR,PANDA_VERSION_MINOR,PANDA_VERSION_BUILDSUBVERSION,PANDA_VERSION_BUILDSUBSUBVERSION +#define VER_FILEVERSION_STR PANDA_VERSION_MAJOR_STR "." PANDA_VERSION_MINOR_STR "." PANDA_VERSION_BUILDSUBVERSION_STR "." PANDA_VERSION_BUILDSUBSUBVERSION_STR #define VER_PRODUCTNAME_STR "ToonTown" #define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR // make these the same 4 now