From ed1ff0ef267854e790799c7aa13b52bd3a3e1007 Mon Sep 17 00:00:00 2001
From: Brian Gladman <brg@gladman.plus.com>
Date: Tue, 5 Jan 2010 16:01:53 +0000
Subject: [PATCH] 1. Add gas preprocessor build on Windows 2. Add snprintf ->
 _snprintf define for VC++ build

svn path=/trunk/yasm/; revision=2267
---
 Mkfiles/vc10/genperf/run.bat                 |  2 +-
 Mkfiles/vc10/modules/modules.vcxproj         |  3 +++
 Mkfiles/vc10/modules/modules.vcxproj.filters | 12 ++++++++++++
 Mkfiles/vc9/modules/modules.vcproj           | 16 ++++++++++++++++
 util.h                                       |  4 ++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/Mkfiles/vc10/genperf/run.bat b/Mkfiles/vc10/genperf/run.bat
index 08639737..11e69040 100644
--- a/Mkfiles/vc10/genperf/run.bat
+++ b/Mkfiles/vc10/genperf/run.bat
@@ -6,7 +6,7 @@ goto answer%errorlevel%
 if not exist run_py.bat goto answer1
 echo ... building with Python ...
 @echo on
-call run_py.bat modules\arch\x86\gen_x86_insn.23.py
+call run_py.bat modules\arch\x86\gen_x86_insn.py
 del run_py.bat
 @echo off
 goto end
diff --git a/Mkfiles/vc10/modules/modules.vcxproj b/Mkfiles/vc10/modules/modules.vcxproj
index 1d8abe42..8af38cf4 100644
--- a/Mkfiles/vc10/modules/modules.vcxproj
+++ b/Mkfiles/vc10/modules/modules.vcxproj
@@ -206,6 +206,8 @@
     <ClCompile Include="..\..\..\lc3bid.c" />
     <ClCompile Include="..\..\..\modules\arch\x86\x86arch.c" />
     <ClCompile Include="..\..\..\modules\arch\x86\x86bc.c" />
+    <ClCompile Include="..\..\..\modules\preprocs\gas\gas-eval.c" />
+    <ClCompile Include="..\..\..\modules\preprocs\gas\gas-preproc.c" />
     <ClCompile Include="..\..\..\x86cpu.c" />
     <ClCompile Include="..\..\..\modules\arch\x86\x86expr.c" />
     <ClCompile Include="..\..\..\modules\arch\x86\x86id.c" />
@@ -254,6 +256,7 @@
     <ClInclude Include="..\..\..\modules\objfmts\elf\elf.h" />
     <ClInclude Include="..\..\..\modules\parsers\gas\gas-parser.h" />
     <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser.h" />
+    <ClInclude Include="..\..\..\modules\preprocs\gas\gas-eval.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-eval.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-pp.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm.h" />
diff --git a/Mkfiles/vc10/modules/modules.vcxproj.filters b/Mkfiles/vc10/modules/modules.vcxproj.filters
index f85c74be..fbcd9fbf 100644
--- a/Mkfiles/vc10/modules/modules.vcxproj.filters
+++ b/Mkfiles/vc10/modules/modules.vcxproj.filters
@@ -29,6 +29,9 @@
     <Filter Include="Source Files\preprocs\cpp">
       <UniqueIdentifier>{6b3956d4-0bff-4e8e-af61-a7e59b476fa4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\preprocs\gas">
+      <UniqueIdentifier>{446fad62-ac17-49e9-8263-33481f04f182}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Source Files\preprocs\nasm">
       <UniqueIdentifier>{33fb7fc8-61f9-428d-9c94-7a4912fbb678}</UniqueIdentifier>
     </Filter>
@@ -139,6 +142,12 @@
     <ClCompile Include="..\..\..\modules\preprocs\cpp\cpp-preproc.c">
       <Filter>Source Files\preprocs\cpp</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\modules\preprocs\gas\gas-eval.c">
+      <Filter>Source Files\preprocs\gas</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\modules\preprocs\gas\gas-preproc.c">
+      <Filter>Source Files\preprocs\gas</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\modules\preprocs\nasm\nasm-eval.c">
       <Filter>Source Files\preprocs\nasm</Filter>
     </ClCompile>
@@ -192,6 +201,9 @@
     <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser.h">
       <Filter>Source Files\parsers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\modules\preprocs\gas\gas-eval.h">
+      <Filter>Source Files\preprocs\gas</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-eval.h">
       <Filter>Source Files\preprocs\nasm</Filter>
     </ClInclude>
diff --git a/Mkfiles/vc9/modules/modules.vcproj b/Mkfiles/vc9/modules/modules.vcproj
index 77d9ab49..9de56658 100644
--- a/Mkfiles/vc9/modules/modules.vcproj
+++ b/Mkfiles/vc9/modules/modules.vcproj
@@ -578,6 +578,22 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="gas"
+					>
+					<File
+						RelativePath="..\..\..\modules\preprocs\gas\gas-eval.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\modules\preprocs\gas\gas-eval.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\modules\preprocs\gas\gas-preproc.c"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="listfmts"
diff --git a/util.h b/util.h
index 132cba1e..27014f73 100644
--- a/util.h
+++ b/util.h
@@ -117,6 +117,10 @@
 # define USE_OUR_OWN_STRCASECMP
 #endif
 
+#ifdef _MSC_VER
+# define snprintf						_snprintf
+#endif
+
 #include <libyasm/compat-queue.h>
 
 #ifdef HAVE_SYS_CDEFS_H
-- 
2.40.0