From b82d8339f473a55ac132d792fcb7c684126ddb21 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 23 Jul 2009 16:35:06 +0000 Subject: [PATCH] So I made that mistake twice. --- makepanda/makepanda.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 0f15e265bd..7dfd454763 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1904,7 +1904,11 @@ TargetAdd('libpandaexpress.dll', opts=['ADVAPI', 'WINSOCK2', 'OPENSSL', 'ZLIB'] if (PkgSkip("PLUGIN")==0 and PkgSkip("TINYXML")==0): pref = "" - if (sys.platform.startswith("win")): pref = "static_" + if (sys.platform.startswith("win")): + pref = "static_" + OPTS=['DIR:panda/metalibs/pandaexpress', 'LINK_ALL_STATIC', 'ZLIB'] + TargetAdd('static_pandaexpress_pandaexpress.obj', opts=OPTS, input='pandaexpress.cxx') + TargetAdd('libpandaexpress.ilb', input=pref+'pandaexpress_pandaexpress.obj') TargetAdd('libpandaexpress.ilb', input=pref+'downloader_composite.obj') TargetAdd('libpandaexpress.ilb', input=pref+'express_composite1.obj')