diff --git a/dtool/metalibs/dtoolconfig/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx index 1a2337f83a..02a8f2710b 100644 --- a/dtool/metalibs/dtoolconfig/pydtool.cxx +++ b/dtool/metalibs/dtoolconfig/pydtool.cxx @@ -2074,6 +2074,20 @@ static PyMethodDef python_simple_funcs[] = { { NULL, NULL } }; +// Makepanda builds the library as libp3dtoolconfig instead of libdtoolconfig. +#ifdef MAKEPANDA +#ifdef _WIN32 +extern "C" __declspec(dllexport) void initlibp3dtoolconfig(); +#else +extern "C" void initlibp3dtoolconfig(); +#endif + +void initlibp3dtoolconfig() { + Py_InitModule("libp3dtoolconfig", python_simple_funcs); +} + +#else // MAKEPANDA + #ifdef _WIN32 extern "C" __declspec(dllexport) void initlibdtoolconfig(); #else @@ -2083,4 +2097,5 @@ extern "C" void initlibdtoolconfig(); void initlibdtoolconfig() { Py_InitModule("libdtoolconfig", python_simple_funcs); } +#endif // MAKEPANDA diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 977ddafa0e..01f8943ed7 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -518,6 +518,7 @@ if (COMPILER=="LINUX"): if (sys.platform == "darwin"): LibName(pkg, "-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib") +DefSymbol("ALWAYS", "MAKEPANDA", "") DefSymbol("WITHINPANDA", "WITHIN_PANDA", "1") IncDirectory("ALWAYS", GetOutputDir()+"/tmp") IncDirectory("ALWAYS", GetOutputDir()+"/include")