diff options
| author | jacob1 <jfu614@gmail.com> | 2013-06-01 15:58:40 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-06-01 15:58:40 (GMT) |
| commit | ff8dc4b9cb521a05e4b81064f35e38daf93682d5 (patch) | |
| tree | a0cc94a4ce7b333e817c8863aa9d7b495652c4d8 /SConscript | |
| parent | b16524292e2d8c640e0e4e0801d5cb4e512e4707 (diff) | |
| parent | 5a57f23ac573d1a6d123e55d84c0bd48e995089a (diff) | |
| download | powder-ff8dc4b9cb521a05e4b81064f35e38daf93682d5.zip powder-ff8dc4b9cb521a05e4b81064f35e38daf93682d5.tar.gz | |
Merge pull request #137 from mniip/shitscript
some SConscript fixes
Diffstat (limited to 'SConscript')
| -rwxr-xr-x | SConscript | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -286,7 +286,7 @@ if(GetOption('rpi')): if(GetOption('win')): openGLLibs = ['opengl32', 'glew32'] - env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'regex']) + env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'SDL', 'regex']) env.Append(CCFLAGS=['-std=gnu++98']) env.Append(LIBS=['winmm', 'gdi32']) env.Append(CPPDEFINES=["WIN"]) @@ -488,7 +488,8 @@ else: # But we need 16 byte alignment so that SSE instructions in FFTW work without crashing if(GetOption('win')): envCopy = env.Clone() - envCopy.Append(CCFLAGS=['-mincoming-stack-boundary=2']) + envCopy.Append(CCFLAGS=['-mstackrealign']) + #envCopy.Append(CCFLAGS=['-mincoming-stack-boundary=2']) sources+=envCopy.Object('src/simulation/Gravity.cpp') # run generator commands |