diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-29 03:22:05 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-29 03:22:05 (GMT) |
| commit | 8945b5ec77b5faf0b7d85093a450994408880725 (patch) | |
| tree | da8316f5291cfba1499a526b912dfdf669ad76c6 /SConscript | |
| parent | b46f982defc1b832b0d56681d622a29d0db37bb2 (diff) | |
| parent | 110fa71a2ce2c35352fe9ebad4727d7a1fac23a7 (diff) | |
| download | powder-8945b5ec77b5faf0b7d85093a450994408880725.zip powder-8945b5ec77b5faf0b7d85093a450994408880725.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -156,7 +156,7 @@ if(GetOption('lin')): env.Append(LIBS=['X11', 'rt']) env.Append(CPPDEFINES=["LIN"]) if GetOption('_64bit'): - env.Append(LINKFAGS=['-m64']) + env.Append(LINKFLAGS=['-m64']) env.Append(CCFLAGS=['-m64']) else: env.Append(LINKFLAGS=['-m32']) @@ -176,7 +176,7 @@ if(GetOption('macosx')): #env.Append(LINKFLAGS=['-framework Lua']) #env.Append(LINKFLAGS=['-framework Cocoa']) if GetOption('_64bit'): - env.Append(LINKFAGS=['-m64']) + env.Append(LINKFLAGS=['-m64']) env.Append(CCFLAGS=['-m64']) else: env.Append(LINKFLAGS=['-m32']) |