TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Comment out bin2c compilation since it conflicts with PyCUDA, and it's a bit of an esoteric tool anyway.

Browse Source
This commit is contained in:
rdb 2014-07-11 12:22:31 +00:00
parent 2dd503df00
commit bed35751ec
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
makepanda/makepanda.py
View File

@ -5522,15 +5522,17 @@ if (PkgSkip("PANDATOOL")==0):
# DIRECTORY: pandatool/src/miscprogs/ # DIRECTORY: pandatool/src/miscprogs/
# #
if (PkgSkip("PANDATOOL")==0): # This is a bit of an esoteric tool, and it causes issues because
OPTS=['DIR:pandatool/src/miscprogs'] # it conflicts with tools of the same name in different packages.
TargetAdd('bin2c_binToC.obj', opts=OPTS, input='binToC.cxx') #if (PkgSkip("PANDATOOL")==0):
TargetAdd('bin2c.exe', input='bin2c_binToC.obj') # OPTS=['DIR:pandatool/src/miscprogs']
TargetAdd('bin2c.exe', input='libp3progbase.lib') # TargetAdd('bin2c_binToC.obj', opts=OPTS, input='binToC.cxx')
TargetAdd('bin2c.exe', input='libp3pandatoolbase.lib') # TargetAdd('bin2c.exe', input='bin2c_binToC.obj')
TargetAdd('bin2c.exe', input=COMMON_PANDA_LIBS) # TargetAdd('bin2c.exe', input='libp3progbase.lib')
TargetAdd('bin2c.exe', input='libp3pystub.lib') # TargetAdd('bin2c.exe', input='libp3pandatoolbase.lib')
TargetAdd('bin2c.exe', opts=['ADVAPI']) # TargetAdd('bin2c.exe', input=COMMON_PANDA_LIBS)
# TargetAdd('bin2c.exe', input='libp3pystub.lib')
# TargetAdd('bin2c.exe', opts=['ADVAPI'])
# #
# DIRECTORY: pandatool/src/pstatserver/ # DIRECTORY: pandatool/src/pstatserver/