build: Fixed incorrect reference to curl_setup.h in Visual Studio files

Fixed a copy / paste error from my 2011 project files.

diff --git a/projects/Windows/VC10/src/curlsrc.tmpl b/projects/Windows/VC10/src/curlsrc.tmpl
index 37f6ab8d74881f6a7005ea06ea3710c796283b3c..1e8e4c2ebf46bd8a9a09bfa39d90921852af217d 100644 (file)
--- a/projects/Windows/VC10/src/curlsrc.tmpl
+++ b/projects/Windows/VC10/src/curlsrc.tmpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32">
@@ -2443,9 +2443,9 @@ 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\setup.h" />
     <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
     <ClInclude Include="..\..\..\..\lib\warnless.h" />
 CURL_SRC_H_FILES

diff --git a/projects/Windows/VC11/src/curlsrc.tmpl b/projects/Windows/VC11/src/curlsrc.tmpl
index bbaf1f3554e72f87ad12753dd5e05a59fab46416..6e6a56572499a991a77d3b3226d9849df34873d0 100644 (file)
--- a/projects/Windows/VC11/src/curlsrc.tmpl
+++ b/projects/Windows/VC11/src/curlsrc.tmpl
@@ -2483,9 +2483,9 @@ 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\setup.h" />
     <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
     <ClInclude Include="..\..\..\..\lib\warnless.h" />
 CURL_SRC_H_FILES

diff --git a/projects/Windows/VC12/src/curlsrc.tmpl b/projects/Windows/VC12/src/curlsrc.tmpl
index c8063ad97e73441f834394223c9705d24c69cc4d..8949f5ea1047b9afa95524b03a0859fd6175fdeb 100644 (file)
--- a/projects/Windows/VC12/src/curlsrc.tmpl
+++ b/projects/Windows/VC12/src/curlsrc.tmpl
@@ -2483,9 +2483,9 @@ 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\setup.h" />
     <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
     <ClInclude Include="..\..\..\..\lib\warnless.h" />
 CURL_SRC_H_FILES

diff --git a/projects/Windows/VC6/src/curlsrc.tmpl b/projects/Windows/VC6/src/curlsrc.tmpl
index a7cc2fbb854b15788bde60651c7c08054c7b8654..e2f1e222b6d9fa4d6e2147966407c8eb67ea7238 100644 (file)
--- a/projects/Windows/VC6/src/curlsrc.tmpl
+++ b/projects/Windows/VC6/src/curlsrc.tmpl
@@ -596,15 +596,15 @@ SOURCE="..\..\..\..\lib\config-win32.h"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\lib\nonblock.h
+SOURCE=..\..\..\..\lib\curl_setup.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\lib\rawstr.h
+SOURCE=..\..\..\..\lib\nonblock.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\lib\setup.h
+SOURCE=..\..\..\..\lib\rawstr.h
 # End Source File
 # Begin Source File
 

diff --git a/projects/Windows/VC7.1/src/curlsrc.tmpl b/projects/Windows/VC7.1/src/curlsrc.tmpl
index fe308f1a06ad67ed28dcb742cb957a440fa64dec..98d0c83964ace77d0a82a6617229e8a5ef683606 100644 (file)
--- a/projects/Windows/VC7.1/src/curlsrc.tmpl
+++ b/projects/Windows/VC7.1/src/curlsrc.tmpl
@@ -1238,13 +1238,13 @@ CURL_SRC_C_FILES
                                RelativePath="..\..\..\..\lib\config-win32.h">
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\nonblock.h">
+                               RelativePath="..\..\..\..\lib\curl_setup.h">
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\rawstr.h">
+                               RelativePath="..\..\..\..\lib\nonblock.h">
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\setup.h">
+                               RelativePath="..\..\..\..\lib\rawstr.h">
                        </File>
                        <File
                                RelativePath="..\..\..\..\lib\strtoofft.h">

diff --git a/projects/Windows/VC7/src/curlsrc.tmpl b/projects/Windows/VC7/src/curlsrc.tmpl
index 189179a38052d144c9c72b3fbbb7fda06fbda817..cb538ef0c14d5f8b0ae125ca3fbd9141e5b078f7 100644 (file)
--- a/projects/Windows/VC7/src/curlsrc.tmpl
+++ b/projects/Windows/VC7/src/curlsrc.tmpl
@@ -1116,13 +1116,13 @@ CURL_SRC_C_FILES
                                RelativePath="..\..\..\..\lib\config-win32.h">
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\nonblock.h">
+                               RelativePath="..\..\..\..\lib\curl_setup.h">
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\rawstr.h">
+                               RelativePath="..\..\..\..\lib\nonblock.h">
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\setup.h">
+                               RelativePath="..\..\..\..\lib\rawstr.h">
                        </File>
                        <File
                                RelativePath="..\..\..\..\lib\strtoofft.h">

diff --git a/projects/Windows/VC8/src/curlsrc.tmpl b/projects/Windows/VC8/src/curlsrc.tmpl
index d2906e5a5c1b047eb57f3d0001ee57c5df36b194..78a2861d93d71e778477ad4e4abc0bac78246a16 100644 (file)
--- a/projects/Windows/VC8/src/curlsrc.tmpl
+++ b/projects/Windows/VC8/src/curlsrc.tmpl
@@ -3790,15 +3790,15 @@ CURL_SRC_C_FILES
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\nonblock.h"
+                               RelativePath="..\..\..\..\lib\curl_setup.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\rawstr.h"
+                               RelativePath="..\..\..\..\lib\nonblock.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\setup.h"
+                               RelativePath="..\..\..\..\lib\rawstr.h"
                                >
                        </File>
                        <File

diff --git a/projects/Windows/VC9/src/curlsrc.tmpl b/projects/Windows/VC9/src/curlsrc.tmpl
index 8eef8db0c03c71704bc2358c0b8a9eaa4c676189..5b11ab596571c6c6df490bff5c6526224a79b8c6 100644 (file)
--- a/projects/Windows/VC9/src/curlsrc.tmpl
+++ b/projects/Windows/VC9/src/curlsrc.tmpl
@@ -3751,15 +3751,15 @@ CURL_SRC_C_FILES
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\nonblock.h"
+                               RelativePath="..\..\..\..\lib\curl_setup.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\rawstr.h"
+                               RelativePath="..\..\..\..\lib\nonblock.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\setup.h"
+                               RelativePath="..\..\..\..\lib\rawstr.h"
                                >
                        </File>
                        <File

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 674356a7e33083005b775966cea4efa8bddfae53..64d55ecf932e701180ebfbaa8b92244719d0b9e2 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -17,7 +17,7 @@ CURLX_CFILES = \
        ../lib/warnless.c
 
 CURLX_HFILES = \
-       ../lib/setup.h \
+       ../lib/curl_setup.h \
        ../lib/strtoofft.h \
        ../lib/strdup.h \
        ../lib/rawstr.h \