From a9388b73b1aaa709e3d10ca84eef600f1f36c283 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 22 May 2014 23:05:22 +0100
Subject: build: Use CURLX_* file lists for Visual Studio curl tool project
 generation

---
 projects/Windows/VC10/src/curlsrc.tmpl  | 12 ++--------
 projects/Windows/VC11/src/curlsrc.tmpl  | 12 ++--------
 projects/Windows/VC12/src/curlsrc.tmpl  | 12 ++--------
 projects/Windows/VC6/src/curlsrc.tmpl   | 42 ++-------------------------------
 projects/Windows/VC7.1/src/curlsrc.tmpl | 32 ++-----------------------
 projects/Windows/VC7/src/curlsrc.tmpl   | 32 ++-----------------------
 projects/Windows/VC8/src/curlsrc.tmpl   | 42 ++-------------------------------
 projects/Windows/VC9/src/curlsrc.tmpl   | 42 ++-------------------------------
 8 files changed, 16 insertions(+), 210 deletions(-)

(limited to 'projects/Windows')

diff --git a/projects/Windows/VC10/src/curlsrc.tmpl b/projects/Windows/VC10/src/curlsrc.tmpl
index 1e8e4c2eb..0731630d1 100644
--- a/projects/Windows/VC10/src/curlsrc.tmpl
+++ b/projects/Windows/VC10/src/curlsrc.tmpl
@@ -2435,19 +2435,11 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lib\nonblock.c" />
-    <ClCompile Include="..\..\..\..\lib\rawstr.c" />
-    <ClCompile Include="..\..\..\..\lib\strtoofft.c" />
-    <ClCompile Include="..\..\..\..\lib\warnless.c" />
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\lib\config-win32.h" />
-    <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
-    <ClInclude Include="..\..\..\..\lib\nonblock.h" />
-    <ClInclude Include="..\..\..\..\lib\rawstr.h" />
-    <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
-    <ClInclude Include="..\..\..\..\lib\warnless.h" />
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/Windows/VC11/src/curlsrc.tmpl b/projects/Windows/VC11/src/curlsrc.tmpl
index 6e6a56572..a4a835555 100644
--- a/projects/Windows/VC11/src/curlsrc.tmpl
+++ b/projects/Windows/VC11/src/curlsrc.tmpl
@@ -2475,19 +2475,11 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lib\nonblock.c" />
-    <ClCompile Include="..\..\..\..\lib\rawstr.c" />
-    <ClCompile Include="..\..\..\..\lib\strtoofft.c" />
-    <ClCompile Include="..\..\..\..\lib\warnless.c" />
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\lib\config-win32.h" />
-    <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
-    <ClInclude Include="..\..\..\..\lib\nonblock.h" />
-    <ClInclude Include="..\..\..\..\lib\rawstr.h" />
-    <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
-    <ClInclude Include="..\..\..\..\lib\warnless.h" />
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/Windows/VC12/src/curlsrc.tmpl b/projects/Windows/VC12/src/curlsrc.tmpl
index 8949f5ea1..719cfa77e 100644
--- a/projects/Windows/VC12/src/curlsrc.tmpl
+++ b/projects/Windows/VC12/src/curlsrc.tmpl
@@ -2475,19 +2475,11 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lib\nonblock.c" />
-    <ClCompile Include="..\..\..\..\lib\rawstr.c" />
-    <ClCompile Include="..\..\..\..\lib\strtoofft.c" />
-    <ClCompile Include="..\..\..\..\lib\warnless.c" />
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\lib\config-win32.h" />
-    <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
-    <ClInclude Include="..\..\..\..\lib\nonblock.h" />
-    <ClInclude Include="..\..\..\..\lib\rawstr.h" />
-    <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
-    <ClInclude Include="..\..\..\..\lib\warnless.h" />
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/Windows/VC6/src/curlsrc.tmpl b/projects/Windows/VC6/src/curlsrc.tmpl
index e2f1e222b..874136c56 100644
--- a/projects/Windows/VC6/src/curlsrc.tmpl
+++ b/projects/Windows/VC6/src/curlsrc.tmpl
@@ -569,51 +569,13 @@ LINK32=link.exe
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\nonblock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\rawstr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\strtoofft.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\warnless.c
-# End Source File
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
 # End Group
 # Begin Group "Header Files"
 
 # PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\..\lib\config-win32.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\curl_setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\nonblock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\rawstr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\strtoofft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\lib\warnless.h
-# End Source File
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
 # End Group
 # Begin Group "Resource Files"
diff --git a/projects/Windows/VC7.1/src/curlsrc.tmpl b/projects/Windows/VC7.1/src/curlsrc.tmpl
index 98d0c8396..5482eff4c 100644
--- a/projects/Windows/VC7.1/src/curlsrc.tmpl
+++ b/projects/Windows/VC7.1/src/curlsrc.tmpl
@@ -1217,41 +1217,13 @@
 		<Filter
 			Name="Source Files"
 			Filter="">
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.c">
-			</File>
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
-			<File
-				RelativePath="..\..\..\..\lib\config-win32.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\curl_setup.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.h">
-			</File>
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
 		</Filter>
 		<Filter
diff --git a/projects/Windows/VC7/src/curlsrc.tmpl b/projects/Windows/VC7/src/curlsrc.tmpl
index cb538ef0c..82ffd7ec3 100644
--- a/projects/Windows/VC7/src/curlsrc.tmpl
+++ b/projects/Windows/VC7/src/curlsrc.tmpl
@@ -1095,41 +1095,13 @@
 		<Filter
 			Name="Source Files"
 			Filter="">
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.c">
-			</File>
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
-			<File
-				RelativePath="..\..\..\..\lib\config-win32.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\curl_setup.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.h">
-			</File>
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
 		</Filter>
 		<Filter
diff --git a/projects/Windows/VC8/src/curlsrc.tmpl b/projects/Windows/VC8/src/curlsrc.tmpl
index 78a2861d9..a6a575327 100644
--- a/projects/Windows/VC8/src/curlsrc.tmpl
+++ b/projects/Windows/VC8/src/curlsrc.tmpl
@@ -3764,51 +3764,13 @@
 		<Filter
 			Name="Source Files"
 			>
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.c"
-				>
-			</File>
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
 		</Filter>
 		<Filter
 			Name="Header Files"
 			>
-			<File
-				RelativePath="..\..\..\..\lib\config-win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\curl_setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.h"
-				>
-			</File>
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
 		</Filter>
 		<Filter
diff --git a/projects/Windows/VC9/src/curlsrc.tmpl b/projects/Windows/VC9/src/curlsrc.tmpl
index 5b11ab596..6cb28f509 100644
--- a/projects/Windows/VC9/src/curlsrc.tmpl
+++ b/projects/Windows/VC9/src/curlsrc.tmpl
@@ -3725,51 +3725,13 @@
 		<Filter
 			Name="Source Files"
 			>
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.c"
-				>
-			</File>
+CURL_SRC_X_C_FILES
 CURL_SRC_C_FILES
 		</Filter>
 		<Filter
 			Name="Header Files"
 			>
-			<File
-				RelativePath="..\..\..\..\lib\config-win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\curl_setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\nonblock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\rawstr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\strtoofft.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\lib\warnless.h"
-				>
-			</File>
+CURL_SRC_X_H_FILES
 CURL_SRC_H_FILES
 		</Filter>
 		<Filter
-- 
cgit v1.2.3