Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 334465 | Differences between
and this patch

Collapse All | Expand All

(-)bpmdetect/src/SConscript.old (-5 / +15 lines)
Lines 1-5 Link Here
1
#! /usr/bin/env python
1
#! /usr/bin/env python
2
import os, sys, glob
2
import os, sys, glob
3
import SCons.Util
3
4
4
if not sys.platform.startswith('win'):
5
if not sys.platform.startswith('win'):
5
  BOLD   ="\033[1m"
6
  BOLD   ="\033[1m"
Lines 156-172 Link Here
156
    env.__delitem__('CPPPATH')
157
    env.__delitem__('CPPPATH')
157
  if env.has_key('CPPDEFINES'):
158
  if env.has_key('CPPDEFINES'):
158
    env.__delitem__('CPPDEFINES')
159
    env.__delitem__('CPPDEFINES')
159
  if env.has_key('CXXFLAGS'):
160
#  if env.has_key('CXXFLAGS'):
160
    env.__delitem__('CXXFLAGS')
161
#    env.__delitem__('CXXFLAGS')
161
  if env.has_key('LIBPATH'):
162
  if env.has_key('LIBPATH'):
162
    env.__delitem__('LIBPATH')
163
    env.__delitem__('LIBPATH')
163
  if env.has_key('LIBS'):
164
  if env.has_key('LIBS'):
164
    env.__delitem__('LIBS')
165
    env.__delitem__('LIBS')
165
  if env.has_key('LINKFLAGS'):
166
#  if env.has_key('LINKFLAGS'):
166
    env.__delitem__('LINKFLAGS')
167
#    env.__delitem__('LINKFLAGS')
167
  if env.has_key('QT3'):
168
  if env.has_key('QT3'):
168
    env.__delitem__('QT3')
169
    env.__delitem__('QT3')
169
170
171
  if os.environ.has_key('CXXFLAGS'):
172
    env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
173
  if os.environ.has_key('LDFLAGS'):
174
    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
175
170
  print BOLD + """
176
  print BOLD + """
171
--------------------------------------------------""" + NORMAL
177
--------------------------------------------------""" + NORMAL
172
  print "Use MinGW compiler                : ",
178
  print "Use MinGW compiler                : ",
Lines 189-195 Link Here
189
      env.Append(CXXFLAGS   = '-g')
195
      env.Append(CXXFLAGS   = '-g')
190
  else:
196
  else:
191
    print 'no '
197
    print 'no '
192
    env.Append(CXXFLAGS = '-O2' )
198
#    env.Append(CXXFLAGS = '-O2' )
193
    env.Append(CPPDEFINES = ['NDEBUG', 'NO_DEBUG'])
199
    env.Append(CPPDEFINES = ['NDEBUG', 'NO_DEBUG'])
194
    env['DEBUG'] = 0
200
    env['DEBUG'] = 0
195
201
Lines 309-314 Link Here
309
  ( 'LINKFLAGS', 'linker flags'),
315
  ( 'LINKFLAGS', 'linker flags'),
310
  ( 'QT3', 'use qt3')
316
  ( 'QT3', 'use qt3')
311
)
317
)
318
if os.environ.has_key('CC'):
319
  env['CC'] = os.environ['CC']
320
if os.environ.has_key('CXX'):
321
  env['CXX'] = os.environ['CXX']
312
opts.Update(env)
322
opts.Update(env)
313
323
314
# to avoid an error message 'how to make target configure... ?'
324
# to avoid an error message 'how to make target configure... ?'

Return to bug 334465