Revert part of last change for non-MSW

This commit is contained in:
Robin Dunn
2018-10-03 12:05:24 -07:00
parent 647941b36f
commit eaf189e14e
2 changed files with 8 additions and 4 deletions

View File

@@ -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 = []

View File

@@ -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')