AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-09 13:50:05 +00:00
Code Issues Releases Wiki Activity

Fix build script on Linux when not building ptex

Browse Source 
The build script assumed that we always had ZLIB, but we only add it when we
build ptex.  Instead of removing it on Linux, we now only add it when we need
to on non-Linux platforms.
This commit is contained in:
George ElKoura 2019-03-04 22:34:12 -08:00
parent 6ff680f34e
commit 2f39150a39
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_scripts/build_osd.py
View File

@ -905,17 +905,17 @@ if extraPaths:
requiredDependencies = [GLEW, GLFW]
if context.buildPtex:
requiredDependencies += [ZLIB, PTEX]
# Assume zlib already exists on Linux platforms and don't build
# our own. This avoids potential issues where a host application
# loads an older version of zlib than the one we'd build and link
# our libraries against.
if not Linux():
requiredDependencies += [ZLIB]
requiredDependencies += [PTEX]
if context.buildTBB:
requiredDependencies += [TBB]
# Assume zlib already exists on Linux platforms and don't build
# our own. This avoids potential issues where a host application
# loads an older version of zlib than the one we'd build and link
# our libraries against.
if Linux():
requiredDependencies.remove(ZLIB)
dependenciesToBuild = []