forked from bartvdbraak/blender
Audaspace: Buildsystem update after Ton destroyed building with scons and cmake, also including a patch by freakabcd fixing some missing python include paths.
This commit is contained in:
parent
db38a7f2cc
commit
8d7204ac04
@ -63,7 +63,8 @@ ENDIF(WITH_SNDFILE)
|
|||||||
IF(WITH_PYTHON)
|
IF(WITH_PYTHON)
|
||||||
SET(INC ${INC} Python ${PYTHON_INC})
|
SET(INC ${INC} Python ${PYTHON_INC})
|
||||||
FILE(GLOB PYTHONSRC Python/*.cpp)
|
FILE(GLOB PYTHONSRC Python/*.cpp)
|
||||||
ADD_DEFINITIONS(-DWITH_PYTHON)
|
ELSE(WITH_PYTHON)
|
||||||
|
ADD_DEFINITIONS(-DDISABLE_PYTHON)
|
||||||
ENDIF(WITH_PYTHON)
|
ENDIF(WITH_PYTHON)
|
||||||
|
|
||||||
SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
|
SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
|
||||||
|
@ -39,7 +39,8 @@ if env['WITH_BF_SNDFILE']:
|
|||||||
if env['WITH_BF_PYTHON']:
|
if env['WITH_BF_PYTHON']:
|
||||||
sources += env.Glob('Python/*.cpp')
|
sources += env.Glob('Python/*.cpp')
|
||||||
incs += ' Python ' + env['BF_PYTHON_INC']
|
incs += ' Python ' + env['BF_PYTHON_INC']
|
||||||
defs.append('WITH_PYTHON')
|
else:
|
||||||
|
defs.append('DISABLE_PYTHON')
|
||||||
|
|
||||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||||
incs += ' ' + env['BF_PTHREADS_INC']
|
incs += ' ' + env['BF_PTHREADS_INC']
|
||||||
|
@ -30,6 +30,7 @@ SET(INC
|
|||||||
../../makesdna
|
../../makesdna
|
||||||
../../makesrna
|
../../makesrna
|
||||||
../../windowmanager
|
../../windowmanager
|
||||||
|
${PYTHON_INC}
|
||||||
)
|
)
|
||||||
|
|
||||||
BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")
|
BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")
|
||||||
|
@ -30,6 +30,7 @@ SET(INC
|
|||||||
../../makesrna
|
../../makesrna
|
||||||
../../windowmanager
|
../../windowmanager
|
||||||
../../../../intern/audaspace/intern
|
../../../../intern/audaspace/intern
|
||||||
|
${PYTHON_INC}
|
||||||
)
|
)
|
||||||
|
|
||||||
BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
|
BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
|
||||||
|
@ -31,6 +31,7 @@ SET(INC
|
|||||||
../../makesrna
|
../../makesrna
|
||||||
../../windowmanager
|
../../windowmanager
|
||||||
../../../../intern/audaspace/intern
|
../../../../intern/audaspace/intern
|
||||||
|
${PYTHON_INC}
|
||||||
)
|
)
|
||||||
|
|
||||||
BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")
|
BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")
|
||||||
|
Loading…
Reference in New Issue
Block a user