From 482e7b1e9ad2159df1241f6afd6a9dfd319175de Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 10 Sep 2011 08:30:27 +0000 Subject: [PATCH] oh, I see what was wrong --- makepanda/makepanda.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 2f311bb7d2..214fbc4493 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3829,8 +3829,7 @@ if (RTDIST or RUNTIME): TargetAdd('plugin_handleStream.obj', opts=OPTS, input='handleStream.cxx') TargetAdd('plugin_handleStreamBuf.obj', opts=OPTS, input='handleStreamBuf.cxx') if (RTDIST): - TargetAdd("libp3d_plugin_static.lib", input='plugin_get_twirl_data.obj') - for fname in ("libp3d_plugin_static.ilb", "p3d_plugin.dll"): + for fname in ("p3d_plugin.dll", "libp3d_plugin_static.ilb"): TargetAdd(fname, input='plugin_plugin.obj') TargetAdd(fname, input='plugin_mkdir_complete.obj') TargetAdd(fname, input='plugin_wstring_encode.obj') @@ -3846,6 +3845,7 @@ if (RTDIST or RUNTIME): if (sys.platform == "darwin"): TargetAdd(fname, input='libsubprocbuffer.ilb') TargetAdd(fname, opts=['OPENSSL', 'ZLIB', 'JPEG', 'PNG', 'X11', 'ADVAPI', 'WINUSER', 'WINGDI', 'WINSHELL', 'WINCOMCTL', 'WINOLE', 'MSIMG']) + TargetAdd("libp3d_plugin_static.ilb", input='plugin_get_twirl_data.obj') if (PkgSkip("PYTHON")==0 and RTDIST): TargetAdd('p3dpython_p3dpython_composite1.obj', opts=OPTS, input='p3dpython_composite1.cxx')