# HG changeset patch # User prock@33b003aa-7bff-0310-803a-e67f0ece8222 # Date 1264958243 0 # Node ID efa51189ffc31f05f9156bcf58f38dad3d8e6f9e # Parent 47eca3c3d59d296cbec0aba816fa6cebfda5d168 Move the LINKFLAGS to a more appropriate spot. diff -r 47eca3c3d59d -r efa51189ffc3 SConstruct --- a/SConstruct Sun Jan 31 05:02:24 2010 +0000 +++ b/SConstruct Sun Jan 31 17:17:23 2010 +0000 @@ -36,7 +36,6 @@ 'Destination directory (prepended to prefix)', None, PathVariable.PathAccept )) -#vars.Add('CXXFLAGS', "") #propagate the invoking users complete external environment env = Environment(variables = vars, @@ -252,7 +251,8 @@ else: env.AppendUnique(CXXFLAGS=['-O0', '-Wall', '-Wno-unused']) - env.AppendUnique(CXXFLAGS=['-ggdb', '-D_DEBUG']) + env.AppendUnique(CXXFLAGS=['-g', '-D_DEBUG']) + env.AppendUnique(LINKFLAGS=['-Wl') engine_var_dir = os.path.join('build','engine','debug') tests_var_dir = os.path.join('build','tests','debug') print "Building DEBUG binaries..." @@ -262,6 +262,7 @@ else: env.AppendUnique(CXXFLAGS=['-O2', '-Wall', '-Wno-unused']) + env.AppendUnique(LINKFLAGS=['-Wl']) engine_var_dir = os.path.join('build','engine','release') tests_var_dir = os.path.join('build','tests','release') print "Building RELEASE binaries..." diff -r 47eca3c3d59d -r efa51189ffc3 engine/SConscript --- a/engine/SConscript Sun Jan 31 05:02:24 2010 +0000 +++ b/engine/SConscript Sun Jan 31 17:17:23 2010 +0000 @@ -109,13 +109,11 @@ if sys.platform == 'win32': sharedlib = env.SharedLibrary(target = 'fife', source = compilefiles, - LINKFLAGS=['-Wl'], OBJPREFIX='shared_', SHLIBEMITTER = '') else: sharedlib = env.SharedLibrary(target = 'fife', - source = compilefiles, - LINKFLAGS=['-Wl']) + source = compilefiles) #************************************************************************** #python library target @@ -130,7 +128,6 @@ OBJPREFIX='py_', SHLIBPREFIX='_', SHLIBSUFFIX=dest_suffix, - LINKFLAGS=['-Wl'], SHLIBEMITTER = '') pythonext = env.PythonExtensions(target = [os.path.join('swigwrappers', 'python' ,'fife_wrap.cc'), os.path.join('python', 'fife', 'fife.py')],