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

Basic AMD64 System::Call support

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6444 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-03-03 18:10:53 +00:00
parent a7261be70c
commit a7076ff238
9 changed files with 268 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Contrib/System/SConscript
View file

@ -26,14 +26,25 @@ docs = Split("""
Import('BuildPlugin env')
if env['TARGET_ARCH'] != 'amd64':
defs = ['SYSTEM_EXPORTS']
msvc = 'msvc' in env['TOOLS'] or 'mstoolkit' in env['TOOLS']
if env['TARGET_ARCH'] != 'amd64' or msvc: # BUGBUG: Call-amd64.S is missing GAS macros
srcsuff = ''
if env['TARGET_ARCH'] != 'x86':
srcsuff = '-' + env['TARGET_ARCH']
defs += ['SYSTEM_NOCALLBACKS'] # BUGBUG: Remove this when CallBack() is implemented
if msvc: # BUGBUG: Remove this when GAS is fixed
defs += ['SYSTEM_PARTIALCALLSUPPORT']
filename = 'Call' + srcsuff
conf = env.Configure()
if conf.TryCompile('END', '.S'):
files += ['Source/Call.S']
files += ['Source/'+filename+'.S']
elif conf.TryCompile('.end', '.sx'):
files += ['Source/Call.sx']
files += ['Source/'+filename+'.sx']
else:
print 'WARNING: System.dll: unable to find assembler for Call.S'
print 'WARNING: System.dll: unable to find assembler for '+filename+'.S'
conf.Finish()
else:
print 'WARNING: System.dll: missing Win64 code, dynamic function calls not supported'
@ -45,7 +56,7 @@ BuildPlugin(
examples,
docs,
nodeflib = False,
defines = ['SYSTEM_EXPORTS']
defines = defs
)
res = 'Resource/Resource.rc'