From a4c3384397f5682b09abf1c0fbb6b42acac9ee2b Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 23 Jul 2009 08:15:19 +0000 Subject: [PATCH] Whoops --- makepanda/makepanda.py | 2 +- makepanda/makepandacore.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 96306f4a91..56010d537c 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1578,7 +1578,7 @@ sys.stdout.flush() if (sys.platform.startswith("win")): OPTS=['DIR:panda/src/configfiles'] - TargetAdd('pandaIcon.res', input='pandaIcon.rc') + TargetAdd('pandaIcon.res', opts=OPTS, input='pandaIcon.rc') # # DIRECTORY: dtool/src/dtoolbase/ diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index c10f74a83a..9f8187d1ba 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1189,9 +1189,8 @@ def CalcLocation(fn, ipath): if (fn.endswith(".c")): return CxxFindSource(fn, ipath) if (fn.endswith(".yxx")): return CxxFindSource(fn, ipath) if (fn.endswith(".lxx")): return CxxFindSource(fn, ipath) - if (fn.endswith(".rc")): return CxxFindSource(fn, ipath) if (fn.endswith(".mll")): return OUTPUTDIR+"/plugins/"+fn - if (sys.platform == "win32"): + if (sys.platform.startswith("win")): if (fn.endswith(".def")): return CxxFindSource(fn, ipath) if (fn.endswith(".rc")): return CxxFindSource(fn, ipath) if (fn.endswith(".obj")): return OUTPUTDIR+"/tmp/"+fn