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

makepanda: Update for building against newer OpenEXR on non-Windows

Browse Source
This commit is contained in:
rdb 2022-03-01 13:21:35 +01:00
parent 583c9f1857
commit 2f3561a48e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
makepanda/makepanda.py
View File

@ -867,7 +867,6 @@ if (COMPILER=="GCC"):
SmartPkgEnable("OPENAL", "openal", ("openal"), "AL/al.h", framework = "OpenAL")
SmartPkgEnable("SQUISH", "", ("squish"), "squish.h")
SmartPkgEnable("TIFF", "libtiff-4", ("tiff"), "tiff.h")
SmartPkgEnable("OPENEXR", "OpenEXR", ("IlmImf", "Imath", "Half", "Iex", "IexMath", "IlmThread"), ("OpenEXR", "Imath", "OpenEXR/ImfOutputFile.h"))
SmartPkgEnable("VRPN", "", ("vrpn", "quat"), ("vrpn", "quat.h", "vrpn/vrpn_Types.h"))
SmartPkgEnable("BULLET", "bullet", ("BulletSoftBody", "BulletDynamics", "BulletCollision", "LinearMath"), ("bullet", "bullet/btBulletDynamicsCommon.h"))
SmartPkgEnable("VORBIS", "vorbisfile",("vorbisfile", "vorbis", "ogg"), ("ogg/ogg.h", "vorbis/vorbisfile.h"))
@ -893,6 +892,23 @@ if (COMPILER=="GCC"):
for ffmpeg_lib in ffmpeg_libs:
LibName("FFMPEG", "-Wl,--exclude-libs,%s.a" % (ffmpeg_lib))
if not PkgSkip("OPENEXR"):
# OpenEXR libraries have different names depending on the version.
openexr_libdir = os.path.join(GetThirdpartyDir(), "openexr", "lib")
openexr_incs = ("OpenEXR", "Imath", "OpenEXR/ImfOutputFile.h")
if os.path.isfile(os.path.join(openexr_libdir, "libOpenEXR-3_1.a")):
SmartPkgEnable("OPENEXR", "", ("OpenEXR-3_1", "IlmThread-3_1", "Imath-3_1", "Iex-3_1"), openexr_incs)
if os.path.isfile(os.path.join(openexr_libdir, "libOpenEXR-3_0.a")):
SmartPkgEnable("OPENEXR", "", ("OpenEXR-3_0", "IlmThread-3_0", "Imath-3_0", "Iex-3_0"), openexr_incs)
elif os.path.isfile(os.path.join(openexr_libdir, "libOpenEXR.a")):
SmartPkgEnable("OPENEXR", "", ("OpenEXR", "IlmThread", "Imath", "Iex"), openexr_incs)
elif os.path.isfile(os.path.join(openexr_libdir, "libIlmImf.a")):
SmartPkgEnable("OPENEXR", "", ("IlmImf", "Imath", "Half", "Iex", "IexMath", "IlmThread"), openexr_incs)
else:
# Find it in the system, preferably using pkg-config, otherwise
# using the OpenEXR 3 naming scheme.
SmartPkgEnable("OPENEXR", "OpenEXR", ("OpenEXR", "IlmThread", "Imath", "Iex"), openexr_incs)
if GetTarget() != "darwin":
for fcollada_lib in fcollada_libs:
LibName("FCOLLADA", "-Wl,--exclude-libs,lib%s.a" % (fcollada_lib))
@ -924,6 +940,9 @@ if (COMPILER=="GCC"):
LibName("OPENEXR", "-Wl,--exclude-libs,libIlmImfUtil.a")
LibName("OPENEXR", "-Wl,--exclude-libs,libIlmThread.a")
LibName("OPENEXR", "-Wl,--exclude-libs,libImath.a")
LibName("OPENEXR", "-Wl,--exclude-libs,libOpenEXR.a")
LibName("OPENEXR", "-Wl,--exclude-libs,libOpenEXRCore.a")
LibName("OPENEXR", "-Wl,--exclude-libs,libOpenEXRUtil.a")
if not PkgSkip("VORBIS"):
LibName("VORBIS", "-Wl,--exclude-libs,libogg.a")