From 7479b0d523b02c95017e4f1efd12eb37afb62204 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 6 May 2010 17:00:53 +0000 Subject: [PATCH] move largefile and reentrant compiler flags up to the top level, rather than being libardour-specific git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/2.0-ongoing@7071 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 6 ++++++ libs/ardour/SConscript | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 93b02296c..2a9322445 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 10662fd04..346ff3cb8 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') + "\\\"") -- 2.11.4.GIT