From c43c1444c87ec6b21dc0313f8407cf55201fa751 Mon Sep 17 00:00:00 2001
From: Roel Verdult <roel@libnfc.org>
Date: Thu, 23 Jul 2009 10:20:30 +0000
Subject: [PATCH] VS C++ project files

---
 win32/anticol.vcproj | 12 ++++++----
 win32/emulate.vcproj | 10 +++++---
 win32/libnfc.def     | 22 ++++++++++++-----
 win32/libnfc.vcproj  | 56 ++++++++++++++++++++++++++++++++------------
 win32/list.vcproj    | 10 +++++---
 win32/mftool.vcproj  | 12 ++++++----
 win32/relay.vcproj   | 10 +++++---
 7 files changed, 93 insertions(+), 39 deletions(-)

diff --git a/win32/anticol.vcproj b/win32/anticol.vcproj
index b96d8d3..6a32e70 100644
--- a/win32/anticol.vcproj
+++ b/win32/anticol.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
-	Name="anticol"
+	Version="8,00"
+	Name="nfc-anticol"
 	ProjectGUID="{71722DBB-4253-4D68-A29C-AA159360FCE4}"
 	RootNamespace="anticol"
 	Keyword="Win32Proj"
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -49,6 +49,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,7 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -125,6 +126,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -175,7 +177,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\anticol.c"
+			RelativePath="..\src\anticol.c"
 			>
 		</File>
 	</Files>
diff --git a/win32/emulate.vcproj b/win32/emulate.vcproj
index ca52ed6..0e1794c 100644
--- a/win32/emulate.vcproj
+++ b/win32/emulate.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
-	Name="emulate"
+	Version="8,00"
+	Name="nfc-emulate"
 	ProjectGUID="{9F813EB4-8F43-4E58-8C62-8E43D9AC137D}"
 	RootNamespace="emulate"
 	Keyword="Win32Proj"
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -48,6 +49,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -116,6 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -123,6 +126,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -173,7 +177,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\emulate.c"
+			RelativePath="..\src\emulate.c"
 			>
 		</File>
 	</Files>
diff --git a/win32/libnfc.def b/win32/libnfc.def
index ec17671..f9cd4bc 100644
--- a/win32/libnfc.def
+++ b/win32/libnfc.def
@@ -11,16 +11,26 @@ EXPORTS
   dev_pn531_disconnect
   dev_pn531_transceive
 
+  ; dev_pn533.h
+  dev_pn533_connect
+  dev_pn533_disconnect
+  dev_pn533_transceive
+
+  ; dev_arygon.h
+  dev_arygon_connect
+  dev_arygon_disconnect
+  dev_arygon_transceive
+
   ; libnfc.h
   nfc_connect
   nfc_disconnect
   nfc_configure
-  nfc_reader_init
-  nfc_reader_transceive_bits
-  nfc_reader_transceive_bytes
-  nfc_reader_select
-  nfc_reader_deselect
-  nfc_reader_mifare_cmd
+  nfc_initiator_init
+  nfc_initiator_transceive_bits
+  nfc_initiator_transceive_bytes
+  nfc_initiator_select_tag
+  nfc_initiator_deselect_tag
+  nfc_initiator_mifare_cmd
   nfc_target_init
   nfc_target_receive_bits
   nfc_target_receive_bytes
diff --git a/win32/libnfc.vcproj b/win32/libnfc.vcproj
index ccd4c6d..e42e581 100644
--- a/win32/libnfc.vcproj
+++ b/win32/libnfc.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="libnfc"
 	ProjectGUID="{AAEEDA5F-F86F-452D-BFA3-53B1C00B8884}"
 	RootNamespace="libnfc"
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="libusb"
+				AdditionalIncludeDirectories="libusb;stdint"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNFC_EXPORTS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -50,6 +50,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -120,14 +121,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="libusb"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNFC_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="libusb;stdint"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNFC_EXPORTS;_CRT_SECURE_NO_WARNINGS;HAVE_PCSC_LITE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -180,39 +182,55 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\bitutils.c"
+			RelativePath="..\src\bitutils.c"
 			>
 		</File>
 		<File
