[libsoup] Visual Studio builds: Move projects to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] Visual Studio builds: Move projects to win32/
- Date: Thu, 23 Feb 2017 10:17:03 +0000 (UTC)
commit 94b6b3da22d2983435963852833c4e0e9a2ee8f9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Feb 23 18:13:51 2017 +0800
Visual Studio builds: Move projects to win32/
This enables one to go down one less level into the tree to access the Visual
Studio build files, and was belated as this was suggested by Dan as we move
the projects in the GLib/GTK+ stack into win32/ from build/win32/.
This also enables syncing the Makefile-newvs.am, Makefile.msvcproj and
Makefile.msvc-introspection autotools modules, as well as the common NMake
Makefile bits from GLib and G-I masters, so that we are more consistent
accross the board.
Makefile.am | 2 +-
build/Makefile-newvs.am | 53 -------
build/Makefile.msvcproj | 114 ---------------
build/win32/vs9/soup-gen-srcs.vsprops.in | 25 ----
configure.ac | 18 ++--
libsoup/Makefile.am | 22 ++--
win32/Makefile-newvs.am | 55 +++++++
{build/win32 => win32}/Makefile.am | 2 +-
{build => win32}/Makefile.msvc-introspection | 70 +++++-----
win32/Makefile.msvcproj | 153 ++++++++++++++++++++
{build/win32 => win32}/detectenv-msvc.mak | 0
{build/win32 => win32}/introspection-msvc.mak | 2 +-
{build/win32 => win32}/replace.py | 2 +-
{build/win32 => win32}/soup-introspection-msvc.mak | 0
{build/win32 => win32}/vs10/Makefile.am | 11 +-
{build/win32 => win32}/vs10/get.vcxproj | 16 +--
{build/win32 => win32}/vs10/get.vcxproj.filters | 2 +-
{build/win32 => win32}/vs10/libsoup.sln | 0
{build/win32 => win32}/vs10/simple-httpd.vcxproj | 16 +--
.../vs10/simple-httpd.vcxproj.filters | 2 +-
{build/win32 => win32}/vs10/simple-proxy.vcxproj | 16 +--
.../vs10/simple-proxy.vcxproj.filters | 2 +-
.../win32 => win32}/vs10/soup-build-defines.props | 2 +-
.../vs10/soup-dll-build-defines.props | 0
{build/win32 => win32}/vs10/soup-gen-srcs.props.in | 16 +--
.../vs10/soup-gnome.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/soup-gnome.vcxprojin | 14 +--
{build/win32 => win32}/vs10/soup-install.propsin | 0
{build/win32 => win32}/vs10/soup-install.vcxproj | 18 +--
.../win32 => win32}/vs10/soup-version-paths.props | 4 +-
{build/win32 => win32}/vs10/soup.vcxproj.filtersin | 6 +-
{build/win32 => win32}/vs10/soup.vcxprojin | 126 ++++++-----------
{build/win32 => win32}/vs11/Makefile.am | 5 +-
{build/win32 => win32}/vs12/Makefile.am | 5 +-
{build/win32 => win32}/vs14/Makefile.am | 5 +-
{build/win32 => win32}/vs15/Makefile.am | 5 +-
{build/win32 => win32}/vs9/Makefile.am | 4 +-
{build/win32 => win32}/vs9/get.vcproj | 2 +-
{build/win32 => win32}/vs9/libsoup.sln | 0
{build/win32 => win32}/vs9/simple-httpd.vcproj | 2 +-
{build/win32 => win32}/vs9/simple-proxy.vcproj | 2 +-
.../win32 => win32}/vs9/soup-build-defines.vsprops | 2 +-
.../vs9/soup-dll-build-defines.vsprops | 0
win32/vs9/soup-gen-srcs.vsprops.in | 25 ++++
{build/win32 => win32}/vs9/soup-gnome.vcprojin | 0
{build/win32 => win32}/vs9/soup-install.vcproj | 0
{build/win32 => win32}/vs9/soup-install.vspropsin | 0
.../win32 => win32}/vs9/soup-version-paths.vsprops | 2 +-
{build/win32 => win32}/vs9/soup.vcprojin | 54 ++++----
49 files changed, 421 insertions(+), 461 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a99287c..fc0f93d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = libsoup po tests examples docs build/win32
+SUBDIRS = libsoup po tests examples docs win32
EXTRA_DIST = \
data/effective_tld_names.dat \
diff --git a/configure.ac b/configure.ac
index 5e42831..0269e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,14 +430,14 @@ AC_CONFIG_FILES([
docs/reference/Makefile
libsoup/soup-version.h
config.h.win32
- build/win32/Makefile
- build/win32/vs9/Makefile
- build/win32/vs9/soup-gen-srcs.vsprops
- build/win32/vs10/Makefile
- build/win32/vs10/soup-gen-srcs.props
- build/win32/vs11/Makefile
- build/win32/vs12/Makefile
- build/win32/vs14/Makefile
- build/win32/vs15/Makefile
+ win32/Makefile
+ win32/vs9/Makefile
+ win32/vs9/soup-gen-srcs.vsprops
+ win32/vs10/Makefile
+ win32/vs10/soup-gen-srcs.props
+ win32/vs11/Makefile
+ win32/vs12/Makefile
+ win32/vs14/Makefile
+ win32/vs15/Makefile
])
AC_OUTPUT
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 2022bf3..4232be6 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -353,7 +353,7 @@ soup_gnome_HEADERS_DIR = $(libsoupgnomeincludedir)
soup_gnome_HEADERS_INST = $(libsoupgnomeinclude_HEADERS)
soup_gnome_HEADERS_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
if HAVE_INTROSPECTION
# Introspection Items for MSVC
@@ -364,13 +364,13 @@ endif
BASE_MSVC_GIR_CFLAGS = \
$(SOUP_COMMON_CPPFLAGS) \
- -I../..
+ -I..
INTROSPECTION_INTERMEDIATE_ITEMS = \
- $(top_builddir)/build/win32/Soup-2.4.gir.msvc.introspect \
- $(top_builddir)/build/win32/Soup_2_4_gir_list \
- $(top_builddir)/build/win32/SoupGNOME-2.4.gir.msvc.introspect \
- $(top_builddir)/build/win32/SoupGNOME_2_4_gir_list
+ $(top_builddir)/win32/Soup-2.4.gir.msvc.introspect \
+ $(top_builddir)/win32/Soup_2_4_gir_list \
+ $(top_builddir)/win32/SoupGNOME-2.4.gir.msvc.introspect \
+ $(top_builddir)/win32/SoupGNOME_2_4_gir_list
# libsoup
Soup_2_4_gir_MSVC_FILES = $(gi_soup_files) $(gi_built_soup_files)
@@ -393,14 +393,14 @@ SoupGNOME_2_4_gir_MSVC_SCANNERFLAGS = i \
--include-uninstalled=./Soup-2.4.gir
endif
-include $(top_srcdir)/build/Makefile.msvc-introspection
+include $(top_srcdir)/win32/Makefile.msvc-introspection
else
INTROSPECTION_INTERMEDIATE_ITEMS =
endif
dist-hook: \
- $(top_builddir)/build/win32/vs9/soup.vcproj \
- $(top_builddir)/build/win32/vs9/soup.headers \
- $(top_builddir)/build/win32/vs9/soup-gnome.vcproj \
- $(top_builddir)/build/win32/vs9/soup-gnome.headers \
+ $(top_builddir)/win32/vs9/soup.vcproj \
+ $(top_builddir)/win32/vs9/soup.headers \
+ $(top_builddir)/win32/vs9/soup-gnome.vcproj \
+ $(top_builddir)/win32/vs9/soup-gnome.headers \
$(INTROSPECTION_INTERMEDIATE_ITEMS)
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
new file mode 100644
index 0000000..3a91862
--- /dev/null
+++ b/win32/Makefile-newvs.am
@@ -0,0 +1,55 @@
+# Centralized autotools file
+# Create the Visual Studio 2012/2013/2015 project files
+# from the Visual Studio 2010 project files
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support.
+
+# Author: Fan, Chun-wei
+# November 05, 2012
+
+# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
+# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning
v$(MSVC_BASE_TOOLSET)
+# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
+# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
+
+if MSVC_BASE_NO_TOOLSET_SET
+MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
+endif
+
+if MSVC_NO_TOOLSET_SET
+MSVC_TOOLSET = $(MSVC_VER)0
+endif
+
+%.sln:
+ sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+ sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp >
$(top_builddir)/win32/vs$(MSVC_VER)/$@
+ rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+
+%.txt:
+ sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+ sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp >
$(top_builddir)/win32/vs$(MSVC_VER)/$@
+ rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
+
+%.vcxproj:
+ if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+ sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' <
$(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ fi
+
+%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
+ if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+ sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' <
$(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' <
$(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ fi
+
+%.vcxproj.filters:
+ if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
+ cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ fi
diff --git a/build/win32/Makefile.am b/win32/Makefile.am
similarity index 90%
rename from build/win32/Makefile.am
rename to win32/Makefile.am
index 794530a..00986d2 100644
--- a/build/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -12,7 +12,7 @@ introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-$(RM) introspection.body.mak
for F in `ls *.msvc.introspect`; do \
case $$F in \
- *) cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \
+ *) cat $(top_builddir)/win32/$$F >>introspection.body.mak \
;; \
esac; \
done
diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
similarity index 63%
rename from build/Makefile.msvc-introspection
rename to win32/Makefile.msvc-introspection
index 6c90964..1a244e0 100644
--- a/build/Makefile.msvc-introspection
+++ b/win32/Makefile.msvc-introspection
@@ -2,7 +2,7 @@
# Common autotools file for constructing the g-ir-scanner and
# g-ir-compiler command lines for Visual Studio builds.
-# This is copied from $(srcroot)/build from the gobject-introspection
+# This is copied from $(srcroot)/win32 from the gobject-introspection
# project, which may be included in projects that support both
# Visual Studio builds and introspection.
@@ -18,7 +18,7 @@
# is required unless --headers-only is specified in
# YourLib_1_0_gir__MSVC_SCANNERFLAGS)
#
-# include $(top_srcdir)/build/Makefile.msvc-introspection
+# include <this Makefile.msvc-introspection>
# MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
# YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
# YourLib_1_0_gir_VERSION = 1.0 # This is optional
@@ -27,7 +27,9 @@
# YourLib_1_0_gir_MSVC_PROGRAM = YourProgram
# YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files)
# YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's)
-# YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
+# YourLib_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
+# YourLib_1_0_gir_MSVC_C_INCLUDES = (List of public C headers which need to be included by
+# consumers at compile time to make use of the API)
# Private functions
@@ -63,6 +65,7 @@ _gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib))
_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
+_gir_c_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_C_INCLUDES),--c-include=$(include))
#
# Create NMake Makefile Sections for Building Introspection files
@@ -79,47 +82,48 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
$($(_gir_name)_MSVC_PROGRAM)),,
$(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-$(top_builddir)/build/win32/$(_gir_name)_list:
+$(top_builddir)/win32/$(_gir_name)_list:
for F in $(_gir_files_msvc); do \
case $$$$F in \
*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
- echo '..\..'$(_gir_source_subdir_msvc)$$$$F
$(top_builddir)/build/win32/$(_gir_name)_list \
+ echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \
;; \
esac; \
done
-$(top_builddir)/build/win32/$(1).msvc.introspect:
- -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
+$(top_builddir)/win32/$(1).msvc.introspect:
+ -$(RM) $(top_builddir)/win32/$(1).msvc.introspect
# Assemble the Command to Run g-ir-scanner
- echo $(1)': '$(_gir_name)'_list
'$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR)
\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --cflags-begin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --cflags-end \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+ echo $(1)': '$(_gir_name)'_list
'$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' @-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --verbose -no-libtool \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(_gir_c_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --cflags-begin \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --cflags-end \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
# Finally Assemble the Command to Compile the generated .gir
- echo '$(_typelib_basename_msvc).typelib:
'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(1)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+ echo '$(_typelib_basename_msvc).typelib:
'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' '$(1)' \'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
+ echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
endef
$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
new file mode 100644
index 0000000..2e96e12
--- /dev/null
+++ b/win32/Makefile.msvcproj
@@ -0,0 +1,153 @@
+# Author: Fan, Chun-wei
+# Common Autotools file used to generate Visual Studio 2008+
+# Projects from their templates
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support.
+
+# * Input variables:
+#
+# MSVCPROJS - List of Projects that should be generated
+#
+# * Simple tutorial
+#
+# Add this to Makefile.am where your library/program is built:
+# include <this Makefile.msvcproj>
+# MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
+# YourProject_FILES = $(libyourlib_1_0_SOURCES)
+# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random
unsed value if none
+# (the following 3 lines if headers need to be installed)
+# YourProject_HEADERS_DIR = $(libyourlibincludedir)
+# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
+# YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|',
wildcards allowed; use random unsed value if none>
+#
+# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in
the process)
+# $(top_builddir)/win32/vs9/YourProject.vcproj \
+# $(top_builddir)/win32/vs9/YourProject.headers # if headers need to be installed
+#
+# --or, if Visual Studio 2013 or later is required--
+# dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process)
+# $(top_builddir)/win32/vs12/YourProject.vcxproj \
+# $(top_builddir)/win32/vs12/YourProject.vs12.headers # if headers need to be installed
+
+# Private functions
+
+## Transform the MSVC project filename (no filename extensions) to something which can reference through a
variable
+## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
+_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
+_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
+_proj_path=$(subst /,\\,$(_proj_path_raw))
+_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\)
+_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int))
+
+_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
+_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
+_proj_filters=$($(_proj_name)_EXCLUDES)
+
+_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
+_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst
$(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
+_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
+
+_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
+_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
+
+#
+# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
+# $(1) - Base Name of the MSVC project files (outputs)
+#
+
+define msvcproj-builder
+
+$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj
+$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj
+
+$(top_builddir)/win32/vs9/$(1).vcproj: Makefile
+ -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj
+ -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
+
+
+ for F in $(_proj_files); do \
+ case $$$$F in \
+ $(_proj_filters)) \
+ ;; \
+ *.c|*.cpp|*.cc|*.cxx) \
+ echo ' <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles
&& \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
+ ;; \
+ esac; \
+ done
+
+
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin
$(top_builddir)/win32/vs10/$(1).vcxproj.filters
+ $(RM) $(1).sourcefiles
+ $(RM) $(1).vs10.sourcefiles
+ $(RM) $(1).vs10.sourcefiles.filters
+
+$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
+
+$(top_builddir)/win32/vs9/$(1).headers: Makefile
+ -$(RM) $(top_builddir)/win32/vs9/$(1).headers
+ -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
+
+ for F in $(_proj_headers); do \
+ case $$$$F in \
+ $(_proj_headers_excludes)) \
+ ;; \
+ *.h|*.hpp|*.hh|*.hxx) \
+ echo 'copy ..\..'$(_proj_subdir)$$$$F'
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'
' >>$(top_builddir)/win32/vs9/$(1).headers && \
+ echo 'copy ..\..'$(_proj_subdir)$$$$F'
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
+ ;; \
+ esac; \
+ done
+
+$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj
+
+$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
+ -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
+
+ for F in $(_proj_files); do \
+ case $$$$F in \
+ $(_proj_filters)) \
+ ;; \
+ *.c|*.cpp|*.cc|*.cxx) \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles
&& \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \
+ ;; \
+ esac; \
+ done
+
+ $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj
+ $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin
$(top_builddir)/win32/vs12/$(1).vcxproj.filters
+ $(RM) $(1).vs12.sourcefiles
+ $(RM) $(1).vs12.sourcefiles.filters
+
+$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile
+ -$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers
+
+ for F in $(_proj_headers); do \
+ case $$$$F in \
+ $(_proj_headers_excludes)) \
+ ;; \
+ *.h|*.hpp|*.hh|*.hxx) \
+ echo 'copy ..\..'$(_proj_subdir)$$$$F'
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \
+ ;; \
+ esac; \
+ done
+
+endef
+
+$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
similarity index 100%
rename from build/win32/detectenv-msvc.mak
rename to win32/detectenv-msvc.mak
diff --git a/build/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
similarity index 98%
rename from build/win32/introspection-msvc.mak
rename to win32/introspection-msvc.mak
index 8739844..26501f5 100644
--- a/build/win32/introspection-msvc.mak
+++ b/win32/introspection-msvc.mak
@@ -8,7 +8,7 @@
# Change or pass in or set the following to suit your environment
!if "$(PREFIX)" == ""
-PREFIX = ..\..\..\vs$(VSVER)\$(PLAT)
+PREFIX = ..\..\vs$(VSVER)\$(PLAT)
!endif
!if ![setlocal] && \
diff --git a/build/win32/replace.py b/win32/replace.py
similarity index 98%
rename from build/win32/replace.py
rename to win32/replace.py
index 69ef417..dbfb122 100644
--- a/build/win32/replace.py
+++ b/win32/replace.py
@@ -5,7 +5,7 @@
# This can be used in various projects where
# there is the need to replace strings in files,
-# and is copied from GLib's $(srcroot)/build/win32
+# and is copied from GLib's $(srcroot)/win32
# Author: Fan, Chun-wei
# Date: September 03, 2014
diff --git a/build/win32/soup-introspection-msvc.mak b/win32/soup-introspection-msvc.mak
similarity index 100%
rename from build/win32/soup-introspection-msvc.mak
rename to win32/soup-introspection-msvc.mak
diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
similarity index 66%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
index 1d87d37..f52fc7a 100644
--- a/build/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -27,11 +27,12 @@ EXTRA_DIST = \
soup-install.propsin \
$(GENERATED_ITEMS)
-soup-install.props: $(top_srcdir)/build/win32/vs10/soup-install.propsin $(MSVC_HEADERS_LIST)
- -$(RM) $(top_builddir)/build/win32/vs11/soup-install.props
- -$(RM) $(top_builddir)/build/win32/vs12/soup-install.props
- -$(RM) $(top_builddir)/build/win32/vs14/soup-install.props
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/soup-install.propsin >$@
+soup-install.props: $(top_srcdir)/win32/vs10/soup-install.propsin $(MSVC_HEADERS_LIST)
+ -$(RM) $(top_builddir)/win32/vs11/soup-install.props
+ -$(RM) $(top_builddir)/win32/vs12/soup-install.props
+ -$(RM) $(top_builddir)/win32/vs14/soup-install.props
+ -$(RM) $(top_builddir)/win32/vs15/soup-install.props
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/soup-install.propsin >$@
rm $(MSVC_HEADERS_LIST)
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs10/get.vcxproj b/win32/vs10/get.vcxproj
similarity index 92%
rename from build/win32/vs10/get.vcxproj
rename to win32/vs10/get.vcxproj
index 64833e7..1e2c09f 100644
--- a/build/win32/vs10/get.vcxproj
+++ b/win32/vs10/get.vcxproj
@@ -66,18 +66,8 @@
<Import Project="soup-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -155,7 +145,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\get.c" />
+ <ClCompile Include="..\..\examples\get.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="soup.vcxproj">
diff --git a/build/win32/vs10/get.vcxproj.filters b/win32/vs10/get.vcxproj.filters
similarity index 90%
rename from build/win32/vs10/get.vcxproj.filters
rename to win32/vs10/get.vcxproj.filters
index a683e37..9bc6fcf 100644
--- a/build/win32/vs10/get.vcxproj.filters
+++ b/win32/vs10/get.vcxproj.filters
@@ -12,6 +12,6 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions></Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\get.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\examples\get.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/libsoup.sln b/win32/vs10/libsoup.sln
similarity index 100%
rename from build/win32/vs10/libsoup.sln
rename to win32/vs10/libsoup.sln
diff --git a/build/win32/vs10/simple-httpd.vcxproj b/win32/vs10/simple-httpd.vcxproj
similarity index 92%
rename from build/win32/vs10/simple-httpd.vcxproj
rename to win32/vs10/simple-httpd.vcxproj
index 3726fed..e381703 100644
--- a/build/win32/vs10/simple-httpd.vcxproj
+++ b/win32/vs10/simple-httpd.vcxproj
@@ -66,18 +66,8 @@
<Import Project="soup-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -155,7 +145,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\simple-httpd.c" />
+ <ClCompile Include="..\..\examples\simple-httpd.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="soup.vcxproj">
diff --git a/build/win32/vs10/simple-httpd.vcxproj.filters b/win32/vs10/simple-httpd.vcxproj.filters
similarity index 89%
rename from build/win32/vs10/simple-httpd.vcxproj.filters
rename to win32/vs10/simple-httpd.vcxproj.filters
index c39bce0..14cf1d4 100644
--- a/build/win32/vs10/simple-httpd.vcxproj.filters
+++ b/win32/vs10/simple-httpd.vcxproj.filters
@@ -12,6 +12,6 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions></Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\simple-httpd.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\examples\simple-httpd.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/simple-proxy.vcxproj b/win32/vs10/simple-proxy.vcxproj
similarity index 92%
rename from build/win32/vs10/simple-proxy.vcxproj
rename to win32/vs10/simple-proxy.vcxproj
index 337ffd6..8d5f2d3 100644
--- a/build/win32/vs10/simple-proxy.vcxproj
+++ b/win32/vs10/simple-proxy.vcxproj
@@ -66,18 +66,8 @@
<Import Project="soup-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -155,7 +145,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\simple-proxy.c" />
+ <ClCompile Include="..\..\examples\simple-proxy.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="soup.vcxproj">
diff --git a/build/win32/vs10/simple-proxy.vcxproj.filters b/win32/vs10/simple-proxy.vcxproj.filters
similarity index 89%
rename from build/win32/vs10/simple-proxy.vcxproj.filters
rename to win32/vs10/simple-proxy.vcxproj.filters
index 1882594..4a7f2f2 100644
--- a/build/win32/vs10/simple-proxy.vcxproj.filters
+++ b/win32/vs10/simple-proxy.vcxproj.filters
@@ -12,6 +12,6 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions></Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\simple-proxy.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\examples\simple-proxy.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/soup-build-defines.props b/win32/vs10/soup-build-defines.props
similarity index 80%
rename from build/win32/vs10/soup-build-defines.props
rename to win32/vs10/soup-build-defines.props
index 51ce788..bee9889 100644
--- a/build/win32/vs10/soup-build-defines.props
+++ b/win32/vs10/soup-build-defines.props
@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/build/win32/vs10/soup-dll-build-defines.props b/win32/vs10/soup-dll-build-defines.props
similarity index 100%
rename from build/win32/vs10/soup-dll-build-defines.props
rename to win32/vs10/soup-dll-build-defines.props
diff --git a/build/win32/vs10/soup-gen-srcs.props.in b/win32/vs10/soup-gen-srcs.props.in
similarity index 57%
rename from build/win32/vs10/soup-gen-srcs.props.in
rename to win32/vs10/soup-gen-srcs.props.in
index de6a9ea..9361ad4 100644
--- a/build/win32/vs10/soup-gen-srcs.props.in
+++ b/win32/vs10/soup-gen-srcs.props.in
@@ -4,18 +4,14 @@
<Import Project="soup-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+ <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
<GenSoupVersionH>
-$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.in
--output=..\..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=@SOUP_MAJOR_VERSION@
-
-$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp1
--output=..\..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=@SOUP_MINOR_VERSION@
-
-$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp2
--output=..\..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=@SOUP_MICRO_VERSION@
-
-del ..\..\..\libsoup\soup-version.h.tmp1 ..\..\..\libsoup\soup-version.h.tmp2
-
+$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.in
--output=..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=@SOUP_MAJOR_VERSION@
+$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp1
--output=..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=@SOUP_MINOR_VERSION@
+$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp2
--output=..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=@SOUP_MICRO_VERSION@
+del ..\..\libsoup\soup-version.h.tmp1 ..\..\libsoup\soup-version.h.tmp2
</GenSoupVersionH>
- <GenTldDataInc>$(PythonPath)\python.exe ..\..\..\libsoup\tld-parser.py
..\..\..\data\effective_tld_names.dat ..\..\..\libsoup\tld_data.inc</GenTldDataInc>
+ <GenTldDataInc>$(PythonPath)\python.exe ..\..\libsoup\tld-parser.py ..\..\data\effective_tld_names.dat
..\..\libsoup\tld_data.inc</GenTldDataInc>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>soupgensrcsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/soup-gnome.vcxproj.filtersin b/win32/vs10/soup-gnome.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/soup-gnome.vcxproj.filtersin
rename to win32/vs10/soup-gnome.vcxproj.filtersin
diff --git a/build/win32/vs10/soup-gnome.vcxprojin b/win32/vs10/soup-gnome.vcxprojin
similarity index 93%
rename from build/win32/vs10/soup-gnome.vcxprojin
rename to win32/vs10/soup-gnome.vcxprojin
index 1341806..1fdc998 100644
--- a/build/win32/vs10/soup-gnome.vcxprojin
+++ b/win32/vs10/soup-gnome.vcxprojin
@@ -66,18 +66,8 @@
<Import Project="soup-dll-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
diff --git a/build/win32/vs10/soup-install.propsin b/win32/vs10/soup-install.propsin
similarity index 100%
rename from build/win32/vs10/soup-install.propsin
rename to win32/vs10/soup-install.propsin
diff --git a/build/win32/vs10/soup-install.vcxproj b/win32/vs10/soup-install.vcxproj
similarity index 81%
rename from build/win32/vs10/soup-install.vcxproj
rename to win32/vs10/soup-install.vcxproj
index 48fd448..726c39b 100644
--- a/build/win32/vs10/soup-install.vcxproj
+++ b/win32/vs10/soup-install.vcxproj
@@ -75,18 +75,12 @@
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying build results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SoupDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">some_file;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying build results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SoupDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">some_file;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying build results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SoupDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">some_file;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying build results...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SoupDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">some_file;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug'">Copying build results...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(SoupDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">some_file;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying build results...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(SoupDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">some_file;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
diff --git a/build/win32/vs10/soup-version-paths.props b/win32/vs10/soup-version-paths.props
similarity index 94%
rename from build/win32/vs10/soup-version-paths.props
rename to win32/vs10/soup-version-paths.props
index 5162832..7f4ef5b 100644
--- a/build/win32/vs10/soup-version-paths.props
+++ b/win32/vs10/soup-version-paths.props
@@ -4,7 +4,7 @@
</ImportGroup>
<PropertyGroup Label="UserMacros">
<VSVer>10</VSVer>
- <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<ApiVersion>2.4</ApiVersion>
<SoupLibtoolCompatibleDllPrefix>lib</SoupLibtoolCompatibleDllPrefix>
@@ -13,7 +13,7 @@
<SoupSeparateVSDllSuffix>-$(ApiVersion)-vs$(VSVer)</SoupSeparateVSDllSuffix>
<SoupDllPrefix>$(SoupSeparateVSDllPrefix)</SoupDllPrefix>
<SoupDllSuffix>$(SoupSeparateVSDllSuffix)</SoupDllSuffix>
- <PythonPath>c:\python27</PythonPath>
+ <PythonPath>c:\python34</PythonPath>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>soupversionpathsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/soup.vcxproj.filtersin b/win32/vs10/soup.vcxproj.filtersin
similarity index 77%
rename from build/win32/vs10/soup.vcxproj.filtersin
rename to win32/vs10/soup.vcxproj.filtersin
index 35b4dfb..d18b142 100644
--- a/build/win32/vs10/soup.vcxproj.filtersin
+++ b/win32/vs10/soup.vcxproj.filtersin
@@ -15,8 +15,8 @@
#include "soup.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\data\effective_tld_names.dat"><Filter>Resource
Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\libsoup\soup-version.h.in"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\data\effective_tld_names.dat"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\libsoup\soup-version.h.in"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/soup.vcxprojin b/win32/vs10/soup.vcxprojin
similarity index 61%
rename from build/win32/vs10/soup.vcxprojin
rename to win32/vs10/soup.vcxprojin
index a20700b..047ff28 100644
--- a/build/win32/vs10/soup.vcxprojin
+++ b/win32/vs10/soup.vcxprojin
@@ -120,14 +120,10 @@
<Import Project="soup-dll-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'"><LinkIncremental>true</LinkIncremental><OutDir>Debug\$(Platform)\bin\</OutDir></PropertyGroup>
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'"><LinkIncremental>true</LinkIncremental><OutDir>Debug\$(Platform)\bin\</OutDir></PropertyGroup>
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'"><LinkIncremental>false</LinkIncremental><OutDir>Release\$(Platform)\bin\</OutDir></PropertyGroup>
- <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'"><LinkIncremental>false</LinkIncremental><OutDir>Release\$(Platform)\bin\</OutDir></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'"><LinkIncremental>true</LinkIncremental><OutDir>Debug\$(Platform)\bin\</OutDir></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)'=='Release_MIT_GSSAPI'"><LinkIncremental>false</LinkIncremental><OutDir>Release\$(Platform)\bin\</OutDir></PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -296,83 +292,47 @@
#include "soup.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyConfigH)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">Copying config.h from
config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">Copying config.h from
config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">..\..\config.h;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\data\effective_tld_names.dat">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating tld_data.inc...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating tld_data.inc...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
tld_data.inc...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating tld_data.inc...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">Generating
tld_data.inc...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">Generating
tld_data.inc...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">Generating
tld_data.inc...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">Generating
tld_data.inc...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">$(GenTldDataInc)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\data\effective_tld_names.dat">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating tld_data.inc...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenTldDataInc)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating tld_data.inc...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenTldDataInc)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">Generating tld_data.inc...</Message>
+ <Command Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">$(GenTldDataInc)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">Generating tld_data.inc...</Message>
+ <Command Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">$(GenTldDataInc)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\libsoup\soup-version.h.in">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating
soup-version.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating soup-version.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
soup-version.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating
soup-version.h...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">Generating
soup-version.h...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">Generating
soup-version.h...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">Generating
soup-version.h...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">Generating
soup-version.h...</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">$(GenSoupVersionH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\libsoup\soup-version.h.in">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating soup-version.h...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenSoupVersionH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating soup-version.h...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenSoupVersionH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">Generating soup-version.h...</Message>
+ <Command Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">$(GenSoupVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug_MIT_GSSAPI'">..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">Generating soup-version.h...</Message>
+ <Command Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">$(GenSoupVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release_MIT_GSSAPI'">..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 84%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index 73dea7a..d67496b 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -19,8 +19,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 11
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2012
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
similarity index 84%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index 05052bf..dd6a7e5 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -19,8 +19,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 12
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2013
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
similarity index 84%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index 6e5bf71..87bd1b5 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -19,8 +19,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 14
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 14
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
similarity index 85%
rename from build/win32/vs15/Makefile.am
rename to win32/vs15/Makefile.am
index f9115ed..9820a88 100644
--- a/build/win32/vs15/Makefile.am
+++ b/win32/vs15/Makefile.am
@@ -19,9 +19,10 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST)
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
MSVC_VER = 15
-MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 15
MSVC_TOOLSET = 141
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 75%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
index 9984211..62f77fa 100644
--- a/build/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -20,8 +20,8 @@ EXTRA_DIST = \
soup-install.vspropsin \
$(GENERATED_ITEMS)
-soup-install.vsprops: $(top_srcdir)/build/win32/vs9/soup-install.vspropsin $(MSVC_HEADERS_LIST)
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/soup-install.vspropsin >$@
+soup-install.vsprops: $(top_srcdir)/win32/vs9/soup-install.vspropsin $(MSVC_HEADERS_LIST)
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/soup-install.vspropsin >$@
rm $(MSVC_HEADERS_LIST)
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/get.vcproj b/win32/vs9/get.vcproj
similarity index 98%
rename from build/win32/vs9/get.vcproj
rename to win32/vs9/get.vcproj
index a711c28..7c3f998 100644
--- a/build/win32/vs9/get.vcproj
+++ b/win32/vs9/get.vcproj
@@ -142,7 +142,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\examples\get.c" />
+ <File RelativePath="..\..\examples\get.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/libsoup.sln b/win32/vs9/libsoup.sln
similarity index 100%
rename from build/win32/vs9/libsoup.sln
rename to win32/vs9/libsoup.sln
diff --git a/build/win32/vs9/simple-httpd.vcproj b/win32/vs9/simple-httpd.vcproj
similarity index 98%
rename from build/win32/vs9/simple-httpd.vcproj
rename to win32/vs9/simple-httpd.vcproj
index 572a8b1..217306e 100644
--- a/build/win32/vs9/simple-httpd.vcproj
+++ b/win32/vs9/simple-httpd.vcproj
@@ -142,7 +142,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\examples\simple-httpd.c" />
+ <File RelativePath="..\..\examples\simple-httpd.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/simple-proxy.vcproj b/win32/vs9/simple-proxy.vcproj
similarity index 98%
rename from build/win32/vs9/simple-proxy.vcproj
rename to win32/vs9/simple-proxy.vcproj
index aeca43e..cd3582d 100644
--- a/build/win32/vs9/simple-proxy.vcproj
+++ b/win32/vs9/simple-proxy.vcproj
@@ -142,7 +142,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\examples\simple-proxy.c" />
+ <File RelativePath="..\..\examples\simple-proxy.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/soup-build-defines.vsprops b/win32/vs9/soup-build-defines.vsprops
similarity index 75%
rename from build/win32/vs9/soup-build-defines.vsprops
rename to win32/vs9/soup-build-defines.vsprops
index a7390e3..095d568 100644
--- a/build/win32/vs9/soup-build-defines.vsprops
+++ b/win32/vs9/soup-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include"
+
AdditionalIncludeDirectories="..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
diff --git a/build/win32/vs9/soup-dll-build-defines.vsprops b/win32/vs9/soup-dll-build-defines.vsprops
similarity index 100%
rename from build/win32/vs9/soup-dll-build-defines.vsprops
rename to win32/vs9/soup-dll-build-defines.vsprops
diff --git a/win32/vs9/soup-gen-srcs.vsprops.in b/win32/vs9/soup-gen-srcs.vsprops.in
new file mode 100644
index 0000000..87518b6
--- /dev/null
+++ b/win32/vs9/soup-gen-srcs.vsprops.in
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="soupgensrcsprops"
+ InheritedPropertySheets=".\soup-build-defines.vsprops"
+ >
+ <UserMacro
+ Name="CopyConfigH"
+ Value="copy ..\..\config.h.win32 ..\..\config.h"
+ />
+ <UserMacro
+ Name="GenSoupVersionH"
+ Value="
+$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.in
--output=..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION
--outstring=@SOUP_MAJOR_VERSION@

