TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2019-11-28 22:28:31 +01:00
commit 1ea8c9f299
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BACKERS.md
View File

@ -23,12 +23,14 @@ This is a list of all the people who are contributing financially to Panda3D. I
* Sam Edwards * Sam Edwards
* Max Voss * Max Voss
* Will Nielsen
## Enthusiasts ## Enthusiasts
![Benefactors](https://opencollective.com/panda3d/tiers/enthusiast.svg?avatarHeight=48&width=600) ![Benefactors](https://opencollective.com/panda3d/tiers/enthusiast.svg?avatarHeight=48&width=600)
* Eric Thomson * Eric Thomson
* Kyle Roach
## Backers ## Backers

2
direct/src/dist/FreezeTool.py vendored
View File

@ -785,7 +785,7 @@ class Freezer:
# already-imported modules. (Some of them might do their own # already-imported modules. (Some of them might do their own
# special path mangling.) # special path mangling.)
for moduleName, module in list(sys.modules.items()): 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__')) path = list(getattr(module, '__path__'))
if path: if path:
modulefinder.AddPackagePath(moduleName, path[0]) modulefinder.AddPackagePath(moduleName, path[0])

7
makepanda/makepanda.py
View File

@ -799,6 +799,13 @@ if (COMPILER=="GCC"):
SmartPkgEnable("JPEG", "", ("jpeg"), "jpeglib.h") SmartPkgEnable("JPEG", "", ("jpeg"), "jpeglib.h")
SmartPkgEnable("PNG", "libpng", ("png"), "png.h", tool = "libpng-config") 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 not PkgSkip("FFMPEG"):
if GetTarget() == "darwin": if GetTarget() == "darwin":
LibName("FFMPEG", "-framework VideoDecodeAcceleration") LibName("FFMPEG", "-framework VideoDecodeAcceleration")