Browse Source

fix ProductVersion string

georges 25 years ago
parent
commit
b9b3cd0435
2 changed files with 13 additions and 1 deletions
  1. 5 0
      dtool/src/dtoolbase/version.h
  2. 8 1
      dtool/src/dtoolbase/version.rc

+ 5 - 0
dtool/src/dtoolbase/version.h

@@ -3,3 +3,8 @@
 #define PANDA_VERSION_BUILDSUBVERSION      0
 #define PANDA_VERSION_BUILDSUBVERSION      0
 #define PANDA_VERSION_BUILDSUBSUBVERSION   1
 #define PANDA_VERSION_BUILDSUBSUBVERSION   1
 
 
+#define PANDA_VERSION_MAJOR_STR                "0"
+#define PANDA_VERSION_MINOR_STR                "0"
+#define PANDA_VERSION_BUILDSUBVERSION_STR      "0"
+#define PANDA_VERSION_BUILDSUBSUBVERSION_STR   "1"
+

+ 8 - 1
dtool/src/dtoolbase/version.rc

@@ -8,24 +8,31 @@
 // these should also be externally generated eventually
 // these should also be externally generated eventually
 #ifndef PANDA_VERSION_MAJOR
 #ifndef PANDA_VERSION_MAJOR
 #define PANDA_VERSION_MAJOR                0
 #define PANDA_VERSION_MAJOR                0
+#define PANDA_VERSION_MAJOR_STR           "0"
 #endif
 #endif
 
 
 #ifndef PANDA_VERSION_MINOR
 #ifndef PANDA_VERSION_MINOR
 #define PANDA_VERSION_MINOR                0
 #define PANDA_VERSION_MINOR                0
+#define PANDA_VERSION_MINOR_STR           "0"
 #endif
 #endif
 
 
 #ifndef PANDA_VERSION_BUILDSUBVERSION
 #ifndef PANDA_VERSION_BUILDSUBVERSION
 #define PANDA_VERSION_BUILDSUBVERSION      0
 #define PANDA_VERSION_BUILDSUBVERSION      0
+#define PANDA_VERSION_BUILDSUBVERSION_STR "0"
 #endif
 #endif
 
 
 #ifndef PANDA_VERSION_BUILDSUBSUBVERSION
 #ifndef PANDA_VERSION_BUILDSUBSUBVERSION
-#define PANDA_VERSION_BUILDSUBSUBVERSION   0
+#define PANDA_VERSION_BUILDSUBSUBVERSION        0
+#define PANDA_VERSION_BUILDSUBSUBVERSION_STR   "0"
 #endif
 #endif
 
 
+/*
+this stuff doesnt work, cpp wont replace inside quotes
 #define PANDA_VERSION_MAJOR_STR "PANDA_VERSION_MAJOR"
 #define PANDA_VERSION_MAJOR_STR "PANDA_VERSION_MAJOR"
 #define PANDA_VERSION_MINOR_STR "PANDA_VERSION_MINOR"
 #define PANDA_VERSION_MINOR_STR "PANDA_VERSION_MINOR"
 #define PANDA_VERSION_BUILDSUBVERSION_STR "PANDA_VERSION_BUILDSUBVERSION"
 #define PANDA_VERSION_BUILDSUBVERSION_STR "PANDA_VERSION_BUILDSUBVERSION"
 #define PANDA_VERSION_BUILDSUBSUBVERSION_STR "PANDA_VERSION_BUILDSUBSUBVERSION"
 #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      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_FILEVERSION_STR  PANDA_VERSION_MAJOR_STR "." PANDA_VERSION_MINOR_STR "." PANDA_VERSION_BUILDSUBVERSION_STR "." PANDA_VERSION_BUILDSUBSUBVERSION_STR