|
@@ -20,7 +20,7 @@
|
|
|
#include "nativeWindowHandle.h"
|
|
#include "nativeWindowHandle.h"
|
|
|
|
|
|
|
|
#ifndef CPPPARSER
|
|
#ifndef CPPPARSER
|
|
|
-#include "py_panda.h"
|
|
|
|
|
|
|
+#include "py_panda.h"
|
|
|
IMPORT_THIS struct Dtool_PyTypedObject Dtool_WindowHandle;
|
|
IMPORT_THIS struct Dtool_PyTypedObject Dtool_WindowHandle;
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
@@ -81,9 +81,9 @@ P3DPythonRun(const char *program_name, const char *archive_file,
|
|
|
|
|
|
|
|
// Initialize Python. It appears to be important to do this before
|
|
// Initialize Python. It appears to be important to do this before
|
|
|
// we open the pipe streams and spawn the thread, below.
|
|
// we open the pipe streams and spawn the thread, below.
|
|
|
- PyEval_InitThreads();
|
|
|
|
|
Py_SetProgramName((char *)_program_name.c_str());
|
|
Py_SetProgramName((char *)_program_name.c_str());
|
|
|
Py_Initialize();
|
|
Py_Initialize();
|
|
|
|
|
+ PyEval_InitThreads();
|
|
|
PySys_SetArgv(_py_argc, _py_argv);
|
|
PySys_SetArgv(_py_argc, _py_argv);
|
|
|
|
|
|
|
|
// Open the error output before we do too much more.
|
|
// Open the error output before we do too much more.
|
rdb