From c02932282bb666abba8df1e8aa7275310d465e49 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 18 Sep 2013 14:56:51 +0000 Subject: [PATCH] don't pick up _ext.I --- makepanda/makepanda.py | 4 ++-- makepanda/makepandacore.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 418ecb66ed..a57f0869eb 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3001,7 +3001,7 @@ if (not RUNTIME): OPTS=['DIR:panda/src/linmath', 'BUILDING:PANDA'] TargetAdd('p3linmath_composite1.obj', opts=OPTS, input='p3linmath_composite1.cxx') TargetAdd('p3linmath_composite2.obj', opts=OPTS, input='p3linmath_composite2.cxx') - IGATEFILES=GetDirectoryContents('panda/src/linmath', ["*.h", "*_ext.I", "*_composite*.cxx"]) + IGATEFILES=GetDirectoryContents('panda/src/linmath', ["*.h", "*_composite*.cxx"]) IGATEFILES.remove('lmat_ops_src.h') IGATEFILES.remove('cast_to_double.h') IGATEFILES.remove('lmat_ops.h') @@ -3537,7 +3537,7 @@ if (PkgSkip("ROCKET") ==0) and (not RUNTIME): OPTS=['DIR:panda/src/rocket', 'BUILDING:ROCKET', 'ROCKET'] TargetAdd('p3rocket_composite1.obj', opts=OPTS, input='p3rocket_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/rocket', ["rocketInputHandler.h", - "rocketInputHandler.cxx", "rocketRegion.h", "rocketRegion.cxx", "rocketRegion_ext.I"]) + "rocketInputHandler.cxx", "rocketRegion.h", "rocketRegion.cxx"]) TargetAdd('libp3rocket.in', opts=OPTS, input=IGATEFILES) TargetAdd('libp3rocket.in', opts=['IMOD:p3rocket', 'ILIB:libp3rocket', 'SRCDIR:panda/src/rocket']) TargetAdd('libp3rocket_igate.obj', input='libp3rocket.in', opts=["DEPENDENCYONLY"]) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 53759838c7..cdd63fa0ef 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -294,6 +294,9 @@ def SetTarget(target, arch=None): exit("Windows architecture must be x86 or x64") elif target == 'darwin': + if arch == 'amd64': + arch = 'x86_64' + if arch is not None: choices = ('i386', 'x86_64', 'ppc', 'ppc64') if arch not in choices: