Commit a9388b73 authored by Steve Holme's avatar Steve Holme
Browse files

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

parent a7999da3

Makefile.am

+34 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ 
	win32_src_srcs='$(CURL_CFILES)'; \

	win32_src_hdrs='$(CURL_HFILES)'; \

	win32_src_rc='$(CURL_RCFILES)'; \

	win32_src_x_srcs='$(CURLX_CFILES)'; \

	win32_src_x_hdrs='$(CURLX_HFILES) ../lib/config-win32.h'; \

	\

	sorted_lib_srcs=`for file in $$win32_lib_srcs; do echo $$file; done | sort`; \

	sorted_lib_hdrs=`for file in $$win32_lib_hdrs; do echo $$file; done | sort`; \
@@ -282,6 +284,8 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ 
	sorted_lib_vtls_hdrs=`for file in $$win32_lib_vtls_hdrs; do echo $$file; done | sort`; \

	sorted_src_srcs=`for file in $$win32_src_srcs; do echo $$file; done | sort`; \

	sorted_src_hdrs=`for file in $$win32_src_hdrs; do echo $$file; done | sort`; \

	sorted_src_x_srcs=`for file in $$win32_src_x_srcs; do echo $$file; done | sort`; \

	sorted_src_x_hdrs=`for file in $$win32_src_x_hdrs; do echo $$file; done | sort`; \

	\

	awk_code='\

function gen_element(type, dir, file)\
@@ -363,6 +367,20 @@ function gen_element(type, dir, file)\ 
    split(src_rc, arr);\

    for(val in arr) gen_element(proj_type, "src", arr[val]);\

  }\

  else if($$0 == "CURL_SRC_X_C_FILES") {\

    split(src_x_srcs, arr);\

    for(val in arr) {\

      sub(/..\/lib\//, "", arr[val]);\

      gen_element(proj_type, "lib", arr[val]);\

    }\

  }\

  else if($$0 == "CURL_SRC_X_H_FILES") {\

    split(src_x_hdrs, arr);\

    for(val in arr) {\

      sub(/..\/lib\//, "", arr[val]);\

      gen_element(proj_type, "lib", arr[val]);\

    }\

  }\

  else\

    printf("%s\r\n", $$0);\

}';\
@@ -381,6 +399,8 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC6_SRCTMPL) > $(VC6_SRCDSP) || { exit 1; }; \

	\

	echo "generating '$(VC7_LIBVCPROJ)'"; \
@@ -397,6 +417,8 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC7_SRCTMPL) > $(VC7_SRCVCPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC71_LIBVCPROJ)'"; \
@@ -413,6 +435,8 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC71_SRCTMPL) > $(VC71_SRCVCPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC8_LIBVCPROJ)'"; \
@@ -429,6 +453,8 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC8_SRCTMPL) > $(VC8_SRCVCPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC9_LIBVCPROJ)'"; \
@@ -445,6 +471,8 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC9_SRCTMPL) > $(VC9_SRCVCPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC10_LIBVCXPROJ)'"; \
@@ -461,6 +489,8 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC11_LIBVCXPROJ)'"; \
@@ -477,6 +507,8 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC12_LIBVCXPROJ)'"; \
@@ -493,4 +525,6 @@ function gen_element(type, dir, file)\ 
		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; };)

projects/README

+0 −1
Original line number Diff line number Diff line
@@ -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 ;-)
 
 No newline at end of file

projects/Windows/VC10/src/curlsrc.tmpl

+2 −10
Original line number Diff line number Diff line
@@ -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>

projects/Windows/VC11/src/curlsrc.tmpl

+2 −10
Original line number Diff line number Diff line
@@ -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>

projects/Windows/VC12/src/curlsrc.tmpl

+2 −10
Original line number Diff line number Diff line
@@ -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>