Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / makesrna / intern / SConscript
index 569f054..1a3687a 100644 (file)
@@ -6,7 +6,7 @@ def normpath(path):
        return os.path.abspath(os.path.normpath(path))
 
 Import ('env')
-cflags = ['-Wall']
+cflags = '-Wall'
 defines = []
 root_build_dir=normpath(env['BF_BUILDDIR'])
 
@@ -62,18 +62,6 @@ if env['WITH_BF_GAMEENGINE']:
 if env['WITH_BF_FFTW3']:
     defs.append('FFTW3=1')
 
-if env['WITH_BF_SDL']:
-    defs.append('WITH_SDL')
-
-if env['WITH_BF_OPENAL']:
-    defs.append('WITH_OPENAL')
-
-if env['WITH_BF_JACK']:
-    defs.append('WITH_JACK')
-
-if env['BF_UNIT_TEST']:
-       defs.append('UNIT_TEST')
-
 makesrna_tool.Append(CPPDEFINES=defs)
 
 makesrna_tool.Append (CPPPATH = Split(incs))
@@ -99,10 +87,6 @@ if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
 
 makesrna_tool.Append (LIBPATH = libdir)
 
-makesrna_tool.Append( CFLAGS = env['CFLAGS'])
-makesrna_tool.Append( CCFLAGS = env['CCFLAGS'])
-makesrna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
-
 if env['BF_PROFILE']:
        makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])