[glib] Visual Studio builds: Move project files to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Visual Studio builds: Move project files to win32/
- Date: Mon, 9 Jan 2017 06:18:17 +0000 (UTC)
commit 6dfc6fee7bd6911ce8facb22d78c63439f60571f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jan 9 14:00:46 2017 +0800
Visual Studio builds: Move project files to win32/
It was suggested that the project files be moved here as we don't actually
need to go two directory layers from $(srcroot), and would help us to
standardize on things in the future across the board.
Makefile.am | 2 +-
README.win32 | 8 +-
build/Makefile-newvs.am | 47 --
build/Makefile.msvcproj | 154 -----
build/win32/Makefile.am | 12 +-
build/win32/vs10/glib.vcxproj.filtersin | 122 ----
build/win32/vs10/glib.vcxprojin | 675 --------------------
configure.ac | 15 +-
gio/Makefile.am | 12 +-
glib/Makefile.am | 4 +-
gobject/Makefile.am | 4 +-
win32/Makefile-newvs.am | 46 ++
win32/Makefile.am | 6 +
win32/Makefile.msvcproj | 153 +++++
{build/win32 => win32}/detectenv-msvc.mak | 0
{build/win32 => win32}/glibpc.py | 0
{build/win32 => win32}/pc_base.py | 2 +-
{build/win32 => win32}/replace.py | 0
{build/win32 => win32}/setup.py | 110 ++--
{build/win32 => win32}/vs10/.gitignore | 0
{build/win32 => win32}/vs10/Makefile.am | 10 +-
{build/win32 => win32}/vs10/README.txt | 0
{build/win32 => win32}/vs10/gdbus.vcxproj | 12 +-
{build/win32 => win32}/vs10/gdbus.vcxproj.filters | 4 +-
.../win32 => win32}/vs10/gio-querymodules.vcxproj | 12 +-
.../vs10/gio-querymodules.vcxproj.filters | 4 +-
.../vs10/gio-tool.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/gio-tool.vcxprojin | 8 +-
{build/win32 => win32}/vs10/gio.vcxproj.filtersin | 4 +-
{build/win32 => win32}/vs10/gio.vcxprojin | 30 +-
.../win32 => win32}/vs10/glib-build-defines.props | 2 +-
.../vs10/glib-compile-resources.vcxproj.filtersin | 0
.../vs10/glib-compile-resources.vcxprojin | 8 +-
.../vs10/glib-compile-schemas.vcxproj.filtersin | 0
.../vs10/glib-compile-schemas.vcxprojin | 8 +-
{build/win32 => win32}/vs10/glib-gen-srcs.props | 10 +-
.../win32 => win32}/vs10/glib-genmarshal.vcxproj | 4 +-
.../vs10/glib-genmarshal.vcxproj.filters | 4 +-
{build/win32 => win32}/vs10/glib-install.propsin | 24 +-
{build/win32 => win32}/vs10/glib-install.vcxproj | 58 +--
.../vs10/glib-install.vcxproj.filters | 2 +-
.../vs10/glib-version-paths.props.in | 4 +-
{build/win32 => win32}/vs10/glib.sln | 0
win32/vs10/glib.vcxproj.filtersin | 66 ++
win32/vs10/glib.vcxprojin | 533 +++++++++++++++
{build/win32 => win32}/vs10/gmodule.vcxproj | 32 +-
.../win32 => win32}/vs10/gmodule.vcxproj.filters | 8 +-
.../win32 => win32}/vs10/gobject.vcxproj.filtersin | 4 +-
{build/win32 => win32}/vs10/gobject.vcxprojin | 28 +-
{build/win32 => win32}/vs10/gresource.vcxproj | 12 +-
.../win32 => win32}/vs10/gresource.vcxproj.filters | 4 +-
{build/win32 => win32}/vs10/gsettings.vcxproj | 12 +-
.../win32 => win32}/vs10/gsettings.vcxproj.filters | 4 +-
.../vs10/gspawn-win32-helper-console.vcxproj | 4 +-
.../gspawn-win32-helper-console.vcxproj.filters | 4 +-
.../vs10/gspawn-win32-helper.vcxproj | 4 +-
.../vs10/gspawn-win32-helper.vcxproj.filters | 4 +-
{build/win32 => win32}/vs10/gthread.vcxproj | 6 +-
.../win32 => win32}/vs10/gthread.vcxproj.filters | 10 +-
{build/win32 => win32}/vs11/.gitignore | 0
{build/win32 => win32}/vs11/Makefile.am | 2 +-
{build/win32 => win32}/vs12/.gitignore | 0
{build/win32 => win32}/vs12/Makefile.am | 2 +-
{build/win32 => win32}/vs14/Makefile.am | 2 +-
{build/win32 => win32}/vs9/.gitignore | 0
{build/win32 => win32}/vs9/Makefile.am | 4 +-
{build/win32 => win32}/vs9/README.txt | 0
{build/win32 => win32}/vs9/gdbus.vcproj | 10 +-
{build/win32 => win32}/vs9/gio-querymodules.vcproj | 10 +-
{build/win32 => win32}/vs9/gio-tool.vcprojin | 8 +-
{build/win32 => win32}/vs9/gio.vcprojin | 20 +-
.../win32 => win32}/vs9/glib-build-defines.vsprops | 2 +-
.../vs9/glib-compile-resources.vcprojin | 8 +-
.../vs9/glib-compile-schemas.vcprojin | 8 +-
{build/win32 => win32}/vs9/glib-gen-srcs.vsprops | 10 +-
{build/win32 => win32}/vs9/glib-genmarshal.vcproj | 2 +-
{build/win32 => win32}/vs9/glib-install.vcproj | 0
{build/win32 => win32}/vs9/glib-install.vspropsin | 24 +-
.../vs9/glib-version-paths.vsprops.in | 2 +-
{build/win32 => win32}/vs9/glib.sln | 0
{build/win32 => win32}/vs9/glib.vcprojin | 94 ++--
{build/win32 => win32}/vs9/gmodule.vcproj | 14 +-
{build/win32 => win32}/vs9/gobject.vcprojin | 12 +-
{build/win32 => win32}/vs9/gresource.vcproj | 10 +-
{build/win32 => win32}/vs9/gsettings.vcproj | 10 +-
.../vs9/gspawn-win32-helper-console.vcproj | 2 +-
.../win32 => win32}/vs9/gspawn-win32-helper.vcproj | 2 +-
{build/win32 => win32}/vs9/gthread.vcproj | 4 +-
88 files changed, 1166 insertions(+), 1411 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 54f22ee..008ad58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ include $(top_srcdir)/glib.mk
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
-DIST_SUBDIRS = $(SUBDIRS) build
+DIST_SUBDIRS = $(SUBDIRS) build win32
bin_SCRIPTS = glib-gettextize
diff --git a/README.win32 b/README.win32
index 6e2d9da..fa6a3a0 100644
--- a/README.win32
+++ b/README.win32
@@ -191,15 +191,15 @@ information. Note that you will need a libintl implementation, zlib, and
libFFI.
If you are building from a GIT checkout, you will first need to use some
-Unix-like environment or run build/win32/setup.py,
+Unix-like environment or run win32/setup.py,
which will expand the VS 2008/2010 project files, the DLL resouce files and
-other miscellanious files required for the build. Run build/win32/setup.py
+other miscellanious files required for the build. Run win32/setup.py
as follows:
-$python build/win32/setup.py --perl path_to_your_perl.exe
+$python win32/setup.py --perl path_to_your_perl.exe
for more usage on this script, run
-$python build/win32/setup.py -h/--help
+$python win32/setup.py -h/--help
Building with MSVC and NMAKE
============================
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 5c2dac8..2f701b0 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,14 +1,6 @@
SUBDIRS = \
- dirent \
- vs9 \
- vs10 \
- vs11 \
- vs12 \
- vs14
+ dirent
EXTRA_DIST = \
- glibpc.py \
make.msc \
- module.defs \
- pc_base.py \
- replace.py
+ module.defs
diff --git a/configure.ac b/configure.ac
index 324178a..000130e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3434,13 +3434,14 @@ Makefile
build/Makefile
build/win32/Makefile
build/win32/dirent/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/glib-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/glib-version-paths.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
-build/win32/vs14/Makefile
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/glib-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/glib-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
glib/Makefile
glib/libcharset/Makefile
glib/gnulib/Makefile
diff --git a/gio/Makefile.am b/gio/Makefile.am
index cbeeaa1..1ca27fc 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -947,15 +947,15 @@ glib_compile_schemas_EXCLUDES = dummy
gio_tool_FILES = $(gio_SOURCES)
gio_tool_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
dist-hook: \
$(BUILT_EXTRA_DIST) \
- $(top_builddir)/build/win32/vs9/gio.vcproj \
- $(top_builddir)/build/win32/vs9/gio.headers \
- $(top_builddir)/build/win32/vs9/glib-compile-schemas.vcproj \
- $(top_builddir)/build/win32/vs9/glib-compile-resources.vcproj \
- $(top_builddir)/build/win32/vs9/gio-tool.vcproj
+ $(top_builddir)/win32/vs9/gio.vcproj \
+ $(top_builddir)/win32/vs9/gio.headers \
+ $(top_builddir)/win32/vs9/glib-compile-schemas.vcproj \
+ $(top_builddir)/win32/vs9/glib-compile-resources.vcproj \
+ $(top_builddir)/win32/vs9/gio-tool.vcproj
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 82a7d3a..2aeaddd 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -466,9 +466,9 @@ glib_HEADERS_DIR = $(glibsubincludedir)
glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS)
glib_HEADERS_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
-dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/glib.vcproj
$(top_builddir)/build/win32/vs9/glib.headers
+dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/glib.vcproj $(top_builddir)/win32/vs9/glib.headers
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 948e869..b12743c 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -242,9 +242,9 @@ gobject_HEADERS_DIR = $(libgobjectincludedir)
gobject_HEADERS_INST = $(gobject_public_h_sources)
gobject_HEADERS_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
-dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/gobject.vcproj
$(top_builddir)/build/win32/vs9/gobject.headers
+dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/gobject.vcproj
$(top_builddir)/win32/vs9/gobject.headers
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
new file mode 100644
index 0000000..ecdf3b5
--- /dev/null
+++ b/win32/Makefile-newvs.am
@@ -0,0 +1,46 @@
+# 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 (10 for 2010, 11 for 2012, 12
for 2013, 14 for 2015 and so on)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on)
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
+
+%.sln:
+ sed 's/11\.00/$(MSVC_FORMAT_VER)\.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_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/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/win32/Makefile.am b/win32/Makefile.am
new file mode 100644
index 0000000..44a6345
--- /dev/null
+++ b/win32/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = vs9 vs10 vs11 vs12 vs14
+
+EXTRA_DIST = \
+ glibpc.py \
+ pc_base.py \
+ replace.py
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/glibpc.py b/win32/glibpc.py
similarity index 100%
rename from build/win32/glibpc.py
rename to win32/glibpc.py
diff --git a/build/win32/pc_base.py b/win32/pc_base.py
similarity index 99%
rename from build/win32/pc_base.py
rename to win32/pc_base.py
index 587ba83..285b6cd 100644
--- a/build/win32/pc_base.py
+++ b/win32/pc_base.py
@@ -23,7 +23,7 @@ class BasePCItems:
self.libdir = ''
self.prefix = ''
self.srcdir = os.path.dirname(__file__)
- self.top_srcdir = self.srcdir + '\\..\\..'
+ self.top_srcdir = self.srcdir + '\\..'
self.version = ''
def setup(self, argv, parser=None):
diff --git a/build/win32/replace.py b/win32/replace.py
similarity index 100%
rename from build/win32/replace.py
rename to win32/replace.py
diff --git a/build/win32/setup.py b/win32/setup.py
similarity index 70%
rename from build/win32/setup.py
rename to win32/setup.py
index 749b880..f3cac2e 100644
--- a/build/win32/setup.py
+++ b/win32/setup.py
@@ -42,7 +42,7 @@ def get_srcroot():
else:
path = __file__
dirname = os.path.dirname(path)
- return os.path.abspath(os.path.join(dirname, '..', '..'))
+ return os.path.abspath(os.path.join(dirname, '..'))
def process_include(src, dest, includes):
RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"')
@@ -82,15 +82,15 @@ def generate_libgio_sourcefiles(srcroot, dest, stype):
if stype == '9':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<File RelativePath="..\\..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n')
+ d.write('\t\t\t<File RelativePath="..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n')
elif stype == '10':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<ClCompile Include="..\\..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n')
+ d.write('\t\t\t<ClCompile Include="..\\..\\gio\\' + i.replace('/', '\\') + '"/>\n')
elif stype == '10f':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<ClCompile Include="..\\..\\..\\gio\\' + i.replace('/', '\\') +
'"><Filter>Source Files</Filter></ClCompile>\n')
+ d.write('\t\t\t<ClCompile Include="..\\..\\gio\\' + i.replace('/', '\\') + '"><Filter>Source
Files</Filter></ClCompile>\n')
else:
raise Exception("Must specify project type (9, 10 or 10f)")
@@ -122,15 +122,15 @@ def generate_libglib_sourcefiles(srcroot, dest, stype):
if stype == '9':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<File RelativePath="..\\..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n')
+ d.write('\t\t\t<File RelativePath="..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n')
elif stype == '10':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<ClCompile Include="..\\..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n')
+ d.write('\t\t\t<ClCompile Include="..\\..\\glib\\' + i.replace('/', '\\') + '"/>\n')
elif stype == '10f':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<ClCompile Include="..\\..\\..\\glib\\' + i.replace('/', '\\') +
'"><Filter>Source Files</Filter></ClCompile>\n')
+ d.write('\t\t\t<ClCompile Include="..\\..\\glib\\' + i.replace('/', '\\') +
'"><Filter>Source Files</Filter></ClCompile>\n')
else:
raise Exception("Must specify project type (9, 10 or 10f)")
@@ -146,15 +146,15 @@ def generate_libgobject_sourcefiles(srcroot, dest, stype):
if stype == '9':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<File RelativePath="..\\..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n')
+ d.write('\t\t\t<File RelativePath="..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n')
elif stype == '10':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<ClCompile Include="..\\..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n')
+ d.write('\t\t\t<ClCompile Include="..\\..\\gobject\\' + i.replace('/', '\\') + '"/>\n')
elif stype == '10f':
with open(dest, 'w') as d:
for i in sources:
- d.write('\t\t\t<ClCompile Include="..\\..\\..\\gobject\\' + i.replace('/', '\\') +
'"><Filter>Source Files</Filter></ClCompile>\n')
+ d.write('\t\t\t<ClCompile Include="..\\..\\gobject\\' + i.replace('/', '\\') +
'"><Filter>Source Files</Filter></ClCompile>\n')
else:
raise Exception("Must specify project type (9, 10 or 10f)")
@@ -263,23 +263,23 @@ def main(argv):
#------------ submodule gobject -------------------
generate_libglib_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libglib.sourcefiles'), '9')
+ os.path.join(srcroot, 'win32', 'libglib.sourcefiles'), '9')
generate_libglib_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles'), '10')
+ os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles'), '10')
generate_libglib_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles.filters'),
'10f')
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'glib.vcprojin'),
- os.path.join(srcroot, 'build', 'win32', 'vs9', 'glib.vcproj'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxprojin'),
- os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj.filtersin'),
- os.path.join(srcroot, 'build', 'win32', 'vs10', 'glib.vcxproj.filters'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.sourcefiles'))
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles'))
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libglib.vs10.sourcefiles.filters'))
+ os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters'), '10f')
+ process_include(os.path.join(srcroot, 'win32', 'vs9', 'glib.vcprojin'),
+ os.path.join(srcroot, 'win32', 'vs9', 'glib.vcproj'),
+ includes = [os.path.join(srcroot, 'win32')])
+ process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxprojin'),
+ os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj'),
+ includes = [os.path.join(srcroot, 'win32')])
+ process_include(os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filtersin'),
+ os.path.join(srcroot, 'win32', 'vs10', 'glib.vcxproj.filters'),
+ includes = [os.path.join(srcroot, 'win32')])
+ os.unlink(os.path.join(srcroot, 'win32', 'libglib.sourcefiles'))
+ os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles'))
+ os.unlink(os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles.filters'))
with open(os.path.join(srcroot, 'glib', 'gspawn-win32-helper-console.c'), 'w') as c:
c.write('#define HELPER_CONSOLE\n')
c.write('#include "gspawn-win32-helper.c"\n')
@@ -318,45 +318,45 @@ def main(argv):
os.chdir(cwd)
generate_libgobject_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libgobject.sourcefiles'), '9')
+ os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9')
generate_libgobject_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles'), '10')
+ os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles'), '10')
generate_libgobject_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32',
'libgobject.vs10.sourcefiles.filters'), '10f')
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'gobject.vcprojin'),
- os.path.join(srcroot, 'build', 'win32', 'vs9', 'gobject.vcproj'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxprojin'),
- os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj.filtersin'),
- os.path.join(srcroot, 'build', 'win32', 'vs10', 'gobject.vcxproj.filters'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.sourcefiles'))
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles'))
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgobject.vs10.sourcefiles.filters'))
+ os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters'), '10f')
+ process_include(os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcprojin'),
+ os.path.join(srcroot, 'win32', 'vs9', 'gobject.vcproj'),
+ includes = [os.path.join(srcroot, 'win32')])
+ process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxprojin'),
+ os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj'),
+ includes = [os.path.join(srcroot, 'win32')])
+ process_include(os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filtersin'),
+ os.path.join(srcroot, 'win32', 'vs10', 'gobject.vcxproj.filters'),
+ includes = [os.path.join(srcroot, 'win32')])
+ os.unlink(os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'))
+ os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles'))
+ os.unlink(os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles.filters'))
#------------ end of submodule gobject -------------------
#------------ submodule gio -------------------
#depends on glib-mkenums
generate_libgio_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libgio.sourcefiles'), '9')
+ os.path.join(srcroot, 'win32', 'libgio.sourcefiles'), '9')
generate_libgio_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles'), '10')
+ os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles'), '10')
generate_libgio_sourcefiles(srcroot,
- os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles.filters'),
'10f')
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs9', 'gio.vcprojin'),
- os.path.join(srcroot, 'build', 'win32', 'vs9', 'gio.vcproj'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxprojin'),
- os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- process_include(os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj.filtersin'),
- os.path.join(srcroot, 'build', 'win32', 'vs10', 'gio.vcxproj.filters'),
- includes = [os.path.join(srcroot, 'build', 'win32')])
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.sourcefiles'))
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles'))
- os.unlink(os.path.join(srcroot, 'build', 'win32', 'libgio.vs10.sourcefiles.filters'))
+ os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters'), '10f')
+ process_include(os.path.join(srcroot, 'win32', 'vs9', 'gio.vcprojin'),
+ os.path.join(srcroot, 'win32', 'vs9', 'gio.vcproj'),
+ includes = [os.path.join(srcroot, 'win32')])
+ process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxprojin'),
+ os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj'),
+ includes = [os.path.join(srcroot, 'win32')])
+ process_include(os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filtersin'),
+ os.path.join(srcroot, 'win32', 'vs10', 'gio.vcxproj.filters'),
+ includes = [os.path.join(srcroot, 'win32')])
+ os.unlink(os.path.join(srcroot, 'win32', 'libgio.sourcefiles'))
+ os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles'))
+ os.unlink(os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles.filters'))
generate_libgio_enumtypes(srcroot, opt.perl)
#------------ end of submodule gio -------------------
diff --git a/build/win32/vs10/.gitignore b/win32/vs10/.gitignore
similarity index 100%
rename from build/win32/vs10/.gitignore
rename to win32/vs10/.gitignore
diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
similarity index 82%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
index 078ee7d..08912db 100644
--- a/build/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -57,11 +57,11 @@ EXTRA_DIST = \
glib-gen-srcs.props \
$(GENERATED_ITEMS)
-glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
- -$(RM) $(top_builddir)/build/win32/vs11/glib-install.props
- -$(RM) $(top_builddir)/build/win32/vs12/glib-install.props
- -$(RM) $(top_builddir)/build/win32/vs14/glib-install.props
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@
+glib-install.props: $(top_srcdir)/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
+ -$(RM) $(top_builddir)/win32/vs11/glib-install.props
+ -$(RM) $(top_builddir)/win32/vs12/glib-install.props
+ -$(RM) $(top_builddir)/win32/vs14/glib-install.props
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/glib-install.propsin >$@
rm $(MSVC10_HEADERS_LIST)
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs10/README.txt b/win32/vs10/README.txt
similarity index 100%
rename from build/win32/vs10/README.txt
rename to win32/vs10/README.txt
diff --git a/build/win32/vs10/gdbus.vcxproj b/win32/vs10/gdbus.vcxproj
similarity index 94%
rename from build/win32/vs10/gdbus.vcxproj
rename to win32/vs10/gdbus.vcxproj
index 759143f..2c2cdf6 100644
--- a/build/win32/vs10/gdbus.vcxproj
+++ b/win32/vs10/gdbus.vcxproj
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -137,7 +137,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -158,7 +158,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gdbus-tool.c" />
+ <ClCompile Include="..\..\gio\gdbus-tool.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gio.vcxproj">
@@ -177,4 +177,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdbus.vcxproj.filters b/win32/vs10/gdbus.vcxproj.filters
similarity index 87%
rename from build/win32/vs10/gdbus.vcxproj.filters
rename to win32/vs10/gdbus.vcxproj.filters
index ce37c1c..1921c49 100644
--- a/build/win32/vs10/gdbus.vcxproj.filters
+++ b/win32/vs10/gdbus.vcxproj.filters
@@ -7,8 +7,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gdbus-tool.c">
+ <ClCompile Include="..\..\gio\gdbus-tool.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gio-querymodules.vcxproj b/win32/vs10/gio-querymodules.vcxproj
similarity index 94%
rename from build/win32/vs10/gio-querymodules.vcxproj
rename to win32/vs10/gio-querymodules.vcxproj
index b33a1d1..41a6edd 100644
--- a/build/win32/vs10/gio-querymodules.vcxproj
+++ b/win32/vs10/gio-querymodules.vcxproj
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -137,7 +137,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -158,7 +158,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gio-querymodules.c" />
+ <ClCompile Include="..\..\gio\gio-querymodules.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gio.vcxproj">
@@ -181,4 +181,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gio-querymodules.vcxproj.filters b/win32/vs10/gio-querymodules.vcxproj.filters
similarity index 86%
rename from build/win32/vs10/gio-querymodules.vcxproj.filters
rename to win32/vs10/gio-querymodules.vcxproj.filters
index 79fbfa1..c39abf5 100644
--- a/build/win32/vs10/gio-querymodules.vcxproj.filters
+++ b/win32/vs10/gio-querymodules.vcxproj.filters
@@ -7,8 +7,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gio-querymodules.c">
+ <ClCompile Include="..\..\gio\gio-querymodules.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gio-tool.vcxproj.filtersin b/win32/vs10/gio-tool.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/gio-tool.vcxproj.filtersin
rename to win32/vs10/gio-tool.vcxproj.filtersin
diff --git a/build/win32/vs10/gio-tool.vcxprojin b/win32/vs10/gio-tool.vcxprojin
similarity index 94%
rename from build/win32/vs10/gio-tool.vcxprojin
rename to win32/vs10/gio-tool.vcxprojin
index 4d7cf39..60d662a 100644
--- a/build/win32/vs10/gio-tool.vcxprojin
+++ b/win32/vs10/gio-tool.vcxprojin
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -96,7 +96,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -122,7 +122,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -143,7 +143,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/win32/vs10/gio.vcxproj.filtersin
similarity index 86%
rename from build/win32/vs10/gio.vcxproj.filtersin
rename to win32/vs10/gio.vcxproj.filtersin
index 6c1abec..72a6201 100644
--- a/build/win32/vs10/gio.vcxproj.filtersin
+++ b/win32/vs10/gio.vcxproj.filtersin
@@ -18,10 +18,10 @@
#include "gio.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gio\gnetworking.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\gio\gnetworking.h.win32"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gio\gio.rc">
+ <ResourceCompile Include="..\..\gio\gio.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/build/win32/vs10/gio.vcxprojin b/win32/vs10/gio.vcxprojin
similarity index 83%
rename from build/win32/vs10/gio.vcxprojin
rename to win32/vs10/gio.vcxprojin
index fecd2ca..2e61dee 100644
--- a/build/win32/vs10/gio.vcxprojin
+++ b/win32/vs10/gio.vcxprojin
@@ -74,7 +74,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -100,7 +100,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -127,7 +127,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -153,7 +153,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -181,23 +181,17 @@
#include "gio.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gio\gnetworking.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gnetworking.h from
gnetworking.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGNetworkingH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gnetworking.h from
gnetworking.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGNetworkingH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gnetworking.h from
gnetworking.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGNetworkingH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gnetworking.h from
gnetworking.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGNetworkingH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gio\gnetworking.h;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\gio\gnetworking.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug|Win32'">Copying gnetworking.h from
gnetworking.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug|Win32'">$(GenGNetworkingH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug|Win32'">..\..\gio\gnetworking.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying gnetworking.h from
gnetworking.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenGNetworkingH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gnetworking.h;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gio\gio.rc" />
+ <ResourceCompile Include="..\..\gio\gio.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
diff --git a/build/win32/vs10/glib-build-defines.props b/win32/vs10/glib-build-defines.props
similarity index 96%
rename from build/win32/vs10/glib-build-defines.props
rename to win32/vs10/glib-build-defines.props
index 9634e5b..6de6fec 100644
--- a/build/win32/vs10/glib-build-defines.props
+++ b/win32/vs10/glib-build-defines.props
@@ -26,7 +26,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..;..\..\glib;$(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/glib-compile-resources.vcxproj.filtersin
b/win32/vs10/glib-compile-resources.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/glib-compile-resources.vcxproj.filtersin
rename to win32/vs10/glib-compile-resources.vcxproj.filtersin
diff --git a/build/win32/vs10/glib-compile-resources.vcxprojin b/win32/vs10/glib-compile-resources.vcxprojin
similarity index 94%
rename from build/win32/vs10/glib-compile-resources.vcxprojin
rename to win32/vs10/glib-compile-resources.vcxprojin
index e098347..f28e59d 100644
--- a/build/win32/vs10/glib-compile-resources.vcxprojin
+++ b/win32/vs10/glib-compile-resources.vcxprojin
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -137,7 +137,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
diff --git a/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin
b/win32/vs10/glib-compile-schemas.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/glib-compile-schemas.vcxproj.filtersin
rename to win32/vs10/glib-compile-schemas.vcxproj.filtersin
diff --git a/build/win32/vs10/glib-compile-schemas.vcxprojin b/win32/vs10/glib-compile-schemas.vcxprojin
similarity index 94%
rename from build/win32/vs10/glib-compile-schemas.vcxprojin
rename to win32/vs10/glib-compile-schemas.vcxprojin
index fff97fb..ba4199a 100644
--- a/build/win32/vs10/glib-compile-schemas.vcxprojin
+++ b/win32/vs10/glib-compile-schemas.vcxprojin
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -137,7 +137,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
diff --git a/build/win32/vs10/glib-gen-srcs.props b/win32/vs10/glib-gen-srcs.props
similarity index 67%
rename from build/win32/vs10/glib-gen-srcs.props
rename to win32/vs10/glib-gen-srcs.props
index 64a20ea..a9fc09a 100644
--- a/build/win32/vs10/glib-gen-srcs.props
+++ b/win32/vs10/glib-gen-srcs.props
@@ -4,11 +4,11 @@
<Import Project="glib-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
- <GenGLibConfigH>copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h</GenGLibConfigH>
- <GenGModuleConfH>copy ..\..\..\gmodule\gmoduleconf.h.win32
..\..\..\gmodule\gmoduleconf.h</GenGModuleConfH>
- <GenGNetworkingH>copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h</GenGNetworkingH>
- <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py
--action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums
--var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums>
+ <GenConfigH>copy ..\..\config.h.win32 ..\..\config.h</GenConfigH>
+ <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH>
+ <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH>
+ <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH>
+ <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py
--action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums
--var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/glib-genmarshal.vcxproj b/win32/vs10/glib-genmarshal.vcxproj
similarity index 99%
rename from build/win32/vs10/glib-genmarshal.vcxproj
rename to win32/vs10/glib-genmarshal.vcxproj
index 8f31f7b..2ce4b28 100644
--- a/build/win32/vs10/glib-genmarshal.vcxproj
+++ b/win32/vs10/glib-genmarshal.vcxproj
@@ -159,7 +159,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gobject\glib-genmarshal.c" />
+ <ClCompile Include="..\..\gobject\glib-genmarshal.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
@@ -170,4 +170,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib-genmarshal.vcxproj.filters b/win32/vs10/glib-genmarshal.vcxproj.filters
similarity index 92%
rename from build/win32/vs10/glib-genmarshal.vcxproj.filters
rename to win32/vs10/glib-genmarshal.vcxproj.filters
index 12b29af..bcb3d4a 100644
--- a/build/win32/vs10/glib-genmarshal.vcxproj.filters
+++ b/win32/vs10/glib-genmarshal.vcxproj.filters
@@ -15,8 +15,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gobject\glib-genmarshal.c">
+ <ClCompile Include="..\..\gobject\glib-genmarshal.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib-install.propsin b/win32/vs10/glib-install.propsin
similarity index 81%
rename from build/win32/vs10/glib-install.propsin
rename to win32/vs10/glib-install.propsin
index e6b13a6..eeb2965 100644
--- a/build/win32/vs10/glib-install.propsin
+++ b/win32/vs10/glib-install.propsin
@@ -36,31 +36,31 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin
copy $(BinDir)\gdbus.pdb $(CopyDir)\bin
copy $(BinDir)\gio.exe $(CopyDir)\bin
copy $(BinDir)\gio.pdb $(CopyDir)\bin
-copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
+copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
-if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin
+if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin
mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
-copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
-copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
-copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)
+copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
+copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
+copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)
#include "glib.vs10.headers"
-copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
+copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject
#include "gobject.vs10.headers"
-copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
+copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio
#include "gio.vs10.headers"
mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
-copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
-copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
+copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
+copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include
-copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include
+copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include
copy $(BinDir)\glib-$(ApiVersion).lib $(CopyDir)\lib
copy $(BinDir)\gthread-$(ApiVersion).lib $(CopyDir)\lib
copy $(BinDir)\gmodule-$(ApiVersion).lib $(CopyDir)\lib
@@ -78,10 +78,10 @@ copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig
copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig
mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas
-copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
+copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen
-copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
+copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
</GlibDoInstall>
<GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles>
<GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe
$(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC>
diff --git a/build/win32/vs10/glib-install.vcxproj b/win32/vs10/glib-install.vcxproj
similarity index 66%
rename from build/win32/vs10/glib-install.vcxproj
rename to win32/vs10/glib-install.vcxproj
index faa4404..cb13a84 100644
--- a/build/win32/vs10/glib-install.vcxproj
+++ b/win32/vs10/glib-install.vcxproj
@@ -67,14 +67,10 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
+ <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
@@ -86,36 +82,22 @@
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="..\glibpc.py">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibGenPC)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibPCFiles);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibGenPC)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibPCFiles);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibGenPC)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibPCFiles);%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibGenPC)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibPCFiles);%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug'">Generating .pc files...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GlibGenPC)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating .pc files...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
+ <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
+ <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
@@ -183,4 +165,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib-install.vcxproj.filters b/win32/vs10/glib-install.vcxproj.filters
similarity index 84%
rename from build/win32/vs10/glib-install.vcxproj.filters
rename to win32/vs10/glib-install.vcxproj.filters
index 18ffe5f..2c5e00c 100644
--- a/build/win32/vs10/glib-install.vcxproj.filters
+++ b/win32/vs10/glib-install.vcxproj.filters
@@ -7,7 +7,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
<CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in
similarity index 96%
rename from build/win32/vs10/glib-version-paths.props.in
rename to win32/vs10/glib-version-paths.props.in
index 6932252..468e558 100644
--- a/build/win32/vs10/glib-version-paths.props.in
+++ b/win32/vs10/glib-version-paths.props.in
@@ -4,7 +4,7 @@
<VSVer>10</VSVer>
<GlibVersion>@GLIB_VERSION@</GlibVersion>
<ApiVersion>2.0</ApiVersion>
- <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<GlibLibtoolCompatibleDllPrefix>lib</GlibLibtoolCompatibleDllPrefix>
<GlibLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GlibLibtoolCompatibleDllSuffix>
@@ -55,4 +55,4 @@
<Value>$(PythonPath)</Value>
</BuildMacro>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib.sln b/win32/vs10/glib.sln
similarity index 100%
rename from build/win32/vs10/glib.sln
rename to win32/vs10/glib.sln
diff --git a/win32/vs10/glib.vcxproj.filtersin b/win32/vs10/glib.vcxproj.filtersin
new file mode 100644
index 0000000..7a5084c
--- /dev/null
+++ b/win32/vs10/glib.vcxproj.filtersin
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Source Files\libcharset">
+ <UniqueIdentifier>{bb961775-fd45-4205-b1fd-901c3c8fd64c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\gnulib">
+ <UniqueIdentifier>{f630c518-4c58-4dfa-ab43-5fa0b0eb10f1}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\pcre">
+ <UniqueIdentifier>{9fef0e23-cf71-48aa-979b-7eb84df56143}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+#include "glib.vs10.sourcefiles.filters"
+ <ClCompile Include="..\..\glib\giowin32.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gspawn-win32.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gthread-win32.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gwin32.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\libcharset\localcharset.c"><Filter>Source
Files\libcharset</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gnulib\asnprintf.c"><Filter>Source Files\gnulib</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gnulib\printf-args.c"><Filter>Source Files\gnulib</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gnulib\printf-parse.c"><Filter>Source Files\gnulib</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gnulib\printf.c"><Filter>Source Files\gnulib</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\gnulib\vasnprintf.c"><Filter>Source Files\gnulib</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_byte_order.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_chartables.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_compile.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_config.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_dfa_exec.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_exec.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_fullinfo.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_get.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_globals.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_jit_compile.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_newline.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_ord2utf8.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_string_utils.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_study.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_tables.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_valid_utf8.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_version.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_xclass.c"><Filter>Source Files\pcre</Filter></ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\glib\glibconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\glib\glib.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
diff --git a/win32/vs10/glib.vcxprojin b/win32/vs10/glib.vcxprojin
new file mode 100644
index 0000000..3ee8f2b
--- /dev/null
+++ b/win32/vs10/glib.vcxprojin
@@ -0,0 +1,533 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug_BundledPCRE|Win32">
+ <Configuration>Debug_BundledPCRE</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug_BundledPCRE|x64">
+ <Configuration>Debug_BundledPCRE</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_BundledPCRE|Win32">
+ <Configuration>Release_BundledPCRE</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_BundledPCRE|x64">
+ <Configuration>Release_BundledPCRE</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{12BCA020-EABF-429E-876A-A476BC9C10C0}</ProjectGuid>
+ <RootNamespace>glib</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'"
Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'"
Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="glib-gen-srcs.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug_BundledPCRE'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)'=='Debug_BundledPCRE'">Debug\$(Platform)\bin\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Release_BundledPCRE'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)'=='Release_BundledPCRE'">Release\$(Platform)\bin\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+
<PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">
+ <ClCompile>
+ <PreprocessorDefinitions>$(GLibBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+
<PreprocessorDefinitions>$(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+#include "glib.vs10.sourcefiles"
+ <ClCompile Include="..\..\glib\giowin32.c" />
+ <ClCompile Include="..\..\glib\gspawn-win32.c" />
+ <ClCompile Include="..\..\glib\gthread-win32.c" />
+ <ClCompile Include="..\..\glib\gwin32.c" />
+ <ClCompile Include="..\..\glib\libcharset\localcharset.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(LocalCharsetDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\gnulib\asnprintf.c" />
+ <ClCompile Include="..\..\glib\gnulib\printf-args.c" />
+ <ClCompile Include="..\..\glib\gnulib\printf-parse.c" />
+ <ClCompile Include="..\..\glib\gnulib\printf.c" />
+ <ClCompile Include="..\..\glib\gnulib\vasnprintf.c" />
+ <ClCompile Include="..\..\glib\pcre\pcre_byte_order.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_chartables.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_compile.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_config.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_dfa_exec.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_exec.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_fullinfo.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_get.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_globals.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_jit_compile.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_newline.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_ord2utf8.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_string_utils.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_study.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_tables.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_valid_utf8.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_version.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\glib\pcre\pcre_xclass.c">
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions
Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug_BundledPCRE'">Copying config.h from
config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GenConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug_BundledPCRE'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release_BundledPCRE'">Copying config.h from
config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GenConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release_BundledPCRE'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="..\..\glib\glibconfig.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug_BundledPCRE'">Copying glibconfig.h from
glibconfig.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug_BundledPCRE'">$(GenGLibConfigH)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug_BundledPCRE'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Debug'">Copying glibconfig.h from
glibconfig.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release_BundledPCRE'">Copying glibconfig.h from
glibconfig.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release_BundledPCRE'">$(GenGLibConfigH)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release_BundledPCRE'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying glibconfig.h from
glibconfig.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenGLibConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\glib\glibconfig.h;%(Outputs)</Outputs>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\glib\glib.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/gmodule.vcxproj b/win32/vs10/gmodule.vcxproj
similarity index 81%
rename from build/win32/vs10/gmodule.vcxproj
rename to win32/vs10/gmodule.vcxproj
index d4f5070..7ed6e1c 100644
--- a/build/win32/vs10/gmodule.vcxproj
+++ b/win32/vs10/gmodule.vcxproj
@@ -67,10 +67,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -171,26 +169,20 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gmodule\gmodule.c" />
+ <ClCompile Include="..\..\gmodule\gmodule.c" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gmodule\gmoduleconf.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gmoduleconf.h from
gmoduleconf.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGModuleConfH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gmoduleconf.h from
gmoduleconf.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGModuleConfH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gmoduleconf.h from
gmoduleconf.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGModuleConfH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gmoduleconf.h from
gmoduleconf.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGModuleConfH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\gmodule\gmoduleconf.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Copying gmoduleconf.h from
gmoduleconf.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenGModuleConfH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying gmoduleconf.h from
gmoduleconf.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenGModuleConfH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\gmodule\gmoduleconf.h;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gmodule\gmodule.rc" />
+ <ResourceCompile Include="..\..\gmodule\gmodule.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
@@ -201,4 +193,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gmodule.vcxproj.filters b/win32/vs10/gmodule.vcxproj.filters
similarity index 80%
rename from build/win32/vs10/gmodule.vcxproj.filters
rename to win32/vs10/gmodule.vcxproj.filters
index 968e8ac..df97a6b 100644
--- a/build/win32/vs10/gmodule.vcxproj.filters
+++ b/win32/vs10/gmodule.vcxproj.filters
@@ -15,16 +15,16 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gmodule\gmodule.c">
+ <ClCompile Include="..\..\gmodule\gmodule.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gmodule\gmoduleconf.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\gmodule\gmoduleconf.h.win32"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gmodule\gmodule.rc">
+ <ResourceCompile Include="..\..\gmodule\gmodule.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gobject.vcxproj.filtersin b/win32/vs10/gobject.vcxproj.filtersin
similarity index 85%
rename from build/win32/vs10/gobject.vcxproj.filtersin
rename to win32/vs10/gobject.vcxproj.filtersin
index 3174802..b9f8307 100644
--- a/build/win32/vs10/gobject.vcxproj.filtersin
+++ b/win32/vs10/gobject.vcxproj.filtersin
@@ -18,10 +18,10 @@
#include "gobject.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gobject\gobject.rc">
+ <ResourceCompile Include="..\..\gobject\gobject.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/build/win32/vs10/gobject.vcxprojin b/win32/vs10/gobject.vcxprojin
similarity index 83%
rename from build/win32/vs10/gobject.vcxprojin
rename to win32/vs10/gobject.vcxprojin
index b08bd5b..c61ef8f 100644
--- a/build/win32/vs10/gobject.vcxprojin
+++ b/win32/vs10/gobject.vcxprojin
@@ -67,10 +67,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -174,23 +172,17 @@
#include "gobject.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gobject\glib-mkenums.in">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\gobject\glib-mkenums.in">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gobject\gobject.rc" />
+ <ResourceCompile Include="..\..\gobject\gobject.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
diff --git a/build/win32/vs10/gresource.vcxproj b/win32/vs10/gresource.vcxproj
similarity index 94%
rename from build/win32/vs10/gresource.vcxproj
rename to win32/vs10/gresource.vcxproj
index f52b38a..fb0faa2 100644
--- a/build/win32/vs10/gresource.vcxproj
+++ b/win32/vs10/gresource.vcxproj
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -137,7 +137,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -158,7 +158,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gresource-tool.c" />
+ <ClCompile Include="..\..\gio\gresource-tool.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gio.vcxproj">
@@ -177,4 +177,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gresource.vcxproj.filters b/win32/vs10/gresource.vcxproj.filters
similarity index 87%
rename from build/win32/vs10/gresource.vcxproj.filters
rename to win32/vs10/gresource.vcxproj.filters
index 91dd6dc..2e373bb 100644
--- a/build/win32/vs10/gresource.vcxproj.filters
+++ b/win32/vs10/gresource.vcxproj.filters
@@ -7,8 +7,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gresource-tool.c">
+ <ClCompile Include="..\..\gio\gresource-tool.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gsettings.vcxproj b/win32/vs10/gsettings.vcxproj
similarity index 94%
rename from build/win32/vs10/gsettings.vcxproj
rename to win32/vs10/gsettings.vcxproj
index f74913b..4b3a76c 100644
--- a/build/win32/vs10/gsettings.vcxproj
+++ b/win32/vs10/gsettings.vcxproj
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -138,7 +138,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -159,7 +159,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gsettings-tool.c" />
+ <ClCompile Include="..\..\gio\gsettings-tool.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
@@ -178,4 +178,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gsettings.vcxproj.filters b/win32/vs10/gsettings.vcxproj.filters
similarity index 87%
rename from build/win32/vs10/gsettings.vcxproj.filters
rename to win32/vs10/gsettings.vcxproj.filters
index 0c81fc6..843c0cb 100644
--- a/build/win32/vs10/gsettings.vcxproj.filters
+++ b/win32/vs10/gsettings.vcxproj.filters
@@ -7,8 +7,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gio\gsettings-tool.c">
+ <ClCompile Include="..\..\gio\gsettings-tool.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj
b/win32/vs10/gspawn-win32-helper-console.vcxproj
similarity index 99%
rename from build/win32/vs10/gspawn-win32-helper-console.vcxproj
rename to win32/vs10/gspawn-win32-helper-console.vcxproj
index 6cbb67c..7cf4a63 100644
--- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj
+++ b/win32/vs10/gspawn-win32-helper-console.vcxproj
@@ -163,7 +163,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\glib\gspawn-win32-helper-console.c" />
+ <ClCompile Include="..\..\glib\gspawn-win32-helper-console.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
@@ -174,4 +174,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
similarity index 91%
rename from build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
rename to win32/vs10/gspawn-win32-helper-console.vcxproj.filters
index 5b9e6ef..5b43689 100644
--- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
+++ b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
@@ -15,8 +15,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\glib\gspawn-win32-helper-console.c">
+ <ClCompile Include="..\..\glib\gspawn-win32-helper-console.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj b/win32/vs10/gspawn-win32-helper.vcxproj
similarity index 99%
rename from build/win32/vs10/gspawn-win32-helper.vcxproj
rename to win32/vs10/gspawn-win32-helper.vcxproj
index 581515e..7b4fd44 100644
--- a/build/win32/vs10/gspawn-win32-helper.vcxproj
+++ b/win32/vs10/gspawn-win32-helper.vcxproj
@@ -163,7 +163,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\glib\gspawn-win32-helper.c" />
+ <ClCompile Include="..\..\glib\gspawn-win32-helper.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
@@ -174,4 +174,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj.filters
b/win32/vs10/gspawn-win32-helper.vcxproj.filters
similarity index 92%
rename from build/win32/vs10/gspawn-win32-helper.vcxproj.filters
rename to win32/vs10/gspawn-win32-helper.vcxproj.filters
index 0a83fa2..85fd3f6 100644
--- a/build/win32/vs10/gspawn-win32-helper.vcxproj.filters
+++ b/win32/vs10/gspawn-win32-helper.vcxproj.filters
@@ -15,8 +15,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\glib\gspawn-win32-helper.c">
+ <ClCompile Include="..\..\glib\gspawn-win32-helper.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gthread.vcxproj b/win32/vs10/gthread.vcxproj
similarity index 98%
rename from build/win32/vs10/gthread.vcxproj
rename to win32/vs10/gthread.vcxproj
index 118bcfc..1936377 100644
--- a/build/win32/vs10/gthread.vcxproj
+++ b/win32/vs10/gthread.vcxproj
@@ -171,10 +171,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gthread\gthread-impl.c" />
+ <ClCompile Include="..\..\gthread\gthread-impl.c" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gthread\gthread.rc" />
+ <ResourceCompile Include="..\..\gthread\gthread.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glib.vcxproj">
@@ -185,4 +185,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gthread.vcxproj.filters b/win32/vs10/gthread.vcxproj.filters
similarity index 77%
rename from build/win32/vs10/gthread.vcxproj.filters
rename to win32/vs10/gthread.vcxproj.filters
index fb35c1f..82d30ab 100644
--- a/build/win32/vs10/gthread.vcxproj.filters
+++ b/win32/vs10/gthread.vcxproj.filters
@@ -15,13 +15,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gthread\gthread-impl.c">
- <Filter>Source Files</Filter>
- </ClCompile>
+ <ClCompile Include="..\..\gthread\gthread-impl.c"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gthread\gthread.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
+ <ResourceCompile Include="..\..\gthread\gthread.rc"><Filter>Resource Files</Filter></ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs11/.gitignore b/win32/vs11/.gitignore
similarity index 100%
rename from build/win32/vs11/.gitignore
rename to win32/vs11/.gitignore
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 96%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index 61de04e..5ea5b32 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -46,4 +46,4 @@ 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/.gitignore b/win32/vs12/.gitignore
similarity index 100%
rename from build/win32/vs12/.gitignore
rename to win32/vs12/.gitignore
diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
similarity index 96%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index 94f8c71..370edbb 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -46,4 +46,4 @@ 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 96%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index 09051c5..30eab92 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -46,4 +46,4 @@ 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/vs9/.gitignore b/win32/vs9/.gitignore
similarity index 100%
rename from build/win32/vs9/.gitignore
rename to win32/vs9/.gitignore
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 84%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
index bbc8819..e40d350 100644
--- a/build/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -35,8 +35,8 @@ EXTRA_DIST = \
glib-install.vspropsin \
$(GENERATED_ITEMS)
-glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST)
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@
+glib-install.vsprops: $(top_srcdir)/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST)
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/glib-install.vspropsin >$@
rm $(MSVC_HEADERS_LIST)
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt
similarity index 100%
rename from build/win32/vs9/README.txt
rename to win32/vs9/README.txt
diff --git a/build/win32/vs9/gdbus.vcproj b/win32/vs9/gdbus.vcproj
similarity index 92%
rename from build/win32/vs9/gdbus.vcproj
rename to win32/vs9/gdbus.vcproj
index 5160e97..6da34e3 100644
--- a/build/win32/vs9/gdbus.vcproj
+++ b/win32/vs9/gdbus.vcproj
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -57,7 +57,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -91,7 +91,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions=""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -118,7 +118,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions=""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -147,7 +147,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gio\gdbus-tool.c" />
+ <File RelativePath="..\..\gio\gdbus-tool.c" />
</Filter>
</Files>
<Globals>
diff --git a/build/win32/vs9/gio-querymodules.vcproj b/win32/vs9/gio-querymodules.vcproj
similarity index 92%
rename from build/win32/vs9/gio-querymodules.vcproj
rename to win32/vs9/gio-querymodules.vcproj
index 1aebb7d..4b00188 100644
--- a/build/win32/vs9/gio-querymodules.vcproj
+++ b/win32/vs9/gio-querymodules.vcproj
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -57,7 +57,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -91,7 +91,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -118,7 +118,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -147,7 +147,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gio\gio-querymodules.c" />
+ <File RelativePath="..\..\gio\gio-querymodules.c" />
</Filter>
</Files>
<Globals>
diff --git a/build/win32/vs9/gio-tool.vcprojin b/win32/vs9/gio-tool.vcprojin
similarity index 94%
rename from build/win32/vs9/gio-tool.vcprojin
rename to win32/vs9/gio-tool.vcprojin
index ffa91b2..267a445 100644
--- a/build/win32/vs9/gio-tool.vcprojin
+++ b/win32/vs9/gio-tool.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -59,7 +59,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -94,7 +94,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="$(GioInBuildMacro)"
- AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gio;..\..\gmodule"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/build/win32/vs9/gio.vcprojin b/win32/vs9/gio.vcprojin
similarity index 90%
rename from build/win32/vs9/gio.vcprojin
rename to win32/vs9/gio.vcprojin
index db551e7..be13438 100644
--- a/build/win32/vs9/gio.vcprojin
+++ b/win32/vs9/gio.vcprojin
@@ -27,7 +27,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -59,7 +59,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
PreprocessorDefinitions="$(GioBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -91,7 +91,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -123,7 +123,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ AdditionalIncludeDirectories="..\..\gio,..\..\gmodule"
PreprocessorDefinitions="$(GioBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -168,13 +168,13 @@
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="..\..\..\gio\gnetworking.h.win32">
+ <File RelativePath="..\..\gio\gnetworking.h.win32">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Copying gnetworking.h from
gnetworking.h.win32..."
CommandLine="$(GenGNetworkingH)"
- Outputs="..\..\..\gio\gnetworking.h"
+ Outputs="..\..\gio\gnetworking.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -182,7 +182,7 @@
Name="VCCustomBuildTool"
Description="Copying gnetworking.h from
gnetworking.h.win32..."
CommandLine="$(GenGNetworkingH)"
- Outputs="..\..\..\gio\gnetworking.h"
+ Outputs="..\..\gio\gnetworking.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -190,7 +190,7 @@
Name="VCCustomBuildTool"
Description="Copying gnetworking.h from
gnetworking.h.win32..."
CommandLine="$(GenGNetworkingH)"
- Outputs="..\..\..\gio\gnetworking.h"
+ Outputs="..\..\gio\gnetworking.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -198,11 +198,11 @@
Name="VCCustomBuildTool"
Description="Copying gnetworking.h from
gnetworking.h.win32..."
CommandLine="$(GenGNetworkingH)"
- Outputs="..\..\..\gio\gnetworking.h"
+ Outputs="..\..\gio\gnetworking.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\gio\gio.rc" />
+ <File RelativePath="..\..\gio\gio.rc" />
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/glib-build-defines.vsprops b/win32/vs9/glib-build-defines.vsprops
similarity index 96%
rename from build/win32/vs9/glib-build-defines.vsprops
rename to win32/vs9/glib-build-defines.vsprops
index cc36536..7e28cc5 100644
--- a/build/win32/vs9/glib-build-defines.vsprops
+++ b/win32/vs9/glib-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include"
+ AdditionalIncludeDirectories="..\..;..\..\glib;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
diff --git a/build/win32/vs9/glib-compile-resources.vcprojin b/win32/vs9/glib-compile-resources.vcprojin
similarity index 92%
rename from build/win32/vs9/glib-compile-resources.vcprojin
rename to win32/vs9/glib-compile-resources.vcprojin
index 9050265..e83b1d6 100644
--- a/build/win32/vs9/glib-compile-resources.vcprojin
+++ b/win32/vs9/glib-compile-resources.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -57,7 +57,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -91,7 +91,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -118,7 +118,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ AdditionalIncludeDirectories="..\..\gmodule;..\..\gio"
PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/build/win32/vs9/glib-compile-schemas.vcprojin b/win32/vs9/glib-compile-schemas.vcprojin
similarity index 94%
rename from build/win32/vs9/glib-compile-schemas.vcprojin
rename to win32/vs9/glib-compile-schemas.vcprojin
index 2a75095..00dc27e 100644
--- a/build/win32/vs9/glib-compile-schemas.vcprojin
+++ b/win32/vs9/glib-compile-schemas.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -57,7 +57,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -90,7 +90,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions=""
RuntimeLibrary="2"
@@ -118,7 +118,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions=""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/build/win32/vs9/glib-gen-srcs.vsprops b/win32/vs9/glib-gen-srcs.vsprops
similarity index 51%
rename from build/win32/vs9/glib-gen-srcs.vsprops
rename to win32/vs9/glib-gen-srcs.vsprops
index a4cf9f8..de0b1b9 100644
--- a/build/win32/vs9/glib-gen-srcs.vsprops
+++ b/win32/vs9/glib-gen-srcs.vsprops
@@ -7,22 +7,22 @@
>
<UserMacro
Name="GenConfigH"
- Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+ Value="copy ..\..\config.h.win32 ..\..\config.h"
/>
<UserMacro
Name="GenGLibConfigH"
- Value="copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h"
+ Value="copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h"
/>
<UserMacro
Name="GenGModuleConfH"
- Value="copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h"
+ Value="copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h"
/>
<UserMacro
Name="GenGNetworkingH"
- Value="copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h"
+ Value="copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h"
/>
<UserMacro
Name="GenGLibMKEnums"
- Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py
--action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums
--var=GLIB_VERSION --outstring=$(GlibVersion)"
+ Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py
--action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums
--var=GLIB_VERSION --outstring=$(GlibVersion)"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/glib-genmarshal.vcproj b/win32/vs9/glib-genmarshal.vcproj
similarity index 98%
rename from build/win32/vs9/glib-genmarshal.vcproj
rename to win32/vs9/glib-genmarshal.vcproj
index 6b0f481..b50be25 100644
--- a/build/win32/vs9/glib-genmarshal.vcproj
+++ b/win32/vs9/glib-genmarshal.vcproj
@@ -141,7 +141,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\..\gobject\glib-genmarshal.c"
+ RelativePath="..\..\gobject\glib-genmarshal.c"
>
</File>
</Filter>
diff --git a/build/win32/vs9/glib-install.vcproj b/win32/vs9/glib-install.vcproj
similarity index 100%
rename from build/win32/vs9/glib-install.vcproj
rename to win32/vs9/glib-install.vcproj
diff --git a/build/win32/vs9/glib-install.vspropsin b/win32/vs9/glib-install.vspropsin
similarity index 83%
rename from build/win32/vs9/glib-install.vspropsin
rename to win32/vs9/glib-install.vspropsin
index a511ebb..dec524e 100644
--- a/build/win32/vs9/glib-install.vspropsin
+++ b/win32/vs9/glib-install.vspropsin
@@ -38,29 +38,29 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir)
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin

-copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen

-if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin

+copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen

+if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin

mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated

-copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)

-copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)

-copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)

-copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)

+copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)

+copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)

+copy ..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)

+copy ..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)

#include "glib.headers"
mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject

#include "gobject.headers"
-copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject

+copy ..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject

mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio

#include "gio.headers"
mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

-copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

-copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

+copy ..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

+copy ..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include

-copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include

+copy ..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-$(ApiVersion).lib $(CopyDir)\lib

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gthread-$(ApiVersion).lib
$(CopyDir)\lib

@@ -79,10 +79,10 @@ copy ..\gthread-2.0.pc $(CopyDir)\lib\pkgconfig

copy ..\glib-2.0.pc $(CopyDir)\lib\pkgconfig

mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas

-copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas

+copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas

mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen

-copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen

+copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen

"
/>
<UserMacro
diff --git a/build/win32/vs9/glib-version-paths.vsprops.in b/win32/vs9/glib-version-paths.vsprops.in
similarity index 95%
rename from build/win32/vs9/glib-version-paths.vsprops.in
rename to win32/vs9/glib-version-paths.vsprops.in
index f69da65..1b55c5c 100644
--- a/build/win32/vs9/glib-version-paths.vsprops.in
+++ b/win32/vs9/glib-version-paths.vsprops.in
@@ -18,7 +18,7 @@
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
diff --git a/build/win32/vs9/glib.sln b/win32/vs9/glib.sln
similarity index 100%
rename from build/win32/vs9/glib.sln
rename to win32/vs9/glib.sln
diff --git a/build/win32/vs9/glib.vcprojin b/win32/vs9/glib.vcprojin
similarity index 93%
rename from build/win32/vs9/glib.vcprojin
rename to win32/vs9/glib.vcprojin
index 86e72e1..0f65f8c 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/win32/vs9/glib.vcprojin
@@ -281,14 +281,14 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
#include "glib.sourcefiles"
- <File RelativePath="..\..\..\glib\giowin32.c" />
- <File RelativePath="..\..\..\glib\gspawn-win32.c" />
- <File RelativePath="..\..\..\glib\gthread-win32.c" />
- <File RelativePath="..\..\..\glib\gwin32.c" />
+ <File RelativePath="..\..\glib\giowin32.c" />
+ <File RelativePath="..\..\glib\gspawn-win32.c" />
+ <File RelativePath="..\..\glib\gthread-win32.c" />
+ <File RelativePath="..\..\glib\gwin32.c" />
<Filter
Name="libcharset"
>
- <File RelativePath="..\..\..\glib\libcharset\localcharset.c">
+ <File RelativePath="..\..\glib\libcharset\localcharset.c">
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool"
PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(LocalCharsetDefs)"/></FileConfiguration>
@@ -302,16 +302,16 @@
<Filter
Name="gnulib"
>
- <File RelativePath="..\..\..\glib\gnulib\asnprintf.c" />
- <File RelativePath="..\..\..\glib\gnulib\printf-args.c" />
- <File RelativePath="..\..\..\glib\gnulib\printf-parse.c" />
- <File RelativePath="..\..\..\glib\gnulib\printf.c" />
- <File RelativePath="..\..\..\glib\gnulib\vasnprintf.c" />
+ <File RelativePath="..\..\glib\gnulib\asnprintf.c" />
+ <File RelativePath="..\..\glib\gnulib\printf-args.c" />
+ <File RelativePath="..\..\glib\gnulib\printf-parse.c" />
+ <File RelativePath="..\..\glib\gnulib\printf.c" />
+ <File RelativePath="..\..\glib\gnulib\vasnprintf.c" />
</Filter>
<Filter
Name="pcre"
>
- <File RelativePath="..\..\..\glib\pcre\pcre_byte_order.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_byte_order.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -321,7 +321,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_chartables.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_chartables.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -331,7 +331,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_compile.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_compile.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -341,7 +341,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_config.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_config.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -351,7 +351,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_dfa_exec.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -361,7 +361,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_exec.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_exec.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -371,7 +371,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_fullinfo.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -381,7 +381,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_get.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_get.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -391,7 +391,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_globals.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_globals.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -401,7 +401,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_jit_compile.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_jit_compile.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -411,7 +411,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_newline.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_newline.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -421,7 +421,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_ord2utf8.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -431,7 +431,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_string_utils.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_string_utils.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -441,7 +441,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_study.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_study.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -451,7 +451,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_tables.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_tables.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -461,7 +461,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_valid_utf8.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -471,7 +471,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_version.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_version.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -481,7 +481,7 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" >
+ <File RelativePath="..\..\glib\pcre\pcre_xclass.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
@@ -504,13 +504,13 @@
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">
+ <File RelativePath="..\..\config.h.win32">
<FileConfiguration Name="Debug_BundledPCRE|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|Win32">
@@ -518,7 +518,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32">
@@ -526,7 +526,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -534,7 +534,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug_BundledPCRE|x64">
@@ -542,7 +542,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -550,7 +550,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|x64">
@@ -558,7 +558,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -566,17 +566,17 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(GenConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\glibconfig.h.win32">
+ <File RelativePath="..\..\glib\glibconfig.h.win32">
<FileConfiguration Name="Debug_BundledPCRE|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|Win32">
@@ -584,7 +584,7 @@
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32">
@@ -592,7 +592,7 @@
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -600,7 +600,7 @@
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug_BundledPCRE|x64">
@@ -608,7 +608,7 @@
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -616,7 +616,7 @@
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|x64">
@@ -624,7 +624,7 @@
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -632,11 +632,11 @@
Name="VCCustomBuildTool"
Description="Copying glibconfig.h from glibconfig.h.win32..."
CommandLine="$(GenGLibConfigH)"
- Outputs="..\..\..\glib\glibconfig.h"
+ Outputs="..\..\glib\glibconfig.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\glib\glib.rc" />
+ <File RelativePath="..\..\glib\glib.rc" />
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/gmodule.vcproj b/win32/vs9/gmodule.vcproj
similarity index 93%
rename from build/win32/vs9/gmodule.vcproj
rename to win32/vs9/gmodule.vcproj
index 03e9918..8df2f4c 100644
--- a/build/win32/vs9/gmodule.vcproj
+++ b/win32/vs9/gmodule.vcproj
@@ -148,7 +148,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gmodule\gmodule.c" />
+ <File RelativePath="..\..\gmodule\gmodule.c" />
</Filter>
<Filter
Name="Header Files"
@@ -161,13 +161,13 @@
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="..\..\..\gmodule\gmoduleconf.h.win32">
+ <File RelativePath="..\..\gmodule\gmoduleconf.h.win32">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Copying gmoduleconf.h from
gmoduleconf.h.win32..."
CommandLine="$(GenGModuleConfH)"
- Outputs="..\..\..\gmodule\gmoduleconf.h"
+ Outputs="..\..\gmodule\gmoduleconf.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -175,7 +175,7 @@
Name="VCCustomBuildTool"
Description="Copying gmoduleconf.h from
gmoduleconf.h.win32..."
CommandLine="$(GenGModuleConfH)"
- Outputs="..\..\..\gmodule\gmoduleconf.h"
+ Outputs="..\..\gmodule\gmoduleconf.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -183,7 +183,7 @@
Name="VCCustomBuildTool"
Description="Copying gmoduleconf.h from
gmoduleconf.h.win32..."
CommandLine="$(GenGModuleConfH)"
- Outputs="..\..\..\gmodule\gmoduleconf.h"
+ Outputs="..\..\gmodule\gmoduleconf.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -191,11 +191,11 @@
Name="VCCustomBuildTool"
Description="Copying gmoduleconf.h from
gmoduleconf.h.win32..."
CommandLine="$(GenGModuleConfH)"
- Outputs="..\..\..\gmodule\gmoduleconf.h"
+ Outputs="..\..\gmodule\gmoduleconf.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\gmodule\gmodule.rc" />
+ <File RelativePath="..\..\gmodule\gmodule.rc" />
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/gobject.vcprojin b/win32/vs9/gobject.vcprojin
similarity index 94%
rename from build/win32/vs9/gobject.vcprojin
rename to win32/vs9/gobject.vcprojin
index 82609cc..bc6ce88 100644
--- a/build/win32/vs9/gobject.vcprojin
+++ b/win32/vs9/gobject.vcprojin
@@ -161,13 +161,13 @@
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="..\..\..\gobject\glib-mkenums.in">
+ <File RelativePath="..\..\gobject\glib-mkenums.in">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
+ Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -175,7 +175,7 @@
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
+ Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -183,7 +183,7 @@
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
+ Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -191,11 +191,11 @@
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
+ Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\gobject\gobject.rc" />
+ <File RelativePath="..\..\gobject\gobject.rc" />
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/gresource.vcproj b/win32/vs9/gresource.vcproj
similarity index 92%
rename from build/win32/vs9/gresource.vcproj
rename to win32/vs9/gresource.vcproj
index 982f10d..32b78fc 100644
--- a/build/win32/vs9/gresource.vcproj
+++ b/win32/vs9/gresource.vcproj
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -57,7 +57,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -91,7 +91,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions=""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -118,7 +118,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions=""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -147,7 +147,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gio\gresource-tool.c" />
+ <File RelativePath="..\..\gio\gresource-tool.c" />
</Filter>
</Files>
<Globals>
diff --git a/build/win32/vs9/gsettings.vcproj b/win32/vs9/gsettings.vcproj
similarity index 92%
rename from build/win32/vs9/gsettings.vcproj
rename to win32/vs9/gsettings.vcproj
index 4804581..ea15c42 100644
--- a/build/win32/vs9/gsettings.vcproj
+++ b/win32/vs9/gsettings.vcproj
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -57,7 +57,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions="DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -91,7 +91,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions=""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -119,7 +119,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gmodule"
+ AdditionalIncludeDirectories="..\..\gmodule"
PreprocessorDefinitions=""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -148,7 +148,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gio\gsettings-tool.c" />
+ <File RelativePath="..\..\gio\gsettings-tool.c" />
</Filter>
</Files>
<Globals>
diff --git a/build/win32/vs9/gspawn-win32-helper-console.vcproj b/win32/vs9/gspawn-win32-helper-console.vcproj
similarity index 98%
rename from build/win32/vs9/gspawn-win32-helper-console.vcproj
rename to win32/vs9/gspawn-win32-helper-console.vcproj
index 180252d..58fa636 100644
--- a/build/win32/vs9/gspawn-win32-helper-console.vcproj
+++ b/win32/vs9/gspawn-win32-helper-console.vcproj
@@ -143,7 +143,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\..\glib\gspawn-win32-helper-console.c"
+ RelativePath="..\..\glib\gspawn-win32-helper-console.c"
>
</File>
</Filter>
diff --git a/build/win32/vs9/gspawn-win32-helper.vcproj b/win32/vs9/gspawn-win32-helper.vcproj
similarity index 98%
rename from build/win32/vs9/gspawn-win32-helper.vcproj
rename to win32/vs9/gspawn-win32-helper.vcproj
index 5417f7d..1918e3b 100644
--- a/build/win32/vs9/gspawn-win32-helper.vcproj
+++ b/win32/vs9/gspawn-win32-helper.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="..\..\..\glib\gspawn-win32-helper.c" />
+ <File RelativePath="..\..\glib\gspawn-win32-helper.c" />
</Filter>
<Filter
Name="Header Files"
diff --git a/build/win32/vs9/gthread.vcproj b/win32/vs9/gthread.vcproj
similarity index 97%
rename from build/win32/vs9/gthread.vcproj
rename to win32/vs9/gthread.vcproj
index 59360cf..3bbe92c 100644
--- a/build/win32/vs9/gthread.vcproj
+++ b/win32/vs9/gthread.vcproj
@@ -148,7 +148,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gthread\gthread-impl.c" />
+ <File RelativePath="..\..\gthread\gthread-impl.c" />
</Filter>
<Filter
Name="Header Files"
@@ -161,7 +161,7 @@
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="..\..\..\gthread\gthread.rc" />
+ <File RelativePath="..\..\gthread\gthread.rc" />
</Filter>
</Files>
</VisualStudioProject>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
