move largefile and reentrant compiler flags up to the top level, rather than being...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7071 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 93b02296c746a74eaba06fc303fae650b188f986..2a9322445ef6c00af67222480cc422dea0bd0efd 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -853,6 +853,12 @@ if env['LIBLO']:
 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 10662fd04267cc20fbd4e7d8671ad615db01132b..346ff3cb84558d1262f7c2a12bc3ee07220b6414 100644 (file)
--- 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') + "\\\"")