Skip to content

Commit

Permalink
SConstruct : Add libraries for Cycles
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmehl committed Apr 2, 2024
1 parent 06c0985 commit 5b86a01
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Features
- SelectionTool : Added select mode plug. When set to anything except `Standard` using the SelectionTool causes the actual scene location selected to potentially be modified from the originally selected location. Selection modifiers work identically for deselection. Currently, two selectors are implemented :
- USD Kind : When selecting, the first ancestor location with a `usd:kind` attribute matching the chosen list of USD Kind will ultimately be selected. USD's Kind Registry includes `Assembly`, `Component`, `Group`, `Model` and `SubComponent` by default and can be extended via USD startup scripts.
- Shader Assignment : When selecting, the first ancestor location with a renderable and direct (not inherited) shader attribute will ultimately be selected. This can be used to select either surface or displacement shaders.
- Cycles : Added support for CUDA and Optix devices on Windows [^1].

Fixes
-----
Expand Down
9 changes: 7 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ libraries = {
"LIBS" : [
"Gaffer", "GafferScene", "GafferDispatch", "GafferBindings", "GafferCycles", "IECoreScene",
"cycles_session", "cycles_scene", "cycles_graph", "cycles_bvh", "cycles_device", "cycles_kernel", "cycles_kernel_osl",
"cycles_integrator", "cycles_util", "cycles_subd", "extern_sky",
"cycles_integrator", "cycles_util", "cycles_subd", "extern_sky", "extern_cuew",
"OpenImageIO$OIIO_LIB_SUFFIX", "OpenImageIO_Util$OIIO_LIB_SUFFIX", "oslexec$OSL_LIB_SUFFIX", "openvdb$VDB_LIB_SUFFIX",
"oslquery$OSL_LIB_SUFFIX", "Alembic", "osdCPU", "OpenColorIO$OCIO_LIB_SUFFIX", "embree4", "Iex", "openpgl",
],
Expand Down Expand Up @@ -1503,11 +1503,16 @@ for library in ( "GafferUI", ) :

if env["PLATFORM"] == "win32" :

for library in ( "Gaffer", ) :
for library in ( "Gaffer", "GafferCycles", ) :

libraries[library].setdefault( "envAppends", {} )
libraries[library]["envAppends"].setdefault( "LIBS", [] ).extend( [ "Advapi32" ] )

for library in ( "GafferCycles", ) :

libraries[library].setdefault( "pythonEnvAppends", {} )
libraries[library]["pythonEnvAppends"].setdefault( "LIBS", [] ).extend( [ "Advapi32" ] )

else :

libraries["GafferCycles"]["envAppends"]["LIBS"].extend( [ "dl" ] )
Expand Down

0 comments on commit 5b86a01

Please sign in to comment.