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

use WebKit to provide NPAPI on OSX

Browse Source
This commit is contained in:
David Rose 2012-02-12 18:43:25 +00:00
parent 90eac01be0
commit 59c0a3c0e4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makepanda/makepanda.py
View File

@ -646,7 +646,10 @@ if (COMPILER=="LINUX"):
SmartPkgEnable("WX", tool = "wx-config") SmartPkgEnable("WX", tool = "wx-config")
SmartPkgEnable("FLTK", "", ("fltk"), ("Fl/Fl.H"), tool = "fltk-config") SmartPkgEnable("FLTK", "", ("fltk"), ("Fl/Fl.H"), tool = "fltk-config")
if (RUNTIME): if (RUNTIME):
if (sys.platform.startswith("freebsd")): if (sys.platform == 'darwin'):
SmartPkgEnable("NPAPI", "", ("WebKit"), ("npapi.h"), framework = "WebKit")
IncDirectory("NPAPI", "/System/Library/Frameworks/WebKit.framework/Headers")
elif (sys.platform.startswith("freebsd")):
SmartPkgEnable("NPAPI", "mozilla-plugin", (), ("libxul/stable", "libxul/stable/npapi.h", "nspr/prtypes.h", "nspr")) SmartPkgEnable("NPAPI", "mozilla-plugin", (), ("libxul/stable", "libxul/stable/npapi.h", "nspr/prtypes.h", "nspr"))
else: else:
SmartPkgEnable("NPAPI", "mozilla-plugin", (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr*/prtypes.h", "nspr*")) SmartPkgEnable("NPAPI", "mozilla-plugin", (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr*/prtypes.h", "nspr*"))
@ -663,8 +666,11 @@ if (COMPILER=="LINUX"):
if (RUNTIME): if (RUNTIME):
# For the runtime, all packages are required # For the runtime, all packages are required
for pkg in ["OPENSSL", "ZLIB", "NPAPI", "JPEG", "PNG"]: for pkg in ["OPENSSL", "ZLIB", "NPAPI", "JPEG", "PNG"]:
skips = []
if (pkg in PkgListGet() and PkgSkip(pkg)==1): if (pkg in PkgListGet() and PkgSkip(pkg)==1):
exit("Runtime must be compiled with OpenSSL, ZLib, NPAPI, JPEG and PNG support!") skips.append(pkg)
if skips:
exit("Runtime must be compiled with OpenSSL, ZLib, NPAPI, JPEG and PNG support (missing %s)" % (', '.join(skips)))
if (not RUNTIME and not LocateBinary("bison")): if (not RUNTIME and not LocateBinary("bison")):
exit("Could not locate bison!") exit("Could not locate bison!")