diff --git a/buildtools/config.py b/buildtools/config.py index 9836ff5b..299d4cf7 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -205,10 +205,7 @@ class Configuration(object): elif os.name == 'posix' or self.COMPILER == 'mingw32': self.Verify_WX_CONFIG() self.includes += ['include'] - self.defines = [ - #('NDEBUG',), # using a 1-tuple makes it do an undef - ('SIP_MODULE_NAME', 'wx.siplib'), - ('SIP_MODULE_BASENAME', 'siplib'), + self.defines = [ #('NDEBUG',), # using a 1-tuple makes it do an undef ] self.libdirs = [] self.libs = [] diff --git a/wscript b/wscript index a67cfd73..1e6ce538 100644 --- a/wscript +++ b/wscript @@ -292,6 +292,13 @@ def configure(conf): conf.env.CFLAGS_WXPY.append('-UNDEBUG') conf.env.CXXFLAGS_WXPY.append('-UNDEBUG') + # set the name of our siplib module + conf.env.CFLAGS_WXPY.append('-DSIP_MODULE_NAME=wx.siplib') + conf.env.CXXFLAGS_WXPY.append('-DSIP_MODULE_NAME=wx.siplib') + + conf.env.CFLAGS_WXPY.append('-DSIP_MODULE_BASENAME=siplib') + conf.env.CXXFLAGS_WXPY.append('-DSIP_MODULE_BASENAME=siplib') + # Add basic debug info for all builds conf.env.CFLAGS_WXPY.append('-g') conf.env.CXXFLAGS_WXPY.append('-g')