TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add MAKEPANDA defsymbol to export module init function as initlibp3dtoolconfig instead of initlibdtoolconfig

Browse Source
This commit is contained in:
rdb 2009-11-26 17:28:33 +00:00
parent e34cc4bb76
commit cffb6fcdcd
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dtool/metalibs/dtoolconfig/pydtool.cxx
View File

@ -2074,6 +2074,20 @@ static PyMethodDef python_simple_funcs[] = {
{ NULL, NULL } { 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 #ifdef _WIN32
extern "C" __declspec(dllexport) void initlibdtoolconfig(); extern "C" __declspec(dllexport) void initlibdtoolconfig();
#else #else
@ -2083,4 +2097,5 @@ extern "C" void initlibdtoolconfig();
void initlibdtoolconfig() { void initlibdtoolconfig() {
Py_InitModule("libdtoolconfig", python_simple_funcs); Py_InitModule("libdtoolconfig", python_simple_funcs);
} }
#endif // MAKEPANDA

1
makepanda/makepanda.py
View File

@ -518,6 +518,7 @@ if (COMPILER=="LINUX"):
if (sys.platform == "darwin"): 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") 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") DefSymbol("WITHINPANDA", "WITHIN_PANDA", "1")
IncDirectory("ALWAYS", GetOutputDir()+"/tmp") IncDirectory("ALWAYS", GetOutputDir()+"/tmp")
IncDirectory("ALWAYS", GetOutputDir()+"/include") IncDirectory("ALWAYS", GetOutputDir()+"/include")