diff --git a/config b/config index 273b3934..ae05fb0c 100644 --- a/config +++ b/config @@ -8,11 +8,11 @@ CONFIG_DEBUG = True # Set up default environment -CONFIG_ENV = [ "-O2" ] +CONFIG_CCFLAGS = [ "-O2" ] if CONFIG_DEBUG == True: - CONFIG_ENV = [ "-Wall", "-Werror", "-g", "-DCONFIG_DEBUG" ] + CONFIG_CCFLAGS = [ "-Wall", "-Werror", "-g", "-DCONFIG_DEBUG" ] -env = Environment( CCFLAGS = CONFIG_ENV ) +env = Environment( CCFLAGS = CONFIG_CCFLAGS ) env.Append(CPPPATH = os.path.abspath("include")) env.Append(CXXCOMSTR = "C++ $TARGET") env.Append(LINKCOMSTR = "Linking $TARGET") @@ -24,14 +24,14 @@ class Config: def __init__(self): self.VERSION = CONFIG_VERSION self.DEBUG = CONFIG_DEBUG - self.ENV = CONFIG_ENV + self.CCFLAGS = CONFIG_CCFLAGS self.reset(); def package(self, name): env.ParseConfig("pkg-config --cflags --libs %s" % name) def reconfigure(self): - env.Replace( CCFLAGS = self.ENV ) + env.Replace( CCFLAGS = self.CCFLAGS ) if self.TEST == True: env.Append( CCFLAGS = [ "-DCONFIG_TEST" ]) diff --git a/include/Sconscript b/include/Sconscript index cc356d82..c67ea6a0 100644 --- a/include/Sconscript +++ b/include/Sconscript @@ -2,8 +2,8 @@ Import("CONFIG") if CONFIG.DEBUG: - CONFIG.ENV += [ "-DCONFIG_VERSION='\"%s-debug\"'" % CONFIG.VERSION ] + CONFIG.CCFLAGS += [ "-DCONFIG_VERSION='\"%s-debug\"'" % CONFIG.VERSION ] else: - CONFIG.ENV += [ "-DCONFIG_VERSION='\"%s\"'" % CONFIG.VERSION ] + CONFIG.CCFLAGS += [ "-DCONFIG_VERSION='\"%s\"'" % CONFIG.VERSION ] CONFIG.reconfigure()