dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed MinGW (GCC 4.5.2)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6530 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-07-19 19:21:43 +00:00
parent 5bfd937bd2
commit 9950ce1432
12 changed files with 50 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Contrib/System/SConscript
View file

@ -39,17 +39,19 @@ if env['TARGET_ARCH'] != 'amd64' or msvc: # BUGBUG: Call-amd64.S is missing GAS
filename = 'Call' + srcsuff
src_ascpp = """
#if 1 /* a C style comment */
.end
#if 0 /* a C style comment */
ERROR: assembler-with-cpp required!
#else
ERROR!
.end
#endif
"""
conf = env.Configure()
if conf.TryCompile('END', '.S'):
files += ['Source/'+filename+'.S']
elif conf.TryCompile(src_ascpp, '.S'):
elif (not msvc) and conf.TryCompile(src_ascpp, '.S'):
files += ['Source/'+filename+'CPP.S']
elif (not msvc) and conf.TryCompile(src_ascpp, '.sx'):
files += ['Source/'+filename+'CPP.sx']
else:
print 'WARNING: System.dll: unable to find assembler for '+filename+'.S'
conf.Finish()