matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windows bug fixes, code cleanup

Browse Source
This commit is contained in:
Bryan Hoyle 2012-10-20 13:12:54 -04:00
parent 50234517de
commit 271851e32c
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SConscript
View File

@ -1,20 +1,5 @@
import os, sys, subprocess, time import os, sys, subprocess, time
def uniq(seq, idfun=None):
# order preserving
if idfun is None:
def idfun(x): return x
seen = {}
result = []
for item in seq:
marker = idfun(item)
# in old Python versions:
# if seen.has_key(marker)
# but in new ones:
if marker in seen: continue
seen[marker] = 1
result.append(item)
return result
##Fix for long command line - http://scons.org/wiki/LongCmdLinesOnWin32 ##Fix for long command line - http://scons.org/wiki/LongCmdLinesOnWin32
class ourSpawn: class ourSpawn:
@ -151,6 +136,7 @@ if(GetOption('static')):
if(GetOption('win')): if(GetOption('win')):
openGLLibs = ['opengl32', 'glew32'] openGLLibs = ['opengl32', 'glew32']
env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'regex']) env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'regex'])
env.Append(CCFLAGS=['-std=gnu++98'])
env.Append(LIBS=['winmm', 'gdi32']) env.Append(LIBS=['winmm', 'gdi32'])
env.Append(CPPDEFINES=["WIN"]) env.Append(CPPDEFINES=["WIN"])
env.Append(LINKFLAGS=['-mwindows']) env.Append(LINKFLAGS=['-mwindows'])