From 9bb21deec624c7005f475ca7d2fa7c2e3ebf1184 Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Mon, 16 Aug 2010 18:50:59 +0000 Subject: [PATCH] Audaspace: Further fixes. --- intern/audaspace/intern/AUD_C-API.cpp | 10 +++++----- source/blender/editors/sound/SConscript | 2 +- source/blender/editors/space_graph/SConscript | 2 +- source/blender/editors/space_sequencer/SConscript | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index 3393ef75472..304c5657364 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -23,6 +23,11 @@ * ***** END LGPL LICENSE BLOCK ***** */ +// needed for INT64_C +#ifndef __STDC_CONSTANT_MACROS +#define __STDC_CONSTANT_MACROS +#endif + #ifndef DISABLE_PYTHON #include "AUD_PyAPI.h" @@ -30,11 +35,6 @@ Device* g_device; bool g_pyinitialized = false; #endif -// needed for INT64_C -#ifndef __STDC_CONSTANT_MACROS -#define __STDC_CONSTANT_MACROS -#endif - #include #include #include diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript index 8b628f7b223..5468d4313ae 100644 --- a/source/blender/editors/sound/SConscript +++ b/source/blender/editors/sound/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' incs += ' ../../makesrna' -incs += ' #/intern/audaspace/intern' +incs += ' #/intern/audaspace/intern ' incs += env['BF_PYTHON_INC'] defs = [] diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript index 2345ed2b484..69e01740c05 100644 --- a/source/blender/editors/space_graph/SConscript +++ b/source/blender/editors/space_graph/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/audaspace/intern' +incs += ' #/intern/audaspace/intern ' incs += env['BF_PYTHON_INC'] env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), [], libtype=['core'], priority=[50] ) diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index a74ccafd470..2ea24198d93 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna' -incs += ' #/intern/audaspace/intern' +incs += ' #/intern/audaspace/intern ' incs += env['BF_PYTHON_INC'] env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[100] )