From 33bf6b6df1d68337fb6d3b77d9495af2d9ff1a2b Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 18 Sep 2013 19:25:44 +0000 Subject: [PATCH] compile fixes --- makepanda/makepanda.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index ecd0da2b41..df0f7c8077 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3004,6 +3004,9 @@ if (not RUNTIME): 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", "*_composite*.cxx"]) + for ifile in IGATEFILES[:]: + if "_src." in ifile: + IGATEFILES.remove(ifile) IGATEFILES.remove('lmat_ops_src.h') IGATEFILES.remove('cast_to_double.h') IGATEFILES.remove('lmat_ops.h') @@ -3541,7 +3544,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"]) + "rocketInputHandler.cxx", "rocketRegion.h", "rocketRegion.cxx", "rocketRegion_ext.h"]) 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"])