-			RelativePath="..\bitutils.h"
+			RelativePath="..\src\bitutils.h"
 			>
 		</File>
 		<File
-			RelativePath="..\defines.h"
+			RelativePath="..\src\defines.h"
 			>
 		</File>
 		<File
-			RelativePath="..\dev_acr122.c"
+			RelativePath="..\src\dev_acr122.c"
 			>
 		</File>
 		<File
-			RelativePath="..\dev_acr122.h"
+			RelativePath="..\src\dev_acr122.h"
 			>
 		</File>
 		<File
-			RelativePath="..\dev_pn531.c"
+			RelativePath="..\src\dev_arygon.c"
 			>
 		</File>
 		<File
-			RelativePath="..\dev_pn531.h"
+			RelativePath="..\src\dev_arygon.h"
 			>
 		</File>
 		<File
-			RelativePath="..\devices.h"
+			RelativePath="..\src\dev_pn531.c"
 			>
 		</File>
 		<File
-			RelativePath="..\libnfc.c"
+			RelativePath="..\src\dev_pn531.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\dev_pn533.c"
+			>
+		</File>
+		<File
+			RelativePath="..\src\dev_pn533.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\devices.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\libnfc.c"
 			>
 		</File>
 		<File
@@ -220,11 +238,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\libnfc.h"
+			RelativePath="..\src\libnfc.h"
 			>
 		</File>
 		<File
-			RelativePath="..\types.h"
+			RelativePath="..\src\rs232.c"
+			>
+		</File>
+		<File
+			RelativePath="..\src\rs232.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\types.h"
 			>
 		</File>
 	</Files>
diff --git a/win32/list.vcproj b/win32/list.vcproj
index 69a3dae..a4854c7 100644
--- a/win32/list.vcproj
+++ b/win32/list.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
-	Name="list"
+	Version="8,00"
+	Name="nfc-list"
 	ProjectGUID="{ADB1806A-745E-4DB4-9CDC-51658A5061E1}"
 	RootNamespace="list"
 	Keyword="Win32Proj"
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -48,6 +49,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -116,6 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -123,6 +126,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -172,7 +176,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\list.c"
+			RelativePath="..\src\list.c"
 			>
 		</File>
 	</Files>
diff --git a/win32/mftool.vcproj b/win32/mftool.vcproj
index 4528069..ef41200 100644
--- a/win32/mftool.vcproj
+++ b/win32/mftool.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mftool"
+	Version="8,00"
+	Name="nfc-mftool"
 	ProjectGUID="{BB0A837B-DAEF-4B3F-AF5B-9A757A97FFF3}"
 	RootNamespace="mfread"
 	Keyword="Win32Proj"
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -48,6 +49,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -116,6 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -123,6 +126,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -173,11 +177,11 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\mftool.c"
+			RelativePath="..\src\mftool.c"
 			>
 		</File>
 		<File
-			RelativePath="..\mifaretag.h"
+			RelativePath="..\src\mifaretag.h"
 			>
 		</File>
 	</Files>
diff --git a/win32/relay.vcproj b/win32/relay.vcproj
index 3dc4371..1f616c5 100644
--- a/win32/relay.vcproj
+++ b/win32/relay.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
-	Name="relay"
+	Version="8,00"
+	Name="nfc-relay"
 	ProjectGUID="{9CC505F9-AE58-4827-8921-A59E7C4839FE}"
 	RootNamespace="relay"
 	Keyword="Win32Proj"
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -48,6 +49,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -116,6 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="stdint"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -123,6 +126,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -173,7 +177,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\relay.c"
+			RelativePath="..\src\relay.c"
 			>
 		</File>
 	</Files>