Browse Source

Introducing ABI compatibility between sequential releases of Panda3D

rdb 16 years ago
parent
commit
d9345815b9
2 changed files with 4 additions and 4 deletions
  1. 1 1
      dtool/Package.pp
  2. 3 3
      makepanda/makepanda.py

+ 1 - 1
dtool/Package.pp

@@ -23,7 +23,7 @@
 #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]]
 #defer PANDA_VERSION_STR $[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]
+#defer PANDA_VERSION_SYMBOL panda_version_$[PANDA_MAJOR_VERSION]_$[PANDA_MINOR_VERSION]
 
 
 // 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.

+ 3 - 3
makepanda/makepanda.py

@@ -1534,18 +1534,18 @@ PANDAVERSION_H_RUNTIME="""
 
 
 CHECKPANDAVERSION_CXX="""
 CHECKPANDAVERSION_CXX="""
 # include "dtoolbase.h"
 # include "dtoolbase.h"
-EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2_$VERSION3 = 0;
+EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2 = 0;
 """
 """
 
 
 CHECKPANDAVERSION_H="""
 CHECKPANDAVERSION_H="""
 # include "dtoolbase.h"
 # include "dtoolbase.h"
-extern EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2_$VERSION3;
+extern EXPCL_DTOOL int panda_version_$VERSION1_$VERSION2;
 # ifndef WIN32
 # ifndef WIN32
 /* For Windows, exporting the symbol from the DLL is sufficient; the
 /* For Windows, exporting the symbol from the DLL is sufficient; the
       DLL will not load unless all expected public symbols are defined.
       DLL will not load unless all expected public symbols are defined.
       Other systems may not mind if the symbol is absent unless we
       Other systems may not mind if the symbol is absent unless we
       explictly write code that references it. */
       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
 # endif
 """
 """