Attachment #345782 for bug #328137

Lines 119-128 Link Here

(-)lcdtest-1.18.ORIG/SConstruct (-3 / +3 lines)
119	# code	119	# code
120	#-----------------------------------------------------------------------------	120	#-----------------------------------------------------------------------------
121		121
122	build_dir = 'build/'	122	variant_dir = 'build/'
123		123
124	SConscript ('src/SConscript',	124	SConscript ('src/SConscript',
125	build_dir = build_dir,	125	variant_dir = variant_dir,
126	duplicate = 0,	126	duplicate = 0,
127	exports = {'env' : env})	127	exports = {'env' : env})
128		128
Lines 137-143 Link Here
137	#-----------------------------------------------------------------------------	137	#-----------------------------------------------------------------------------
138		138
139	SConscript ('desktop/SConscript',	139	SConscript ('desktop/SConscript',
140	build_dir = build_dir + '/desktop',	140	variant_dir = variant_dir + '/desktop',
141	duplicate = 0)	141	duplicate = 0)
142		142
143	#-----------------------------------------------------------------------------	143	#-----------------------------------------------------------------------------




# along with this program.  If not, see see <http://www.gnu.org/licenses/>.

import os
import SCons.Util

Import('env')



objs = [env.Object(src) for src in srcs]

# respect the environments flags if given

if os.environ.has_key('CC'):
	env['CC'] = os.environ['CC']
if os.environ.has_key('CFLAGS'):
	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
if os.environ.has_key('CXX'):
	env['CXX'] = os.environ['CXX']
if os.environ.has_key('CXXFLAGS'):
	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
if os.environ.has_key('LDFLAGS'):
	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])

env.Append (LIBS = ['SDL', 'SDL_image', 'SDL_ttf']);


Return to bug 328137

Lines 17-22 Link Here

(-)lcdtest-1.18.ORIG/src/SConscript (-7 / +13 lines)
17	# along with this program. If not, see see <http://www.gnu.org/licenses/>.	17	# along with this program. If not, see see <http://www.gnu.org/licenses/>.
18		18
19	import os	19	import os
		20	import SCons.Util
20		21
21	Import('env')	22	Import('env')
22		23
Lines 29-41 Link Here
29		30
30	objs = [env.Object(src) for src in srcs]	31	objs = [env.Object(src) for src in srcs]
31		32
32	# respect the environment CFLAGS if given	33	# respect the environments flags if given
33	if 'CFLAGS' in ARGUMENTS:	34
34	env.MergeFlags (ARGUMENTS ['CFLAGS'])	35	if os.environ.has_key('CC'):
35	elif 'CFLAGS' in os.environ:	36	env['CC'] = os.environ['CC']
36	env.MergeFlags (os.environ ['CFLAGS'])	37	if os.environ.has_key('CFLAGS'):
37	else:	38	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
38	env.Append (CCFLAGS = ['-g', '-Wall', '-Wextra'])	39	if os.environ.has_key('CXX'):
		40	env['CXX'] = os.environ['CXX']
		41	if os.environ.has_key('CXXFLAGS'):
		42	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
		43	if os.environ.has_key('LDFLAGS'):
		44	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
39		45
40	env.Append (LIBS = ['SDL', 'SDL_image', 'SDL_ttf']);	46	env.Append (LIBS = ['SDL', 'SDL_image', 'SDL_ttf']);
41		47