Skip to content

Commit cf4f98c

Browse files
committed
Merge pull request #431 from johnhaddon/3delightConfig
SConstruct : Fixed compiler used for 3delight config checks.
2 parents 62ecbbc + 2849634 commit cf4f98c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

SConstruct

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,15 +1685,15 @@ if doConfigure :
16851685
riPythonSources.remove( "src/IECoreRI/bindings/PTCParticleReaderBinding.cpp" )
16861686
riPythonSources.remove( "src/IECoreRI/bindings/PTCParticleWriterBinding.cpp" )
16871687

1688-
if c.CheckFunc( "RiObjectBeginV" ) :
1688+
if c.CheckFunc( "RiObjectBeginV", language="CXX" ) :
16891689

16901690
riEnv.Append( CPPFLAGS = [ "-DIECORERI_WITH_OBJECTBEGINV" ] )
16911691

1692-
if c.CheckFunc( "RiProceduralV" ) :
1692+
if c.CheckFunc( "RiProceduralV", language="CXX" ) :
16931693

16941694
riEnv.Append( CPPFLAGS = [ "-DIECORERI_WITH_PROCEDURALV" ] )
16951695

1696-
if haveDelight and c.CheckCXXHeader( "sx.h" ) and c.CheckFunc( "SxGetParameter" ) :
1696+
if haveDelight and c.CheckCXXHeader( "sx.h" ) and c.CheckFunc( "SxGetParameter", language="CXX" ) :
16971697

16981698
riEnv.Append( CPPFLAGS = "-DIECORERI_WITH_SX" )
16991699
riPythonModuleEnv.Append( CPPFLAGS = "-DIECORERI_WITH_SX" )
@@ -1709,7 +1709,7 @@ if doConfigure :
17091709

17101710
sys.stderr.write( "WARNING : Supported Sx API version not found - not building SXRenderer. Use 3delight 9.0.36 or later.\n" )
17111711

1712-
if haveDelight and c.CheckCXXHeader( "gx.h" ) and c.CheckFunc( "GxGetGeometry" ) :
1712+
if haveDelight and c.CheckCXXHeader( "gx.h" ) and c.CheckFunc( "GxGetGeometry", language="CXX" ) :
17131713

17141714
riEnv.Append( CPPFLAGS = "-DIECORERI_WITH_GX" )
17151715
riPythonModuleEnv.Append( CPPFLAGS = "-DIECORERI_WITH_GX" )

0 commit comments

Comments
 (0)