mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-09-19 14:20:00 +00:00
Removed GLEW from build_osd.py
This commit is contained in:
parent
d00f96a941
commit
548891203d
@ -492,42 +492,6 @@ def InstallTBB_LinuxOrMacOS(context, force, buildArgs):
|
||||
TBB = Dependency("TBB", InstallTBB, "include/tbb/tbb.h")
|
||||
|
||||
|
||||
############################################################
|
||||
# GLEW
|
||||
|
||||
if Windows():
|
||||
GLEW_URL = "https://downloads.sourceforge.net/project/glew/glew/2.0.0/glew-2.0.0-win32.zip"
|
||||
else:
|
||||
# Important to get source package from this URL and NOT github. This package
|
||||
# contains pre-generated code that the github repo does not.
|
||||
GLEW_URL = "https://downloads.sourceforge.net/project/glew/glew/2.0.0/glew-2.0.0.tgz"
|
||||
|
||||
def InstallGLEW(context, force, buildArgs):
|
||||
if Windows():
|
||||
InstallGLEW_Windows(context, force)
|
||||
elif Linux() or MacOS():
|
||||
InstallGLEW_LinuxOrMacOS(context, force, buildArgs)
|
||||
|
||||
def InstallGLEW_Windows(context, force):
|
||||
with CurrentWorkingDirectory(DownloadURL(GLEW_URL, context, force)):
|
||||
# On Windows, we install headers and pre-built binaries per
|
||||
# https://glew.sourceforge.net/install.html
|
||||
# Note that we are installing just the shared library. This is required
|
||||
# by the OpenSubdiv build; if the static library is present, that one
|
||||
# will be used and that causes errors with OpenSubdiv.
|
||||
CopyFiles(context, "bin\\Release\\x64\\glew32.dll", "bin")
|
||||
CopyFiles(context, "lib\\Release\\x64\\glew32.lib", "lib")
|
||||
CopyDirectory(context, "include\\GL", "include\\GL")
|
||||
|
||||
def InstallGLEW_LinuxOrMacOS(context, force, buildArgs):
|
||||
with CurrentWorkingDirectory(DownloadURL(GLEW_URL, context, force)):
|
||||
Run('make GLEW_DEST="{instDir}" -j{procs} {buildArgs} install'
|
||||
.format(instDir=context.instDir,
|
||||
procs=context.numJobs,
|
||||
buildArgs=" ".join(buildArgs)))
|
||||
|
||||
GLEW = Dependency("GLEW", InstallGLEW, "include/GL/glew.h")
|
||||
|
||||
############################################################
|
||||
# GLFW
|
||||
|
||||
@ -655,13 +619,12 @@ def InstallOpenSubdiv(context, force, buildArgs):
|
||||
# NO_OPENGL
|
||||
# NO_METAL
|
||||
# NO_GLTESTS
|
||||
# NO_GLEW
|
||||
# NO_GLFW
|
||||
# NO_GLFW_X11
|
||||
|
||||
# OpenSubdiv's FindGLEW module won't look in CMAKE_PREFIX_PATH, so
|
||||
# we need to explicitly specify GLEW_LOCATION here.
|
||||
extraArgs.append('-DGLEW_LOCATION="{instDir}"'
|
||||
.format(instDir=context.instDir))
|
||||
# OpenSubdiv's FindGLFW module won't look in CMAKE_PREFIX_PATH, so
|
||||
# we need to explicitly specify GLFW_LOCATION here.
|
||||
extraArgs.append('-DGLFW_LOCATION="{instDir}"'
|
||||
.format(instDir=context.instDir))
|
||||
|
||||
@ -936,7 +899,7 @@ if extraPaths:
|
||||
|
||||
# Determine list of dependencies that are required based on options
|
||||
# user has selected.
|
||||
requiredDependencies = [GLEW, GLFW]
|
||||
requiredDependencies = [GLFW]
|
||||
|
||||
if context.buildPtex:
|
||||
# Assume zlib already exists on Linux platforms and don't build
|
||||
|
Loading…
Reference in New Issue
Block a user