diff options
| author | jacob1 <jfu614@gmail.com> | 2013-06-02 01:57:29 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-06-02 01:57:29 (GMT) |
| commit | 69407a2b5794cb122c42353cb09c4fbe50a11342 (patch) | |
| tree | c54a1bd674521e80a7680a463f7026f2c634295c /SConscript | |
| parent | 8d7ab7f5e27b9b5ba71b4ef13e4cbb9f7e5a4641 (diff) | |
| parent | ff8dc4b9cb521a05e4b81064f35e38daf93682d5 (diff) | |
| download | powder-69407a2b5794cb122c42353cb09c4fbe50a11342.zip powder-69407a2b5794cb122c42353cb09c4fbe50a11342.tar.gz | |
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
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 |