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

Detect ASM+C pre-processor file extension for MinGW with SCons 1.1+

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6174 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-11-17 16:00:29 +00:00
parent 44f0a9e9e9
commit af78075192
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Contrib/System/SConscript
View file

@ -2,7 +2,6 @@ target = 'System'
files = Split(""" files = Split("""
Source/Buffers.c Source/Buffers.c
Source/Call.S
Source/Plugin.c Source/Plugin.c
Source/System.c Source/System.c
""") """)
@ -25,7 +24,16 @@ docs = Split("""
WhatsNew.txt WhatsNew.txt
""") """)
Import('BuildPlugin') Import('BuildPlugin env')
conf = env.Configure()
if conf.TryCompile('END', '.S'):
files += ['Source/Call.S']
elif conf.TryCompile('.end', '.sx'):
files += ['Source/Call.Sx']
else:
print 'WARNING: unable to find assembler for Call.S'
conf.Finish()
BuildPlugin( BuildPlugin(
target, target,
@ -37,8 +45,6 @@ BuildPlugin(
defines = ['SYSTEM_EXPORTS'] defines = ['SYSTEM_EXPORTS']
) )
Import('env')
res = 'Resource/Resource.rc' res = 'Resource/Resource.rc'
res_obj = 'Resource/Resource-rc.o' res_obj = 'Resource/Resource-rc.o'
res_target = env.RES(res_obj, res) res_target = env.RES(res_obj, res)