build: Rename CONFIG.ENV to CONFIG.CCFLAGS
Signed-off-by: Anna Schumaker <schumaker.anna@gmail.com>
This commit is contained in:
parent
3d1e8872d3
commit
b50aaa8d9e
10
config
10
config
|
@ -8,11 +8,11 @@ CONFIG_DEBUG = True
|
||||||
|
|
||||||
|
|
||||||
# Set up default environment
|
# Set up default environment
|
||||||
CONFIG_ENV = [ "-O2" ]
|
CONFIG_CCFLAGS = [ "-O2" ]
|
||||||
if CONFIG_DEBUG == True:
|
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(CPPPATH = os.path.abspath("include"))
|
||||||
env.Append(CXXCOMSTR = "C++ $TARGET")
|
env.Append(CXXCOMSTR = "C++ $TARGET")
|
||||||
env.Append(LINKCOMSTR = "Linking $TARGET")
|
env.Append(LINKCOMSTR = "Linking $TARGET")
|
||||||
|
@ -24,14 +24,14 @@ class Config:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.VERSION = CONFIG_VERSION
|
self.VERSION = CONFIG_VERSION
|
||||||
self.DEBUG = CONFIG_DEBUG
|
self.DEBUG = CONFIG_DEBUG
|
||||||
self.ENV = CONFIG_ENV
|
self.CCFLAGS = CONFIG_CCFLAGS
|
||||||
self.reset();
|
self.reset();
|
||||||
|
|
||||||
def package(self, name):
|
def package(self, name):
|
||||||
env.ParseConfig("pkg-config --cflags --libs %s" % name)
|
env.ParseConfig("pkg-config --cflags --libs %s" % name)
|
||||||
|
|
||||||
def reconfigure(self):
|
def reconfigure(self):
|
||||||
env.Replace( CCFLAGS = self.ENV )
|
env.Replace( CCFLAGS = self.CCFLAGS )
|
||||||
if self.TEST == True:
|
if self.TEST == True:
|
||||||
env.Append( CCFLAGS = [ "-DCONFIG_TEST" ])
|
env.Append( CCFLAGS = [ "-DCONFIG_TEST" ])
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
Import("CONFIG")
|
Import("CONFIG")
|
||||||
|
|
||||||
if CONFIG.DEBUG:
|
if CONFIG.DEBUG:
|
||||||
CONFIG.ENV += [ "-DCONFIG_VERSION='\"%s-debug\"'" % CONFIG.VERSION ]
|
CONFIG.CCFLAGS += [ "-DCONFIG_VERSION='\"%s-debug\"'" % CONFIG.VERSION ]
|
||||||
else:
|
else:
|
||||||
CONFIG.ENV += [ "-DCONFIG_VERSION='\"%s\"'" % CONFIG.VERSION ]
|
CONFIG.CCFLAGS += [ "-DCONFIG_VERSION='\"%s\"'" % CONFIG.VERSION ]
|
||||||
|
|
||||||
CONFIG.reconfigure()
|
CONFIG.reconfigure()
|
||||||
|
|
Loading…
Reference in New Issue