diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/SConscript | 42 | ||||
| -rw-r--r-- | intern/ghost/SConscript | 74 |
2 files changed, 58 insertions, 58 deletions
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index 045ae5dc83b..7230bffebdc 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -7,40 +7,40 @@ incs = '. intern FX SRC ' + env['BF_PTHREADS_INC'] + ' ' + env['BF_LIBSAMPLERATE defs = [] if env['WITH_BF_FFMPEG']: - sources += env.Glob('ffmpeg/*.cpp') - incs += ' ffmpeg ' + env['BF_FFMPEG_INC'] - defs.append('WITH_FFMPEG') + sources += env.Glob('ffmpeg/*.cpp') + incs += ' ffmpeg ' + env['BF_FFMPEG_INC'] + defs.append('WITH_FFMPEG') if env['WITH_BF_SDL']: - sources += env.Glob('SDL/*.cpp') - incs += ' SDL ' + env['BF_SDL_INC'] - defs.append('WITH_SDL') + sources += env.Glob('SDL/*.cpp') + incs += ' SDL ' + env['BF_SDL_INC'] + defs.append('WITH_SDL') if env['WITH_BF_OPENAL']: - sources += env.Glob('OpenAL/*.cpp') - incs += ' OpenAL ' + env['BF_OPENAL_INC'] - defs.append('WITH_OPENAL') + sources += env.Glob('OpenAL/*.cpp') + incs += ' OpenAL ' + env['BF_OPENAL_INC'] + defs.append('WITH_OPENAL') if env['WITH_BF_JACK']: - sources += env.Glob('jack/*.cpp') - incs += ' jack ' + env['BF_JACK_INC'] - defs.append('WITH_JACK') + sources += env.Glob('jack/*.cpp') + incs += ' jack ' + env['BF_JACK_INC'] + defs.append('WITH_JACK') if env['WITH_BF_SNDFILE']: - sources += env.Glob('sndfile/*.cpp') - incs += ' sndfile ' + env['BF_SNDFILE_INC'] - defs.append('WITH_SNDFILE') + sources += env.Glob('sndfile/*.cpp') + incs += ' sndfile ' + env['BF_SNDFILE_INC'] + defs.append('WITH_SNDFILE') #if env['WITH_BF_FFTW3']: -# sources += env.Glob('fftw/*.cpp') -# incs += ' fftw ' + env['BF_FFTW3_INC'] -# defs.append('WITH_FFTW3') +# sources += env.Glob('fftw/*.cpp') +# incs += ' fftw ' + env['BF_FFTW3_INC'] +# defs.append('WITH_FFTW3') if env['WITH_BF_PYTHON']: - sources += env.Glob('Python/*.cpp') - incs += ' Python ' + env['BF_PYTHON_INC'] + sources += env.Glob('Python/*.cpp') + incs += ' Python ' + env['BF_PYTHON_INC'] else: - defs.append('DISABLE_PYTHON') + defs.append('DISABLE_PYTHON') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 2e2e19bf01f..93c8ebb5202 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -8,56 +8,56 @@ window_system = env['OURPLATFORM'] sources = env.Glob('intern/*.cpp') if window_system == 'darwin': - sources += env.Glob('intern/*.mm') + sources += env.Glob('intern/*.mm') pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window', 'GHOST_DropTarget'] defs=['_USE_MATH_DEFINES'] if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): - for f in pf: - try: - sources.remove('intern' + os.sep + f + 'Win32.cpp') - sources.remove('intern' + os.sep + f + 'Carbon.cpp') - except ValueError: - pass + for f in pf: + try: + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'Carbon.cpp') + except ValueError: + pass elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): - for f in pf: - try: - sources.remove('intern' + os.sep + f + 'X11.cpp') - sources.remove('intern' + os.sep + f + 'Carbon.cpp') - except ValueError: - pass + for f in pf: + try: + sources.remove('intern' + os.sep + f + 'X11.cpp') + sources.remove('intern' + os.sep + f + 'Carbon.cpp') + except ValueError: + pass elif window_system == 'darwin': - if env['WITH_GHOST_COCOA']: - if env['WITH_BF_QUICKTIME']: - defs.append('WITH_QUICKTIME') - if env['USE_QTKIT']: - defs.append('USE_QTKIT') - for f in pf: - try: - sources.remove('intern' + os.sep + f + 'Win32.cpp') - sources.remove('intern' + os.sep + f + 'X11.cpp') - sources.remove('intern' + os.sep + f + 'Carbon.cpp') - except ValueError: - pass - else: - for f in pf: - try: - sources.remove('intern' + os.sep + f + 'Win32.cpp') - sources.remove('intern' + os.sep + f + 'X11.cpp') - sources.remove('intern' + os.sep + f + 'Cocoa.mm') - except ValueError: - pass + if env['WITH_GHOST_COCOA']: + if env['WITH_BF_QUICKTIME']: + defs.append('WITH_QUICKTIME') + if env['USE_QTKIT']: + defs.append('USE_QTKIT') + for f in pf: + try: + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'X11.cpp') + sources.remove('intern' + os.sep + f + 'Carbon.cpp') + except ValueError: + pass + else: + for f in pf: + try: + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'X11.cpp') + sources.remove('intern' + os.sep + f + 'Cocoa.mm') + except ValueError: + pass else: - print "Unknown window system specified." - Exit() + print "Unknown window system specified." + Exit() if env['BF_GHOST_DEBUG']: - defs.append('BF_GHOST_DEBUG') + defs.append('BF_GHOST_DEBUG') incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): - incs = env['BF_WINTAB_INC'] + ' ' + incs + incs = env['BF_WINTAB_INC'] + ' ' + incs env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )
\ No newline at end of file |