TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

New iPhone changes broke OSX build, repairing

Browse Source
This commit is contained in:
rdb 2009-04-18 08:52:44 +00:00
parent 4dc60ab611
commit a10707cb85
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makepanda/makepanda.py
View File

@ -2141,6 +2141,7 @@ if PkgSkip("OPENSSL")==0:
# DIRECTORY: panda/src/downloadertools/ # DIRECTORY: panda/src/downloadertools/
# #
if PkgSkip("ZLIB")==0:
OPTS=['DIR:panda/src/downloadertools', 'ZLIB', 'ADVAPI'] OPTS=['DIR:panda/src/downloadertools', 'ZLIB', 'ADVAPI']
TargetAdd('multify_multify.obj', opts=OPTS, input='multify.cxx') TargetAdd('multify_multify.obj', opts=OPTS, input='multify.cxx')
@ -2365,13 +2366,15 @@ if (sys.platform != "win32" and sys.platform != "darwin"):
if (sys.platform == 'darwin'): if (sys.platform == 'darwin'):
OPTS=['DIR:panda/src/osxdisplay', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL'] OPTS=['DIR:panda/src/osxdisplay', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL']
TargetAdd('osxdisplay_composite.obj', opts=OPTS, input='osxdisplay_composite.mm') TargetAdd('osxdisplay_composite1.obj', opts=OPTS, input='osxdisplay_composite1.cxx')
TargetAdd('osxdisplay_osxGraphicsWindow.obj', opts=OPTS, input='osxGraphicsWindow.mm')
OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL'] OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL']
TargetAdd('pandagl_pandagl.obj', opts=OPTS, input='pandagl.cxx') TargetAdd('pandagl_pandagl.obj', opts=OPTS, input='pandagl.cxx')
TargetAdd('libpandagl.dll', input='pandagl_pandagl.obj') TargetAdd('libpandagl.dll', input='pandagl_pandagl.obj')
TargetAdd('libpandagl.dll', input='glgsg_config_glgsg.obj') TargetAdd('libpandagl.dll', input='glgsg_config_glgsg.obj')
TargetAdd('libpandagl.dll', input='glgsg_glgsg.obj') TargetAdd('libpandagl.dll', input='glgsg_glgsg.obj')
TargetAdd('libpandagl.dll', input='osxdisplay_composite.obj') TargetAdd('libpandagl.dll', input='osxdisplay_composite1.obj')
TargetAdd('libpandagl.dll', input='osxdisplay_osxGraphicsWindow.obj')
TargetAdd('libpandagl.dll', input='libp3glstuff.dll') TargetAdd('libpandagl.dll', input='libp3glstuff.dll')
TargetAdd('libpandagl.dll', input='libpandafx.dll') TargetAdd('libpandagl.dll', input='libpandafx.dll')
TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS)