Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
58ec6fe490

+ 0 - 8
direct/Package.pp

@@ -14,14 +14,6 @@
 
 
 
-// Check the version of ppremake in use.  This is temporary until
-// everyone gets up to at least 0.50.  After that, the test in dtool
-// will suffice.
-#if $[not $[>= $[PPREMAKE_VERSION],0.50]]
-  #error You need at least ppremake version 0.50 to process this tree.
-#endif
-
-
 // What is the name and version of this source tree?
 #if $[eq $[PACKAGE],]
   #define PACKAGE direct

+ 4 - 4
direct/src/ffi/generatePythonCode

@@ -14,16 +14,16 @@ Generates Python code for the C++ libraries listed.
 
 Example:
 Linux:
-  ppython -d generatePythonCode -v -d $DIRECT/lib/py -e $DIRECT/src/extensions -i libdtool libpandaexpress libpanda libdirect libtoontown
+  ppython -d generatePythonCode -v -d $DIRECT/lib/py -e $DIRECT/src/extensions -i libdtoolconfig libpandaexpress libpanda libdirect libtoontown
 
 Windows debug:
-  ppython -d generatePythonCode -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w $DIRECT/src/extensions` -i libdtool libpandaexpress libpanda libdirect libtoontown
+  ppython -d generatePythonCode -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libdirect libtoontown
 
 Windows release:
-  ppython generatePythonCode -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w $DIRECT/src/extensions` -i libdtool libpandaexpress libpanda libdirect libtoontown
+  ppython generatePythonCode -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libdirect libtoontown
 
 Windows publish (no assertions, no comments, no docstrings):
-  ppython -OO generatePythonCode -O -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w $DIRECT/src/extensions` -i libdtool libpandaexpress libpanda libdirect libtoontown
+  ppython -OO generatePythonCode -O -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libdirect libtoontown
 
 
 Options:

+ 1 - 1
dtool/Package.pp

@@ -13,7 +13,7 @@
 // files.
 
 // Check the version of ppremake in use.
-#if $[not $[>= $[PPREMAKE_VERSION],0.50]]
+#if $[< $[PPREMAKE_VERSION],0.50]
   #error You need at least ppremake version 0.50 to process this tree.
 #endif
 

+ 5 - 5
dtool/metalibs/dtoolconfig/pydtool.cxx

@@ -1,6 +1,6 @@
 /*
  * This file generated by:
- * interrogate -nodb -python -promiscuous -I /home/drose/player/dtool/include -module dtool -library libdtool -true-names -do-module -oc pydtool.cxx interrogate_interface.h 
+ * interrogate -nodb -python -promiscuous -I /home/drose/player/dtool/include -module dtoolconfig -library libdtoolconfig -true-names -do-module -oc pydtool.cxx interrogate_interface.h 
  *
  */
 
@@ -1699,12 +1699,12 @@ static PyMethodDef python_methods[] = {
 };
 
 #ifdef _WIN32
-extern "C" __declspec(dllexport) void initlibdtool();
+extern "C" __declspec(dllexport) void initlibdtoolconfig();
 #else
-extern "C" void initlibdtool();
+extern "C" void initlibdtoolconfig();
 #endif
 
-void initlibdtool() {
-  Py_InitModule("libdtool", python_methods);
+void initlibdtoolconfig() {
+  Py_InitModule("libdtoolconfig", python_methods);
 }
 

+ 0 - 8
pandatool/Package.pp

@@ -14,14 +14,6 @@
 
 
 
-// Check the version of ppremake in use.  This is temporary until
-// everyone gets up to at least 0.50.  After that, the test in dtool
-// will suffice.
-#if $[not $[>= $[PPREMAKE_VERSION],0.50]]
-  #error You need at least ppremake version 0.50 to process this tree.
-#endif
-
-
 // What is the name and version of this source tree?
 #if $[eq $[PACKAGE],]
   #define PACKAGE pandatool