forked from bartvdbraak/blender
Update cmake & scons scripts to use new Collada includes for building with latest blender collada updates
This commit is contained in:
parent
76fd7a90ad
commit
ac2d935a32
@ -43,7 +43,8 @@ if(APPLE)
|
||||
${OPENCOLLADA_INC}/COLLADAStreamWriter
|
||||
${OPENCOLLADA_INC}/COLLADABaseUtils
|
||||
${OPENCOLLADA_INC}/COLLADAFramework
|
||||
${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader
|
||||
${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader
|
||||
${OPENCOLLADA_INC}/GeneratedSaxParser
|
||||
)
|
||||
else()
|
||||
list(APPEND INC
|
||||
|
@ -33,7 +33,7 @@ defs = []
|
||||
# TODO sanitize inc path building
|
||||
# relative paths to include dirs, space-separated, string
|
||||
if env['OURPLATFORM']=='darwin':
|
||||
incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
|
||||
incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
|
||||
else:
|
||||
incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user