diff --git a/direct/Package.pp b/direct/Package.pp index 88bf63c9ea..fbd9a7d4f9 100644 --- a/direct/Package.pp +++ b/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 diff --git a/direct/src/ffi/generatePythonCode b/direct/src/ffi/generatePythonCode index 2f8bd7dce7..ba51c8f154 100644 --- a/direct/src/ffi/generatePythonCode +++ b/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: diff --git a/dtool/Package.pp b/dtool/Package.pp index 16a40ee680..9adf1ee310 100644 --- a/dtool/Package.pp +++ b/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 diff --git a/dtool/metalibs/dtoolconfig/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx index 0d4c1650d2..a4860a6e49 100644 --- a/dtool/metalibs/dtoolconfig/pydtool.cxx +++ b/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); } diff --git a/pandatool/Package.pp b/pandatool/Package.pp index 9f3e7750f3..fd13e054d6 100644 --- a/pandatool/Package.pp +++ b/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