From f346e037aae84d7df0df9332de5dab902bdcf1eb Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 22 Jul 2009 15:04:41 +0000 Subject: [PATCH] Minor fixes --- makepanda/makepanda.py | 2 ++ makepanda/makepandacore.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index a362c401e0..4aba39c87c 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2978,6 +2978,8 @@ if (PkgSkip("PLUGIN")==0 and PkgSkip("TINYXML")==0): TargetAdd('panda3d.exe', input='downloader_composite.obj') TargetAdd('panda3d.exe', input='express_composite1.obj') TargetAdd('panda3d.exe', input='express_composite2.obj') + if (sys.platform == 'darwin'): + TargetAdd('panda3d.exe', input='filename_assist.mm') TargetAdd('panda3d.exe', opts=['PYTHON', 'TINYXML', 'OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER', 'WINSHELL']) # diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 342b564c5c..455da6e1a5 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -563,7 +563,7 @@ def DeleteBuildFiles(dir): for entry in os.listdir(dir): if (entry != ".") and (entry != ".."): subdir = dir + "/" + entry - if (os.path.isfile(subdir) and os.path.splitext(subdir)[-1] in [".h", ".I", ".c", ".cxx", ".cpp", ".pp"]): + if (os.path.isfile(subdir) and os.path.splitext(subdir)[-1] in [".h", ".I", ".c", ".cxx", ".cpp", ".pp", ".moved"]): os.remove(subdir) elif (os.path.isdir(subdir)): DeleteBuildFiles(subdir)