浏览代码

Fix bug with (or rather: without) fcollada

rdb 17 年之前
父节点
当前提交
a0ecc0d1c3
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      doc/makepanda/makepanda.py

+ 2 - 2
doc/makepanda/makepanda.py

@@ -2700,7 +2700,7 @@ if (PkgSkip("PANDATOOL")==0):
 #
 #
 # DIRECTORY: pandatool/src/daeegg/
 # DIRECTORY: pandatool/src/daeegg/
 #
 #
-if (PkgSkip("PANDATOOL")==0):
+if (PkgSkip("PANDATOOL")==0 and PkgSkip("FCOLLADA")==0):
     OPTS=['DIR:pandatool/src/daeegg', 'FCOLLADA']
     OPTS=['DIR:pandatool/src/daeegg', 'FCOLLADA']
     TargetAdd('daeegg_composite1.obj', opts=OPTS, input='daeegg_composite1.cxx')
     TargetAdd('daeegg_composite1.obj', opts=OPTS, input='daeegg_composite1.cxx')
     TargetAdd('libdaeegg.lib', input='daeegg_composite1.obj')
     TargetAdd('libdaeegg.lib', input='daeegg_composite1.obj')
@@ -2709,7 +2709,7 @@ if (PkgSkip("PANDATOOL")==0):
 #
 #
 # DIRECTORY: pandatool/src/daeprogs/
 # DIRECTORY: pandatool/src/daeprogs/
 #
 #
-if (PkgSkip("PANDATOOL")==0):
+if (PkgSkip("PANDATOOL")==0 and PkgSkip("FCOLLADA")==0):
     OPTS=['DIR:pandatool/src/daeprogs', 'FCOLLADA']
     OPTS=['DIR:pandatool/src/daeprogs', 'FCOLLADA']
     TargetAdd('dae2egg_daeToEgg.obj', opts=OPTS, input='daeToEgg.cxx')
     TargetAdd('dae2egg_daeToEgg.obj', opts=OPTS, input='daeToEgg.cxx')
     TargetAdd('dae2egg.exe', input='dae2egg_daeToEgg.obj')
     TargetAdd('dae2egg.exe', input='dae2egg_daeToEgg.obj')