diff options
| author | Julian Meyer <julianmeyer2000@gmail.com> | 2013-04-04 14:04:29 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2013-04-09 23:20:36 (GMT) |
| commit | 649e5f2042db49d31cc4e95f056e2313afad1e7b (patch) | |
| tree | daebf8cfc188422ef18391fb8ef99853cc7c963e /SConscript | |
| parent | b4fb55f86e9add3248166278bb566f210dacf636 (diff) | |
| download | powder-649e5f2042db49d31cc4e95f056e2313afad1e7b.zip powder-649e5f2042db49d31cc4e95f056e2313afad1e7b.tar.gz | |
Add --nofft option to compile without FFTW3
This should help Mac users who were having trouble compiling.
Diffstat (limited to 'SConscript')
| -rwxr-xr-x[-rw-r--r--] | SConscript | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/SConscript b/SConscript index 847ce44..76f00aa 100644..100755 --- a/SConscript +++ b/SConscript @@ -43,6 +43,7 @@ AddOption('--sse',dest="sse",action='store_true',default=False,help="Enable SSE AddOption('--sse2',dest="sse2",action='store_true',default=False,help="Enable SSE2 optimisations") AddOption('--sse3',dest="sse3",action='store_true',default=False,help="Enable SSE3 optimisations") AddOption('--x86',dest="x86",action='store_true',default=True,help="Target Intel x86 platform") +AddOption('--nofft',dest="nofft", action='store_true',default=False,help="Do not use fftw3f for gravity.") AddOption('--debugging', dest="debug", action="store_true", default=False, help="Enable debug options") AddOption('--beta',dest="beta",action='store_true',default=False,help="Beta build.") @@ -52,7 +53,6 @@ AddOption('--build-number',dest="build-number",default=False,help="Build number. AddOption('--snapshot',dest="snapshot",action='store_true',default=False,help="Snapshot build.") AddOption('--snapshot-id',dest="snapshot-id",default=False,help="Snapshot build ID.") AddOption('--stable',dest="stable",default=True,help="Non snapshot build") - AddOption('--aao', dest="everythingAtOnce", action='store_true', default=False, help="Compile the whole game without generating intermediate objects (very slow), enable this when using compilers like clang or mscc that don't support -fkeep-inline-functions") if((not GetOption('lin')) and (not GetOption('win')) and (not GetOption('rpi')) and (not GetOption('macosx'))): @@ -127,13 +127,16 @@ if not GetOption("macosx"): env = conf.Finish(); else: - env.Append(LIBS=['z', 'bz2', 'fftw3f']) + env.Append(LIBS=['z', 'bz2']) + if not GetOption('nofft'): + env.Append(LIBS=['fftw3f']) env.Append(CPPPATH=['src/', 'data/', 'generated/']) env.Append(CCFLAGS=['-w', '-std=c++98', '-fkeep-inline-functions']) env.Append(LIBS=['pthread', 'm']) -env.Append(CPPDEFINES=["LUACONSOLE", "GRAVFFT", "_GNU_SOURCE", "USE_STDINT", "_POSIX_C_SOURCE=200112L"]) - +env.Append(CPPDEFINES=["LUACONSOLE", "_GNU_SOURCE", "USE_STDINT", "_POSIX_C_SOURCE=200112L"]) +if not GetOption('nofft'): + env.Append(CPPDEFINES=["GRAVFFT"]) if GetOption("ptw32-static"): env.Append(CPPDEFINES=['PTW32_STATIC_LIB']); @@ -178,7 +181,8 @@ if(GetOption('macosx')): env.Append(CPPDEFINES=["MACOSX"]) env.Append(CCFLAGS=['-I/Library/Frameworks/SDL.framework/Headers']) env.Append(CCFLAGS=['-I/Library/Frameworks/Lua.framework/Headers']) - env.Append(LINKFLAGS=['-lfftw3f']) + if not GetOption('nofft'): + env.Append(LINKFLAGS=['-lfftw3f']) env.Append(LINKFLAGS=['-framework']) env.Append(LINKFLAGS=['SDL']) env.Append(LINKFLAGS=['-framework']) |