build: Use CURLX_* file lists for Visual Studio curl tool project generation

This commit is contained in:
Steve Holme 2014-05-22 23:05:22 +01:00
parent a7999da39e
commit a9388b73b1
11 changed files with 65 additions and 212 deletions

View file

@ -98,7 +98,6 @@ TODO
* Support WinIDN
* Use of static runtime libraries
* Generate *.vcxproj.filters files for VC10, VC11 and VC12
* Use CURLX_* definitions for curl tool project generation
* Support for other development IDEs
Any additional help would be appreciated ;-)

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -6,7 +6,7 @@ rem * / __| | | | |_) | |
rem * | (__| |_| | _ <| |___
rem * \___|\___/|_| \_\_____|
rem *
rem * Copyright (C) 2014, Steve Holme, <steve_holme@hotmail.com>
rem * Copyright (C) 2014, Steve Holme, <steve_holme@hotmail.com>.
rem *
rem * This software is licensed as described in the file COPYING, which
rem * you should have received as part of this distribution. The terms
@ -92,6 +92,20 @@ rem
for /f "delims=" %%h in ('dir /b ..\src\*.h') do call :element %1 src "%%h" %3
) else if "!var!" == "CURL_SRC_RC_FILES" (
for /f "delims=" %%r in ('dir /b ..\src\*.rc') do call :element %1 src "%%r" %3
) else if "!var!" == "CURL_SRC_X_C_FILES" (
call :element %1 lib "strtoofft.c" %3
call :element %1 lib "strdup.c" %3
call :element %1 lib "rawstr.c" %3
call :element %1 lib "nonblock.c" %3
call :element %1 lib "warnless.c" %3
) else if "!var!" == "CURL_SRC_X_H_FILES" (
call :element %1 lib "config-win32.h" %3
call :element %1 lib "curl_setup.h" %3
call :element %1 lib "strtoofft.h" %3
call :element %1 lib "strdup.h" %3
call :element %1 lib "rawstr.h" %3
call :element %1 lib "nonblock.h" %3
call :element %1 lib "warnless.h" %3
) else if "!var!" == "CURL_LIB_C_FILES" (
for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3
) else if "!var!" == "CURL_LIB_H_FILES" (