diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2007-02-22 21:59:33 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2007-02-22 21:59:33 +0000 |
| commit | 85b7fce4fca58d8a934ae0c4396b8464f5640d4c (patch) | |
| tree | 1122ec971e68e4001b714aa89f6addf51e98a409 /SConstruct | |
| parent | 777616a24d2dec9cef2895bb4e91cddbe411fc3f (diff) | |
sndfile including fix.
git-svn-id: svn://localhost/ardour2/trunk@1492 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 160cd1f26e..d08b1badab 100644 --- a/SConstruct +++ b/SConstruct @@ -41,6 +41,7 @@ opts.AddOptions( PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), BoolOption('SURFACES', 'Build support for control surfaces', 1), BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), + BoolOption('UNIVERSAL', 'Compile as universal binary. Requires that external libraries are already universal.', 0), BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), BoolOption('VST', 'Compile with support for VST', 0), BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 0) @@ -669,6 +670,10 @@ if env['DEBUG'] == 1: else: env.Append(CCFLAGS=" ".join (opt_flags)) +if env['UNIVERSAL'] == 1: + env.Append(CCFLAGS="-arch i386 -arch ppc") + env.Append(LINKFLAGS="-arch i386 -arch ppc") + # # warnings flags # @@ -677,8 +682,9 @@ env.Append(CCFLAGS="-Wall") env.Append(CXXFLAGS="-Woverloaded-virtual") if env['EXTRA_WARN']: - env.Append(CCFLAGS="-Wextra -pedantic") + env.Append(CCFLAGS="-Wextra -pedantic -ansi") env.Append(CXXFLAGS="-ansi") +# env.Append(CFLAGS="-iso") if env['LIBLO']: env.Append(CCFLAGS="-DHAVE_LIBLO") @@ -831,7 +837,7 @@ if env['SYSLIBS']: libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', - CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) + CPPPATH=['#libs/libsndfile/src']) # libraries['libglademm'] = LibraryInfo() # libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') |