From 9ba873eb70aa0b92bfff9d753e856e6fe60fef04 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 25 Apr 2009 12:55:02 +0000 Subject: [PATCH] Dont enable SIMPLE_THREADS on win32 --- makepanda/makepanda.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index a2167328c9..059ce58ef5 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -796,7 +796,7 @@ DTOOL_CONFIG=[ ("HAVE_DX9", 'UNDEF', 'UNDEF'), ("HAVE_CHROMIUM", 'UNDEF', 'UNDEF'), ("HAVE_THREADS", '1', '1'), - ("SIMPLE_THREADS", 'UNDEF', '1'), + ("SIMPLE_THREADS", '1', '1'), ("HAVE_AUDIO", '1', '1'), ("NOTIFY_DEBUG", 'UNDEF', 'UNDEF'), ("DO_PSTATS", 'UNDEF', 'UNDEF'), @@ -975,6 +975,9 @@ def WriteConfigSettings(): if (OPTIMIZE <= 3): dtool_config["NOTIFY_DEBUG"] = '1' + if (sys.platform.startswith('win') and platform.architecture()[0] == '64bit'): + dtool_config["SIMPLE_THREADS"] = 'UNDEF' + conf = "/* prc_parameters.h. Generated automatically by makepanda.py */\n" for key in prc_parameters.keys(): if ((key == "DEFAULT_PRC_DIR") or (key[:4]=="PRC_")):