diff --git a/dtool/Package.pp b/dtool/Package.pp index e7968c3d75..10eee10938 100644 --- a/dtool/Package.pp +++ b/dtool/Package.pp @@ -23,7 +23,7 @@ #define PANDA_MINOR_VERSION $[word 2,$[PANDA_VERSION]] #define PANDA_SEQUENCE_VERSION $[word 3,$[PANDA_VERSION]] #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] +#defer PANDA_VERSION_SYMBOL panda_version_$[PANDA_MAJOR_VERSION]_$[PANDA_MINOR_VERSION] // The panda version as a single number, with three digits reserved // for each component. diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index b2c6b283d0..890868ce9b 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1534,18 +1534,18 @@ PANDAVERSION_H_RUNTIME=""" CHECKPANDAVERSION_CXX=""" # include "dtoolbase.h" -EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2_$VERSION3 = 0; +EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2 = 0; """ CHECKPANDAVERSION_H=""" # include "dtoolbase.h" -extern EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2_$VERSION3; +extern EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2; # ifndef WIN32 /* For Windows, exporting the symbol from the DLL is sufficient; the DLL will not load unless all expected public symbols are defined. Other systems may not mind if the symbol is absent unless we explictly write code that references it. */ -static int check_panda_version = panda_version_$VERSION1_$VERSION2_$VERSION3; +static int check_panda_version = panda_version_$VERSION1_$VERSION2; # endif """