+$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp1
--output=..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION
--outstring=@SOUP_MINOR_VERSION@

+$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp2
--output=..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=@SOUP_MICRO_VERSION@

+del ..\..\libsoup\soup-version.h.tmp1 ..\..\libsoup\soup-version.h.tmp2

+ "
+ />
+ <UserMacro
+ Name="GenTldDataInc"
+ Value="$(PythonPath)\python.exe ..\..\libsoup\tld-parser.py
..\..\data\effective_tld_names.dat ..\..\libsoup\tld_data.inc"
+ />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/soup-gnome.vcprojin b/win32/vs9/soup-gnome.vcprojin
similarity index 100%
rename from build/win32/vs9/soup-gnome.vcprojin
rename to win32/vs9/soup-gnome.vcprojin
diff --git a/build/win32/vs9/soup-install.vcproj b/win32/vs9/soup-install.vcproj
similarity index 100%
rename from build/win32/vs9/soup-install.vcproj
rename to win32/vs9/soup-install.vcproj
diff --git a/build/win32/vs9/soup-install.vspropsin b/win32/vs9/soup-install.vspropsin
similarity index 100%
rename from build/win32/vs9/soup-install.vspropsin
rename to win32/vs9/soup-install.vspropsin
diff --git a/build/win32/vs9/soup-version-paths.vsprops b/win32/vs9/soup-version-paths.vsprops
similarity index 95%
rename from build/win32/vs9/soup-version-paths.vsprops
rename to win32/vs9/soup-version-paths.vsprops
index ced6e94..8f845a6 100644
--- a/build/win32/vs9/soup-version-paths.vsprops
+++ b/win32/vs9/soup-version-paths.vsprops
@@ -10,7 +10,7 @@
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
diff --git a/build/win32/vs9/soup.vcprojin b/win32/vs9/soup.vcprojin
similarity index 83%
rename from build/win32/vs9/soup.vcprojin
rename to win32/vs9/soup.vcprojin
index efd71ef..58f4baa 100644
--- a/build/win32/vs9/soup.vcprojin
+++ b/win32/vs9/soup.vcprojin
@@ -281,35 +281,35 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\config.h.win32">
- <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
- <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
- <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
- <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
- <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
- <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
- <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
- <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
+ <File RelativePath="..\..\config.h.win32">
+ <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h"
/></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h"
/></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h"
/></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h"
/></FileConfiguration>
+ <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)" Outputs="..\..\config.h"
/></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\config.h" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\data\effective_tld_names.dat">
- <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
- <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
- <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
- <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
- <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
- <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
- <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
- <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
+ <File RelativePath="..\..\data\effective_tld_names.dat">
+ <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)" Outputs="..\..\libsoup\tld_data.inc"
/></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\libsoup\tld_data.inc" /></FileConfiguration>
+ <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)" Outputs="..\..\libsoup\tld_data.inc"
/></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\libsoup\tld_data.inc" /></FileConfiguration>
+ <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)" Outputs="..\..\libsoup\tld_data.inc"
/></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)" Outputs="..\..\libsoup\tld_data.inc"
/></FileConfiguration>
+ <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)" Outputs="..\..\libsoup\tld_data.inc"
/></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\libsoup\tld_data.inc" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\libsoup\soup-version.h.in">
- <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
- <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
- <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
- <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
- <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
- <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
- <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
- <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <File RelativePath="..\..\libsoup\soup-version.h.in">
+ <FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\libsoup\soup-version.h" /></FileConfiguration>
</File>
</Filter>
</Files>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
