Skip to content
Permalink
Browse files

Merge branch 'release/1.10.x'

  • Loading branch information
rdb committed Nov 28, 2019
2 parents 23f779e + d8481e7 commit 1ea8c9f299360345cc251d4e1e14aab1e0ac30f9
Showing with 10 additions and 1 deletion.
  1. +2 −0 BACKERS.md
  2. +1 −1 direct/src/dist/FreezeTool.py
  3. +7 −0 makepanda/makepanda.py
@@ -23,12 +23,14 @@ This is a list of all the people who are contributing financially to Panda3D. I

* Sam Edwards
* Max Voss
* Will Nielsen

## Enthusiasts

![Benefactors](https://opencollective.com/panda3d/tiers/enthusiast.svg?avatarHeight=48&width=600)

* Eric Thomson
* Kyle Roach

## Backers

@@ -785,7 +785,7 @@ def __init__(self, previous = None, debugLevel = 0,
# already-imported modules. (Some of them might do their own
# special path mangling.)
for moduleName, module in list(sys.modules.items()):
if module and hasattr(module, '__path__'):
if module and getattr(module, '__path__', None) is not None:
path = list(getattr(module, '__path__'))
if path:
modulefinder.AddPackagePath(moduleName, path[0])
@@ -799,6 +799,13 @@ def parseopts(args):
SmartPkgEnable("JPEG", "", ("jpeg"), "jpeglib.h")
SmartPkgEnable("PNG", "libpng", ("png"), "png.h", tool = "libpng-config")

# Copy freetype libraries to be specified after harfbuzz libraries as well,
# because there's a circular dependency between the two libraries.
if not PkgSkip("FREETYPE") and not PkgSkip("HARFBUZZ"):
for (opt, name) in LIBNAMES:
if opt == "FREETYPE":
LibName("HARFBUZZ", name)

if not PkgSkip("FFMPEG"):
if GetTarget() == "darwin":
LibName("FFMPEG", "-framework VideoDecodeAcceleration")

0 comments on commit 1ea8c9f

Please sign in to comment.
You can’t perform that action at this time.