From af68469f6af3dd1e7a856b2a69f7a31b1b9b2d89 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Thu, 19 May 2011 15:32:50 +0100 Subject: [PATCH] pthread Win32 static linking --- src/main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 13704978b..b7999a844 100644 --- a/src/main.c +++ b/src/main.c @@ -1391,6 +1391,10 @@ int main(int argc, char *argv[]) #ifdef PYCONSOLE PyObject *pname,*pmodule,*pfunc,*pvalue,*pargs,*pstep,*pkey; PyObject *tpt_console_obj; +#endif +#ifdef PTW32_STATIC_LIB + pthread_win32_process_attach_np(); + pthread_win32_thread_attach_np(); #endif decorations = calloc((XRES+BARSIZE)*YRES, PIXELSIZE); vid_buf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); @@ -3219,7 +3223,6 @@ int main(int argc, char *argv[]) } SDL_CloseAudio(); http_done(); - #ifdef PYCONSOLE PyRun_SimpleString("import os,tempfile,os.path\ntry:\n os.remove(os.path.join(tempfile.gettempdir(),'tpt_console.py'))\nexcept:\n pass"); @@ -3227,6 +3230,10 @@ int main(int argc, char *argv[]) PyRun_SimpleString("import os,tempfile,os.path\ntry:\n os.remove(os.path.join(tempfile.gettempdir(),'tpt_console.pyc'))\nexcept:\n pass"); Py_Finalize();//cleanup any python stuff. +#endif +#ifdef PTW32_STATIC_LIB + pthread_win32_thread_detach_np(); + pthread_win32_process_detach_np(); #endif return 0; }