rdb 16 years ago
parent
commit
a4c3384397
2 changed files with 2 additions and 3 deletions
  1. 1 1
      makepanda/makepanda.py
  2. 1 2
      makepanda/makepandacore.py

+ 1 - 1
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/

+ 1 - 2
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