From af78075192961a77e4dbbea18b85d0cf44b02614 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 17 Nov 2011 16:00:29 +0000
Subject: [PATCH] Detect ASM+C pre-processor file extension for MinGW with
 SCons 1.1+

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6174 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/System/SConscript | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Contrib/System/SConscript b/Contrib/System/SConscript
index 9ffb1040..9e2531d9 100644
--- a/Contrib/System/SConscript
+++ b/Contrib/System/SConscript
@@ -2,7 +2,6 @@ target = 'System'
 
 files = Split("""
 	Source/Buffers.c
-	Source/Call.S
 	Source/Plugin.c
 	Source/System.c
 """)
@@ -25,7 +24,16 @@ docs = Split("""
 	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(
 	target,
@@ -37,8 +45,6 @@ BuildPlugin(
 	defines = ['SYSTEM_EXPORTS']
 )
 
-Import('env')
-
 res = 'Resource/Resource.rc'
 res_obj = 'Resource/Resource-rc.o'
 res_target = env.RES(res_obj, res)