Browse Source

defer PANDA_OFFICIAL_VERSION

David Rose 16 years ago
parent
commit
58343fa3c1
1 changed files with 5 additions and 9 deletions
  1. 5 9
      dtool/Package.pp

+ 5 - 9
dtool/Package.pp

@@ -22,27 +22,23 @@
 #define PANDA_MAJOR_VERSION $[word 1,$[PANDA_VERSION]]
 #define PANDA_MAJOR_VERSION $[word 1,$[PANDA_VERSION]]
 #define PANDA_MINOR_VERSION $[word 2,$[PANDA_VERSION]]
 #define PANDA_MINOR_VERSION $[word 2,$[PANDA_VERSION]]
 #define PANDA_SEQUENCE_VERSION $[word 3,$[PANDA_VERSION]]
 #define PANDA_SEQUENCE_VERSION $[word 3,$[PANDA_VERSION]]
-#define PANDA_VERSION_STR $[PANDA_MAJOR_VERSION].$[PANDA_MINOR_VERSION].$[PANDA_SEQUENCE_VERSION]$[if $[not $[PANDA_OFFICIAL_VERSION]],c]
-#define PANDA_VERSION_SYMBOL panda_version_$[PANDA_MAJOR_VERSION]_$[PANDA_MINOR_VERSION]_$[PANDA_SEQUENCE_VERSION]$[if $[not $[PANDA_OFFICIAL_VERSION]],c]
+#defer PANDA_VERSION_STR $[PANDA_MAJOR_VERSION].$[PANDA_MINOR_VERSION].$[PANDA_SEQUENCE_VERSION]$[if $[not $[PANDA_OFFICIAL_VERSION]],c]
+#defer PANDA_VERSION_SYMBOL panda_version_$[PANDA_MAJOR_VERSION]_$[PANDA_MINOR_VERSION]_$[PANDA_SEQUENCE_VERSION]$[if $[not $[PANDA_OFFICIAL_VERSION]],c]
 
 
 // The panda version as a single number, with three digits reserved
 // The panda version as a single number, with three digits reserved
 // for each component.
 // for each component.
 #define PANDA_NUMERIC_VERSION $[+ $[* $[PANDA_MAJOR_VERSION],1000000],$[* $[PANDA_MINOR_VERSION],1000],$[PANDA_SEQUENCE_VERSION]]
 #define PANDA_NUMERIC_VERSION $[+ $[* $[PANDA_MAJOR_VERSION],1000000],$[* $[PANDA_MINOR_VERSION],1000],$[PANDA_SEQUENCE_VERSION]]
-#if $[not $[PANDA_OFFICIAL_VERSION]]
-  // Subtract 1 if we are not an official version.
-  #define PANDA_NUMERIC_VERSION $[- $[PANDA_NUMERIC_VERSION],1]
-#endif
 
 
 #define P3D_PLUGIN_MAJOR_VERSION $[word 1,$[P3D_PLUGIN_VERSION]]
 #define P3D_PLUGIN_MAJOR_VERSION $[word 1,$[P3D_PLUGIN_VERSION]]
 #define P3D_PLUGIN_MINOR_VERSION $[word 2,$[P3D_PLUGIN_VERSION]]
 #define P3D_PLUGIN_MINOR_VERSION $[word 2,$[P3D_PLUGIN_VERSION]]
 #define P3D_PLUGIN_SEQUENCE_VERSION $[word 3,$[P3D_PLUGIN_VERSION]]
 #define P3D_PLUGIN_SEQUENCE_VERSION $[word 3,$[P3D_PLUGIN_VERSION]]
-#define P3D_PLUGIN_VERSION_STR $[P3D_PLUGIN_MAJOR_VERSION].$[P3D_PLUGIN_MINOR_VERSION].$[P3D_PLUGIN_SEQUENCE_VERSION]$[if $[not $[PANDA_OFFICIAL_VERSION]],c]
+#defer P3D_PLUGIN_VERSION_STR $[P3D_PLUGIN_MAJOR_VERSION].$[P3D_PLUGIN_MINOR_VERSION].$[P3D_PLUGIN_SEQUENCE_VERSION]$[if $[not $[PANDA_OFFICIAL_VERSION]],c]
 
 
 // The plugin version as a dot-delimited integer quad, according to MS
 // The plugin version as a dot-delimited integer quad, according to MS
 // conventions for DLL version numbers.
 // conventions for DLL version numbers.
-#define P3D_PLUGIN_DLL_DOT_VERSION $[word 1,$[P3D_PLUGIN_VERSION]].$[word 2,$[P3D_PLUGIN_VERSION]].$[word 3,$[P3D_PLUGIN_VERSION]].$[if $[PANDA_OFFICIAL_VERSION],1000,0]
+#defer P3D_PLUGIN_DLL_DOT_VERSION $[word 1,$[P3D_PLUGIN_VERSION]].$[word 2,$[P3D_PLUGIN_VERSION]].$[word 3,$[P3D_PLUGIN_VERSION]].$[if $[PANDA_OFFICIAL_VERSION],1000,0]
 // The same thing as a comma-delimited quad.
 // The same thing as a comma-delimited quad.
-#define P3D_PLUGIN_DLL_COMMA_VERSION $[word 1,$[P3D_PLUGIN_VERSION]],$[word 2,$[P3D_PLUGIN_VERSION]],$[word 3,$[P3D_PLUGIN_VERSION]],$[if $[PANDA_OFFICIAL_VERSION],1000,0]
+#defer P3D_PLUGIN_DLL_COMMA_VERSION $[word 1,$[P3D_PLUGIN_VERSION]],$[word 2,$[P3D_PLUGIN_VERSION]],$[word 3,$[P3D_PLUGIN_VERSION]],$[if $[PANDA_OFFICIAL_VERSION],1000,0]
 
 
 // What is the name of this source tree?
 // What is the name of this source tree?
 #if $[eq $[PACKAGE],]
 #if $[eq $[PACKAGE],]