diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-06 17:00:53 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-06 17:00:53 +0000 |
commit | 12446dd4391294780a3cb57294b069b0cca4c12e (patch) | |
tree | 48a41e081105e437d1352a4f06ee05abc29bf7ec | |
parent | a0ad7177f6989301f695c90eea3c4d0fbc0d262a (diff) |
move largefile and reentrant compiler flags up to the top level, rather than being libardour-specific
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7071 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | SConstruct | 6 | ||||
-rw-r--r-- | libs/ardour/SConscript | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 93b02296c7..2a9322445e 100644 --- a/SConstruct +++ b/SConstruct @@ -854,6 +854,12 @@ env.Append(CCFLAGS='-DPROGRAM_NAME=\\"' + env['PROGRAM_NAME'] + '\\"') env.Append(CXXFLAGS='-DPROGRAM_NAME=\\"' + env['PROGRAM_NAME'] + '\\"') # +# we deal with threads and big files +# +env.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") +env.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") + +# # fix scons nitpickiness on APPLE # diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 10662fd042..346ff3cb84 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -130,7 +130,6 @@ if ardour['LV2']: if ardour['LIBLO']: extra_sources += osc_files -ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") ardour.Append(CXXFLAGS="-DDATA_DIR=\\\"" + os.path.join (final_prefix, 'share') + "\\\"") ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR']) + "\\\"") ardour.Append(CXXFLAGS="-DVAMP_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR'], 'ardour2', 'vamp') + "\\\"") |