From f658e94e6595b632030e013ade88091d07fc2296 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 6 Jun 2018 14:19:53 +0800 Subject: [PATCH 1/6] build: Drop Visual Studio projects In master, it is already possible to build GLib using Visual Studio using Meson[1] for some time, so we should focus on maintaining only the Meson build files for building GLib with Visual Studio. [1]: There are caveats when building with Visual Studio 2008, namely that one needs to use the mt command to embed the manifests that are generated with the .exe/DLLs, for all builds, and that in the case where the compilation hangs on Visual Studio 2008 x64, as a workaround, should stop the build by terminating all cl.exe tasks and change the compiler optimization flag from /O2 (full speed) to /O1 (optimize for size), due to compiler optimization issues. --- Makefile.am | 4 +- configure.ac | 9 - gio/Makefile.am | 38 +- glib/Makefile.am | 20 +- gobject/Makefile.am | 14 +- win32/Makefile-newvs.am | 55 -- win32/Makefile.am | 7 - win32/Makefile.msvcproj | 153 ----- win32/detectenv-msvc.mak | 78 --- win32/gen_util_scripts.py | 37 - win32/glibpc.py | 89 --- win32/pc_base.py | 124 ---- win32/replace.py | 115 ---- win32/setup.py | 347 ---------- win32/vs10/.gitignore | 12 - win32/vs10/Makefile.am | 66 -- win32/vs10/README.txt | 96 --- win32/vs10/gdbus.vcxproj | 178 ----- win32/vs10/gdbus.vcxproj.filters | 14 - win32/vs10/gio-querymodules.vcxproj | 183 ----- win32/vs10/gio-querymodules.vcxproj.filters | 17 - win32/vs10/gio-tool.vcxproj.filtersin | 12 - win32/vs10/gio-tool.vcxprojin | 186 ----- win32/vs10/gio.vcxproj.filtersin | 28 - win32/vs10/gio.vcxprojin | 206 ------ win32/vs10/glib-build-defines.props | 88 --- .../glib-compile-resources.vcxproj.filtersin | 12 - win32/vs10/glib-compile-resources.vcxprojin | 178 ----- .../glib-compile-schemas.vcxproj.filtersin | 12 - win32/vs10/glib-compile-schemas.vcxprojin | 178 ----- win32/vs10/glib-gen-srcs.props | 29 - win32/vs10/glib-install.propsin | 121 ---- win32/vs10/glib-install.vcxproj | 188 ------ win32/vs10/glib-install.vcxproj.filters | 16 - win32/vs10/glib-version-paths.props.in | 46 -- win32/vs10/glib.sln | 289 -------- win32/vs10/glib.vcxproj.filtersin | 66 -- win32/vs10/glib.vcxprojin | 525 --------------- win32/vs10/gmodule.vcxproj | 192 ------ win32/vs10/gmodule.vcxproj.filters | 30 - win32/vs10/gobject.vcxproj.filtersin | 23 - win32/vs10/gobject.vcxprojin | 186 ----- win32/vs10/gresource.vcxproj | 178 ----- win32/vs10/gresource.vcxproj.filters | 14 - win32/vs10/gsettings.vcxproj | 179 ----- win32/vs10/gsettings.vcxproj.filters | 14 - .../vs10/gspawn-win32-helper-console.vcxproj | 173 ----- ...spawn-win32-helper-console.vcxproj.filters | 22 - win32/vs10/gspawn-win32-helper.vcxproj | 173 ----- .../vs10/gspawn-win32-helper.vcxproj.filters | 22 - win32/vs10/gthread.vcxproj | 184 ----- win32/vs10/gthread.vcxproj.filters | 23 - win32/vs11/.gitignore | 31 - win32/vs11/Makefile.am | 46 -- win32/vs12/.gitignore | 31 - win32/vs12/Makefile.am | 46 -- win32/vs14/Makefile.am | 46 -- win32/vs15/Makefile.am | 47 -- win32/vs9/.gitignore | 7 - win32/vs9/Makefile.am | 41 -- win32/vs9/README.txt | 95 --- win32/vs9/gdbus.vcproj | 153 ----- win32/vs9/gio-querymodules.vcproj | 154 ----- win32/vs9/gio-tool.vcprojin | 173 ----- win32/vs9/gio.vcprojin | 204 ------ win32/vs9/glib-build-defines.vsprops | 78 --- win32/vs9/glib-compile-resources.vcprojin | 153 ----- win32/vs9/glib-compile-schemas.vcprojin | 153 ----- win32/vs9/glib-gen-srcs.vsprops | 24 - win32/vs9/glib-install.vcproj | 221 ------ win32/vs9/glib-install.vspropsin | 103 --- win32/vs9/glib-version-paths.vsprops.in | 39 -- win32/vs9/glib.sln | 362 ---------- win32/vs9/glib.vcprojin | 634 ------------------ win32/vs9/gmodule.vcproj | 197 ------ win32/vs9/gobject.vcprojin | 163 ----- win32/vs9/gresource.vcproj | 153 ----- win32/vs9/gsettings.vcproj | 154 ----- win32/vs9/gspawn-win32-helper-console.vcproj | 159 ----- win32/vs9/gspawn-win32-helper.vcproj | 156 ----- win32/vs9/gthread.vcproj | 163 ----- 81 files changed, 5 insertions(+), 9230 deletions(-) delete mode 100644 win32/Makefile-newvs.am delete mode 100644 win32/Makefile.am delete mode 100644 win32/Makefile.msvcproj delete mode 100644 win32/detectenv-msvc.mak delete mode 100644 win32/gen_util_scripts.py delete mode 100644 win32/glibpc.py delete mode 100644 win32/pc_base.py delete mode 100644 win32/replace.py delete mode 100644 win32/setup.py delete mode 100644 win32/vs10/.gitignore delete mode 100644 win32/vs10/Makefile.am delete mode 100644 win32/vs10/README.txt delete mode 100644 win32/vs10/gdbus.vcxproj delete mode 100644 win32/vs10/gdbus.vcxproj.filters delete mode 100644 win32/vs10/gio-querymodules.vcxproj delete mode 100644 win32/vs10/gio-querymodules.vcxproj.filters delete mode 100644 win32/vs10/gio-tool.vcxproj.filtersin delete mode 100644 win32/vs10/gio-tool.vcxprojin delete mode 100644 win32/vs10/gio.vcxproj.filtersin delete mode 100644 win32/vs10/gio.vcxprojin delete mode 100644 win32/vs10/glib-build-defines.props delete mode 100644 win32/vs10/glib-compile-resources.vcxproj.filtersin delete mode 100644 win32/vs10/glib-compile-resources.vcxprojin delete mode 100644 win32/vs10/glib-compile-schemas.vcxproj.filtersin delete mode 100644 win32/vs10/glib-compile-schemas.vcxprojin delete mode 100644 win32/vs10/glib-gen-srcs.props delete mode 100644 win32/vs10/glib-install.propsin delete mode 100644 win32/vs10/glib-install.vcxproj delete mode 100644 win32/vs10/glib-install.vcxproj.filters delete mode 100644 win32/vs10/glib-version-paths.props.in delete mode 100644 win32/vs10/glib.sln delete mode 100644 win32/vs10/glib.vcxproj.filtersin delete mode 100644 win32/vs10/glib.vcxprojin delete mode 100644 win32/vs10/gmodule.vcxproj delete mode 100644 win32/vs10/gmodule.vcxproj.filters delete mode 100644 win32/vs10/gobject.vcxproj.filtersin delete mode 100644 win32/vs10/gobject.vcxprojin delete mode 100644 win32/vs10/gresource.vcxproj delete mode 100644 win32/vs10/gresource.vcxproj.filters delete mode 100644 win32/vs10/gsettings.vcxproj delete mode 100644 win32/vs10/gsettings.vcxproj.filters delete mode 100644 win32/vs10/gspawn-win32-helper-console.vcxproj delete mode 100644 win32/vs10/gspawn-win32-helper-console.vcxproj.filters delete mode 100644 win32/vs10/gspawn-win32-helper.vcxproj delete mode 100644 win32/vs10/gspawn-win32-helper.vcxproj.filters delete mode 100644 win32/vs10/gthread.vcxproj delete mode 100644 win32/vs10/gthread.vcxproj.filters delete mode 100644 win32/vs11/.gitignore delete mode 100644 win32/vs11/Makefile.am delete mode 100644 win32/vs12/.gitignore delete mode 100644 win32/vs12/Makefile.am delete mode 100644 win32/vs14/Makefile.am delete mode 100644 win32/vs15/Makefile.am delete mode 100644 win32/vs9/.gitignore delete mode 100644 win32/vs9/Makefile.am delete mode 100644 win32/vs9/README.txt delete mode 100644 win32/vs9/gdbus.vcproj delete mode 100644 win32/vs9/gio-querymodules.vcproj delete mode 100644 win32/vs9/gio-tool.vcprojin delete mode 100644 win32/vs9/gio.vcprojin delete mode 100644 win32/vs9/glib-build-defines.vsprops delete mode 100644 win32/vs9/glib-compile-resources.vcprojin delete mode 100644 win32/vs9/glib-compile-schemas.vcprojin delete mode 100644 win32/vs9/glib-gen-srcs.vsprops delete mode 100644 win32/vs9/glib-install.vcproj delete mode 100644 win32/vs9/glib-install.vspropsin delete mode 100644 win32/vs9/glib-version-paths.vsprops.in delete mode 100644 win32/vs9/glib.sln delete mode 100644 win32/vs9/glib.vcprojin delete mode 100644 win32/vs9/gmodule.vcproj delete mode 100644 win32/vs9/gobject.vcprojin delete mode 100644 win32/vs9/gresource.vcproj delete mode 100644 win32/vs9/gsettings.vcproj delete mode 100644 win32/vs9/gspawn-win32-helper-console.vcproj delete mode 100644 win32/vs9/gspawn-win32-helper.vcproj delete mode 100644 win32/vs9/gthread.vcproj diff --git a/Makefile.am b/Makefile.am index f6e5ef169..ae6cb3d4e 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 subprojects -DIST_SUBDIRS = $(SUBDIRS) build win32 +DIST_SUBDIRS = $(SUBDIRS) build bin_SCRIPTS = glib-gettextize @@ -50,7 +50,6 @@ EXTRA_DIST += \ tap-driver.sh \ tap-test \ msvc_recommended_pragmas.h \ - config.h.win32.in \ po/po2tbl.sed.in \ glib-2.0.pc.in \ gobject-2.0.pc.in \ @@ -113,7 +112,6 @@ BUILT_EXTRA_DIST += \ README \ INSTALL \ ChangeLog \ - config.h.win32 \ $(NULL) CONFIGURE_DEPENDENCIES = acglib.m4 diff --git a/configure.ac b/configure.ac index 9ccedcdfc..d2f4067e6 100644 --- a/configure.ac +++ b/configure.ac @@ -3466,15 +3466,6 @@ Makefile build/Makefile build/win32/Makefile build/win32/dirent/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 -win32/vs15/Makefile glib/Makefile glib/libcharset/Makefile glib/gnulib/Makefile diff --git a/gio/Makefile.am b/gio/Makefile.am index 8eaf22e0a..b9ea1a2b9 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -973,43 +973,7 @@ gio_LDADD = libgio-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \ $(NULL) -# ------------------------------------------------------------------------ -# ------ MSVC Project File Generation ------ -# ------------------------------------------------------------------------ -# -MSVCPROJS = gio glib-compile-resources glib-compile-schemas gio-tool - -gio_FILES = \ - $(gio_base_sources) \ - $(win32_actual_sources) \ - $(win32_more_sources_for_vcproj) \ - $(settings_base_sources) \ - $(win32_settings_sources) - -gio_EXCLUDES = dummy - -gio_HEADERS_DIR = $(includedir)/glib-2.0/gio -gio_HEADERS_INST = $(gioinclude_HEADERS) $(nodist_gioinclude_HEADERS) -gio_HEADERS_EXCLUDES = dummy - -glib_compile_resources_FILES = $(glib_compile_resources_SOURCES) -glib_compile_resources_EXCLUDES = dummy - -glib_compile_schemas_FILES = $(glib_compile_schemas_SOURCES) -glib_compile_schemas_EXCLUDES = dummy - -gio_tool_FILES = $(gio_SOURCES) -gio_tool_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: \ - $(BUILT_EXTRA_DIST) \ - $(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 +dist-hook: $(BUILT_EXTRA_DIST) 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 97861b8d7..049706126 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -9,15 +9,13 @@ include $(top_srcdir)/glib.mk # to config.status will not result in changes to glibconfig.h so we # avoid touching its timestamp (in order not to rebuild the whole tree). # -DISTCLEANFILES += glibconfig-stamp glibconfig.h glibconfig.h.win32 +DISTCLEANFILES += glibconfig-stamp glibconfig.h BUILT_SOURCES += glibconfig-stamp configexecincludedir = $(libdir)/glib-2.0/include nodist_configexecinclude_HEADERS = glibconfig.h glibconfig-stamp: ../config.status $(AM_V_GEN) cd $(top_builddir) && \ $(SHELL) ./config.status glib/glibconfig.h - $(AM_V_GEN) cd $(top_builddir) && \ - $(SHELL) ./config.status glib/glibconfig.h.win32 @touch glibconfig-stamp @@ -57,7 +55,6 @@ MIRRORING_TAB_SOURCE = \ EXTRA_DIST += \ glib.rc.in \ gen-unicode-tables.pl \ - glibconfig.h.win32.in \ gregex.c \ gregex.h \ win_iconv.c \ @@ -70,7 +67,6 @@ CLEANFILES += libglib-gdb.py # These may be in the builddir too BUILT_EXTRA_DIST += \ - glibconfig.h.win32 \ glib.rc lib_LTLIBRARIES = libglib-2.0.la @@ -458,19 +454,7 @@ glib.def: libglib-2.0.la glib-2.0.lib: libglib-2.0.la glib.def $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@ -# ------ MSVC Project File Generation ------ -MSVCPROJS = glib - -glib_FILES = $(libglib_2_0_la_SOURCES) -glib_EXCLUDES = *-unix.c|gthread-*.c - -glib_HEADERS_DIR = $(glibsubincludedir) -glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS) -glib_HEADERS_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/glib.vcproj $(top_builddir)/win32/vs9/glib.headers +dist-hook: $(BUILT_EXTRA_DIST) 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 b6f21de29..4c28acdff 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -217,19 +217,7 @@ gobject.def: libgobject-2.0.la gobject-2.0.lib: libgobject-2.0.la gobject.def $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gobject.def -out:$@ -# ------ MSVC Project File Generation ------ -MSVCPROJS = gobject - -gobject_FILES = $(libgobject_2_0_la_SOURCES) -gobject_EXCLUDES = dummy - -gobject_HEADERS_DIR = $(libgobjectincludedir) -gobject_HEADERS_INST = $(gobject_public_h_sources) -gobject_HEADERS_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/gobject.vcproj $(top_builddir)/win32/vs9/gobject.headers +dist-hook: $(BUILT_EXTRA_DIST) 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 deleted file mode 100644 index 3a91862b6..000000000 --- a/win32/Makefile-newvs.am +++ /dev/null @@ -1,55 +0,0 @@ -# Centralized autotools file -# Create the Visual Studio 2012/2013/2015 project files -# from the Visual Studio 2010 project files - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support. - -# Author: Fan, Chun-wei -# November 05, 2012 - -# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013) -# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15) -# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET) -# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017) -# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET) - -if MSVC_BASE_NO_TOOLSET_SET -MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 -endif - -if MSVC_NO_TOOLSET_SET -MSVC_TOOLSET = $(MSVC_VER)0 -endif - -%.sln: - sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - -%.txt: - sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - -%.vcxproj: - if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi - -%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile - if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/$(MSVC_BASE_VER)<\/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 deleted file mode 100644 index b19d5607d..000000000 --- a/win32/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15 - -EXTRA_DIST = \ - glibpc.py \ - pc_base.py \ - replace.py \ - gen_util_scripts.py diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj deleted file mode 100644 index 2e96e12bc..000000000 --- a/win32/Makefile.msvcproj +++ /dev/null @@ -1,153 +0,0 @@ -# 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 -# 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 = ... # -# -# 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 ' ' >>$(1).sourcefiles && \ - echo ' ' >>$(1).vs10.sourcefiles && \ - echo ' Source Files' >>$(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 ' ' >>$(1).vs12.sourcefiles && \ - echo ' Source Files' >>$(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/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak deleted file mode 100644 index 6fd96ccc6..000000000 --- a/win32/detectenv-msvc.mak +++ /dev/null @@ -1,78 +0,0 @@ -# Common NMake Makefile module for checking the build environment -# This can be copied from $(glib_srcroot)\build\win32 for GNOME items -# that support MSVC builds and introspection under MSVC, and can be used -# for building test programs as well. - -# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or -# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) -!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR) -MSG = ^ -This Makefile is only for Visual Studio 2008 and later.^ -You need to ensure that the Visual Studio Environment is properly set up^ -before running this Makefile. -!error $(MSG) -!endif - -ERRNUL = 2>NUL -_HASH=^# - -!if ![echo VCVERSION=_MSC_VER > vercl.x] \ - && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \ - && ![echo PLAT=Win32 >> vercl.x] \ - && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ - && ![echo PLAT=x64 >> vercl.x] \ - && ![echo $(_HASH)endif >> vercl.x] \ - && ![cl -nologo -TC -P vercl.x $(ERRNUL)] -!include vercl.i -!if ![echo VCVER= ^\> vercl.vc] \ - && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] -!include vercl.vc -!endif -!endif -!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] -!endif - -!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600 -VSVER = 9 -!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700 -VSVER = 10 -!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800 -VSVER = 11 -!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 -VSVER = 12 -!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 -VSVER = 14 -!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000 -VSVER = 15 -!else -VSVER = 0 -!endif - -!if "$(VSVER)" == "0" -MSG = ^ -This NMake Makefile set supports Visual Studio^ -9 (2008) through 14 (2015). Your Visual Studio^ -version is not supported. -!error $(MSG) -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" -VALID_CFGSET = TRUE -!endif - -# We want debugging symbols logged for all builds, -# using .pdb files for release builds -CFLAGS_BASE = /Zi - -!if "$(CFG)" == "release" || "$(CFG)" == "Release" -CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE) -!else -CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE) -!endif - -!if "$(PLAT)" == "x64" -LDFLAGS_ARCH = /machine:x64 -!else -LDFLAGS_ARCH = /machine:x86 -!endif diff --git a/win32/gen_util_scripts.py b/win32/gen_util_scripts.py deleted file mode 100644 index 2ecba4408..000000000 --- a/win32/gen_util_scripts.py +++ /dev/null @@ -1,37 +0,0 @@ -# Simple Python script to generate the full .schema.xml files - -import os -import sys -import argparse - -from replace import replace_multi - -def main(argv): - srcroot = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') - parser = argparse.ArgumentParser(description='Generate Utility Scripts') - parser.add_argument('-t', '--type', help='Script Type (glib-mkenums or gdbus-codegen)', required=True) - parser.add_argument('--version', help='Package Version', required=True) - args = parser.parse_args() - - replace_items = {'@PYTHON@': 'python', - '@GLIB_VERSION@': args.version, - '@VERSION@': args.version} - - if args.type == 'glib-mkenums': - replace_multi(srcroot + '/gobject/glib-mkenums.in', - srcroot + '/gobject/glib-mkenums', - replace_items) - elif args.type == 'glib-genmarshal': - replace_multi(srcroot + '/gobject/glib-genmarshal.in', - srcroot + '/gobject/glib-genmarshal', - replace_items) - elif args.type == 'gdbus-codegen': - replace_multi(srcroot + '/gio/gdbus-2.0/codegen/gdbus-codegen.in', - srcroot + '/gio/gdbus-2.0/codegen/gdbus-codegen', - replace_items) - - else: - raise ValueError('Type must be glib-mkenums, glib-genmarshal or gdbus-codegen') - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/glibpc.py b/win32/glibpc.py deleted file mode 100644 index b04dc2433..000000000 --- a/win32/glibpc.py +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/python -# -# Utility script to generate .pc files for GLib -# for Visual Studio builds, to be used for -# building introspection files - -# Author: Fan, Chun-wei -# Date: March 10, 2016 - -import os -import sys - -from replace import replace_multi -from pc_base import BasePCItems - -def main(argv): - base_pc = BasePCItems() - - base_pc.setup(argv) - pkg_replace_items = {'@G_THREAD_CFLAGS@': '', - '@G_THREAD_LIBS@': '', - '@CARBON_LIBS@': '', - '@COCOA_LIBS@': ''} - - glib_replace_items = {'glib-genmarshal': '${exec_prefix}/bin/glib-genmarshal', - 'glib-mkenums': 'perl ${exec_prefix}/bin/glib-mkenums', - 'gobject-query': '${exec_prefix}/bin/gobject-query', - '@PCRE_REQUIRES@': '', - '@INTLLIBS@': '-lintl', - '@G_LIBS_EXTRA@': '', - '@PCRE_LIBS@': '', - '@ICONV_LIBS@': '-liconv', - '@GLIB_EXTRA_CFLAGS@': ''} - - pkg_replace_items.update(base_pc.base_replace_items) - - glib_replace_items.update(pkg_replace_items) - - # Generate glib-2.0.pc - replace_multi(base_pc.top_srcdir + '/glib-2.0.pc.in', - base_pc.srcdir + '/glib-2.0.pc', - glib_replace_items) - - # Generate gthread-2.0.pc - replace_multi(base_pc.top_srcdir + '/gthread-2.0.pc.in', - base_pc.srcdir + '/gthread-2.0.pc', - pkg_replace_items) - - # Generate gmodule*-2.0.pc - gmodule_replace_items = {'@G_MODULE_SUPPORTED@': 'yes', - '@G_MODULE_LDFLAGS@': '', - '@G_MODULE_LIBS@': ''} - gmodule_replace_items.update(pkg_replace_items) - replace_multi(base_pc.top_srcdir + '/gmodule-2.0.pc.in', - base_pc.srcdir + '/gmodule-2.0.pc', - gmodule_replace_items) - replace_multi(base_pc.top_srcdir + '/gmodule-export-2.0.pc.in', - base_pc.srcdir + '/gmodule-export-2.0.pc', - gmodule_replace_items) - replace_multi(base_pc.top_srcdir + '/gmodule-no-export-2.0.pc.in', - base_pc.srcdir + '/gmodule-no-export-2.0.pc', - gmodule_replace_items) - - # Generate gobject-2.0.pc - gobject_replace_items = {'@LIBFFI_LIBS@': ''} - gobject_replace_items.update(pkg_replace_items) - replace_multi(base_pc.top_srcdir + '/gobject-2.0.pc.in', - base_pc.srcdir + '/gobject-2.0.pc', - gobject_replace_items) - - # Generate gio*-2.0.pc - gio_replace_items = {'@GIO_MODULE_DIR@': '${exec_prefix}/bin/gio/modules', - '@ZLIB_LIBS@': '-lzlib1', - '@NETWORK_LIBS@': '-lws2_32', - '@SELINUX_LIBS@': '', - '@LIBMOUNT_LIBS@': '', - 'glib-compile-schemas': '${exec_prefix}/bin/glib-compile-schemas', - 'glib-compile-resources': '${exec_prefix}/bin/glib-compile-resources', - 'gdbus-codegen': 'python ${exec_prefix}/bin/gdbus-codegen'} - gio_replace_items.update(pkg_replace_items) - replace_multi(base_pc.top_srcdir + '/gio-2.0.pc.in', - base_pc.srcdir + '/gio-2.0.pc', - gio_replace_items) - replace_multi(base_pc.top_srcdir + '/gio-windows-2.0.pc.in', - base_pc.srcdir + '/gio-windows-2.0.pc', - pkg_replace_items) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/pc_base.py b/win32/pc_base.py deleted file mode 100644 index f7976e8d2..000000000 --- a/win32/pc_base.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to generate the basic info -# needed in a .pc (pkg-config) file, used especially -# for introspection purposes - -# This can be used in various projects where -# there is the need to generate .pc files, -# and is copied from GLib's $(srcroot)/win32 - -# Author: Fan, Chun-wei -# Date: March 10, 2016 - -import os -import sys -import argparse - -class BasePCItems: - def __init__(self): - self.base_replace_items = {} - self.exec_prefix = '' - self.includedir = '' - self.libdir = '' - self.prefix = '' - self.srcdir = os.path.dirname(__file__) - self.top_srcdir = self.srcdir + '\\..' - self.version = '' - - def setup(self, argv, parser=None): - if parser is None: - parser = argparse.ArgumentParser(description='Setup basic .pc file info') - parser.add_argument('--prefix', help='prefix of the installed library', - required=True) - parser.add_argument('--exec-prefix', - help='prefix of the installed programs, \ - if different from the prefix') - parser.add_argument('--includedir', - help='includedir of the installed library, \ - if different from ${prefix}/include') - parser.add_argument('--libdir', - help='libdir of the installed library, \ - if different from ${prefix}/lib') - parser.add_argument('--version', help='Version of the package', - required=True) - args = parser.parse_args() - - self.version = args.version - - # check whether the prefix and exec_prefix are valid - if not os.path.exists(args.prefix): - raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix) - - # use absolute paths for prefix - self.prefix = os.path.abspath(args.prefix).replace('\\','/') - - # check and setup the exec_prefix - if getattr(args, 'exec_prefix', None) is None: - exec_prefix_use_shorthand = True - self.exec_prefix = '${prefix}' - else: - if args.exec_prefix.startswith('${prefix}'): - exec_prefix_use_shorthand = True - input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):] - else: - exec_prefix_use_shorthand = False - input_exec_prefix = args.exec_prefix - if not os.path.exists(input_exec_prefix): - raise SystemExit('Specified exec_prefix \'%s\' is invalid' % - args.exec_prefix) - if exec_prefix_use_shorthand is True: - self.exec_prefix = args.exec_prefix.replace('\\','/') - else: - self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/') - - # check and setup the includedir - if getattr(args, 'includedir', None) is None: - self.includedir = '${prefix}/include' - else: - if args.includedir.startswith('${prefix}'): - includedir_use_shorthand = True - input_includedir = args.prefix + args.includedir[len('${prefix}'):] - else: - if args.includedir.startswith('${exec_prefix}'): - includedir_use_shorthand = True - input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):] - else: - includedir_use_shorthand = False - input_includedir = args.includedir - if not os.path.exists(input_includedir): - raise SystemExit('Specified includedir \'%s\' is invalid' % - args.includedir) - if includedir_use_shorthand is True: - self.includedir = args.includedir.replace('\\','/') - else: - self.includedir = os.path.abspath(input_includedir).replace('\\','/') - - # check and setup the libdir - if getattr(args, 'libdir', None) is None: - self.libdir = '${prefix}/lib' - else: - if args.libdir.startswith('${prefix}'): - libdir_use_shorthand = True - input_libdir = args.prefix + args.libdir[len('${prefix}'):] - else: - if args.libdir.startswith('${exec_prefix}'): - libdir_use_shorthand = True - input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):] - else: - libdir_use_shorthand = False - input_libdir = args.libdir - if not os.path.exists(input_libdir): - raise SystemExit('Specified libdir \'%s\' is invalid' % - args.libdir) - if libdir_use_shorthand is True: - self.libdir = args.libdir.replace('\\','/') - else: - self.libdir = os.path.abspath(input_libdir).replace('\\','/') - - # setup dictionary for replacing items in *.pc.in - self.base_replace_items.update({'@VERSION@': self.version}) - self.base_replace_items.update({'@prefix@': self.prefix}) - self.base_replace_items.update({'@exec_prefix@': self.exec_prefix}) - self.base_replace_items.update({'@libdir@': self.libdir}) - self.base_replace_items.update({'@includedir@': self.includedir}) diff --git a/win32/replace.py b/win32/replace.py deleted file mode 100644 index 3aeceb1f7..000000000 --- a/win32/replace.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to manipulate -# certain types of strings in a file - -# This can be used in various projects where -# there is the need to replace strings in files, -# and is copied from GLib's $(srcroot)/win32 - -# Author: Fan, Chun-wei -# Date: September 03, 2014 - -import os -import sys -import re -import string -import argparse - -valid_actions = ['remove-prefix', - 'replace-var', - 'replace-str', - 'remove-str'] - -def open_file(filename, mode): - if sys.version_info[0] < 3: - return open(filename, mode=mode) - else: - return open(filename, mode=mode, encoding='utf-8') - -def replace_multi(src, dest, replace_items): - with open_file(src, 'r') as s: - with open_file(dest, 'w') as d: - for line in s: - replace_dict = dict((re.escape(key), value) \ - for key, value in replace_items.items()) - replace_pattern = re.compile("|".join(replace_dict.keys())) - d.write(replace_pattern.sub(lambda m: \ - replace_dict[re.escape(m.group(0))], line)) - -def replace(src, dest, instring, outstring): - replace_item = {instring: outstring} - replace_multi(src, dest, replace_item) - -def check_required_args(args, params): - for param in params: - if getattr(args, param, None) is None: - raise SystemExit('%s: error: --%s argument is required' % (__file__, param)) - -def warn_ignored_args(args, params): - for param in params: - if getattr(args, param, None) is not None: - print('%s: warning: --%s argument is ignored' % (__file__, param)) - -def main(argv): - - parser = argparse.ArgumentParser(description='Process strings in a file.') - parser.add_argument('-a', - '--action', - help='Action to carry out. Can be one of:\n' - 'remove-prefix\n' - 'replace-var\n' - 'replace-str\n' - 'remove-str', - choices=valid_actions) - parser.add_argument('-i', '--input', help='Input file') - parser.add_argument('-o', '--output', help='Output file') - parser.add_argument('--instring', help='String to replace or remove') - parser.add_argument('--var', help='Autotools variable name to replace') - parser.add_argument('--outstring', - help='New String to replace specified string or variable') - parser.add_argument('--removeprefix', help='Prefix of string to remove') - - args = parser.parse_args() - - input_string = '' - output_string = '' - - # We must have action, input, output for all operations - check_required_args(args, ['action','input','output']) - - # Build the arguments by the operation that is to be done, - # to be fed into replace() - - # Get rid of prefixes from a string - if args.action == 'remove-prefix': - check_required_args(args, ['instring','removeprefix']) - warn_ignored_args(args, ['outstring','var']) - input_string = args.removeprefix + args.instring - output_string = args.instring - - # Replace an m4-style variable (those surrounded by @...@) - if args.action == 'replace-var': - check_required_args(args, ['var','outstring']) - warn_ignored_args(args, ['instring','removeprefix']) - input_string = '@' + args.var + '@' - output_string = args.outstring - - # Replace a string - if args.action == 'replace-str': - check_required_args(args, ['instring','outstring']) - warn_ignored_args(args, ['var','removeprefix']) - input_string = args.instring - output_string = args.outstring - - # Remove a string - if args.action == 'remove-str': - check_required_args(args, ['instring']) - warn_ignored_args(args, ['var','outstring','removeprefix']) - input_string = args.instring - output_string = '' - - replace(args.input, args.output, input_string, output_string) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/setup.py b/win32/setup.py deleted file mode 100644 index 74e4a1312..000000000 --- a/win32/setup.py +++ /dev/null @@ -1,347 +0,0 @@ -#!/usr/bin/python -# vim: encoding=utf-8 -#expand *.in files -#this script is only intended for building from git, not for building from the released tarball, which already includes all necessary files -import os -import sys -import re -import string -import subprocess -import optparse - -def get_version(srcroot): - ver = {} - RE_VERSION = re.compile(r'^m4_define\(\[(glib_\w+)\],\s*\[(\d+)\]\)') - with open(os.path.join(srcroot, 'configure.ac'), 'r') as ac: - for i in ac: - mo = RE_VERSION.search(i) - if mo: - ver[mo.group(1).upper()] = int(mo.group(2)) - ver['GLIB_BINARY_AGE'] = 100 * ver['GLIB_MINOR_VERSION'] + ver['GLIB_MICRO_VERSION'] - ver['GLIB_VERSION'] = '%d.%d.%d' % (ver['GLIB_MAJOR_VERSION'], - ver['GLIB_MINOR_VERSION'], - ver['GLIB_MICRO_VERSION']) - ver['LT_RELEASE'] = '%d.%d' % (ver['GLIB_MAJOR_VERSION'], ver['GLIB_MINOR_VERSION']) - ver['LT_CURRENT'] = 100 * ver['GLIB_MINOR_VERSION'] + ver['GLIB_MICRO_VERSION'] - ver['GLIB_INTERFACE_AGE'] - ver['LT_REVISION'] = ver['GLIB_INTERFACE_AGE'] - ver['LT_AGE'] = ver['GLIB_BINARY_AGE'] - ver['GLIB_INTERFACE_AGE'] - ver['LT_CURRENT_MINUS_AGE'] = ver['LT_CURRENT'] - ver['LT_AGE'] - return ver - -def process_in(src, dest, vars): - RE_VARS = re.compile(r'@(\w+?)@') - with open(src, 'r') as s: - with open(dest, 'w') as d: - for i in s: - i = RE_VARS.sub(lambda x: str(vars[x.group(1)]), i) - d.write(i) - -def get_srcroot(): - if not os.path.isabs(__file__): - path = os.path.abspath(__file__) - else: - path = __file__ - dirname = os.path.dirname(path) - return os.path.abspath(os.path.join(dirname, '..')) - -def process_include(src, dest, includes): - RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"') - with open(src, 'r') as s: - with open(dest, 'w') as d: - for i in s: - mo = RE_INCLUDE.search(i) - if mo: - target = '' - for j in includes: - #print "searching in ", j - if mo.group(1) in os.listdir(j): - target = os.path.join(j, mo.group(1)) - break - if not target: - raise Exception("Couldn't fine include file %s" % mo.group(1)) - else: - with open(target, 'r') as t: - for inc in t.readlines(): - d.write(inc) - else: - d.write(i) - -def generate_libgio_sourcefiles(srcroot, dest, stype): - vars = read_vars_from_AM(os.path.join(srcroot, 'gio', 'Makefile.am'), - vars = {'top_srcdir': srcroot}, - conds = {'OS_WIN32': True}, - filters = ['libgio_2_0_la_SOURCES', 'win32_more_sources_for_vcproj']) - - files = vars['libgio_2_0_la_SOURCES'].split() + \ - vars['win32_more_sources_for_vcproj'].split() - - sources = [i for i in files \ - if i != 'gdesktopappinfo.c' and \ - not (i.startswith('gunix') and i.endswith('.c')) \ - and i.endswith('.c') ] - if stype == '9': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\t\n') - elif stype == '10': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\t\n') - elif stype == '10f': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\tSource Files\n') - else: - raise Exception("Must specify project type (9, 10 or 10f)") - -def generate_libgio_enumtypes(srcroot, perl): - vars = read_vars_from_AM(os.path.join(srcroot, 'gio', 'Makefile.am'), - vars = {'top_srcdir': srcroot}, - conds = {'OS_WIN32': True}, - filters = ['gio_headers']) - cwd = os.getcwd() - os.chdir(os.path.join(srcroot, 'gio')) - for suffix in ['.c', '.h']: - cmd = [perl, os.path.join(srcroot, 'gobject', 'glib-mkenums'), - '--template', 'gioenumtypes' + suffix + '.template'] + vars['gio_headers'].split() - with open('gioenumtypes' + suffix, 'w') as d: - subprocess.Popen(cmd, stdout = d).communicate() - os.chdir(cwd) -def generate_libglib_sourcefiles(srcroot, dest, stype): - vars = read_vars_from_AM(os.path.join(srcroot, 'glib', 'Makefile.am'), - vars = {'top_srcdir': srcroot}, - conds = {'OS_WIN32': True, - 'ENABLE_REGEX': True}, - filters = ['libglib_2_0_la_SOURCES']) - - files = vars['libglib_2_0_la_SOURCES'].split() - - sources = [i for i in files \ - if not (i.endswith('-gcc.c') or i.endswith('-unix.c')) \ - and i.endswith('.c') ] - if stype == '9': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\t\n') - elif stype == '10': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\t\n') - elif stype == '10f': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\tSource Files\n') - else: - raise Exception("Must specify project type (9, 10 or 10f)") - -def generate_libgobject_sourcefiles(srcroot, dest, stype): - vars = read_vars_from_AM(os.path.join(srcroot, 'gobject', 'Makefile.am'), - vars = {'top_srcdir': srcroot}, - conds = {'OS_WIN32': True}, - filters = ['libgobject_2_0_la_SOURCES']) - - files = vars['libgobject_2_0_la_SOURCES'].split() - - sources = [i for i in files if i.endswith('.c') ] - if stype == '9': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\t\n') - elif stype == '10': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\t\n') - elif stype == '10f': - with open(dest, 'w') as d: - for i in sources: - d.write('\t\t\tSource Files\n') - else: - raise Exception("Must specify project type (9, 10 or 10f)") - -def read_vars_from_AM(path, vars = {}, conds = {}, filters = None): - ''' - path: path to the Makefile.am - vars: predefined variables - conds: condition variables for Makefile - filters: if None, all variables defined are returned, - otherwise, it is a list contains that variables should be returned - ''' - cur_vars = vars.copy() - RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)') - RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$') - RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)') - RE_AM_CONTINUING = re.compile(r'\\\s*$') - RE_AM_IF = re.compile(r'^\s*if\s+(\w+)') - RE_AM_ELSE = re.compile(r'^\s*else') - RE_AM_ENDIF = re.compile(r'^\s*endif') - def am_eval(cont): - return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont) - with open(path, 'r') as f: - contents = f.readlines() - #combine continuing lines - i = 0 - ncont = [] - while i < len(contents): - line = contents[i] - if RE_AM_CONTINUING.search(line): - line = RE_AM_CONTINUING.sub('', line) - j = i + 1 - while j < len(contents) and RE_AM_CONTINUING.search(contents[j]): - line += RE_AM_CONTINUING.sub('', contents[j]) - j += 1 - else: - if j < len(contents): - line += contents[j] - i = j - else: - i += 1 - ncont.append(line) - - #include, var define, var evaluation - i = -1 - skip = False - oldskip = [] - while i < len(ncont) - 1: - i += 1 - line = ncont[i] - mo = RE_AM_IF.search(line) - if mo: - oldskip.append(skip) - skip = False if mo.group(1) in conds and conds[mo.group(1)] \ - else True - continue - mo = RE_AM_ELSE.search(line) - if mo: - skip = not skip - continue - mo = RE_AM_ENDIF.search(line) - if mo: - skip = oldskip.pop() - continue - if not skip: - mo = RE_AM_INCLUDE.search(line) - if mo: - cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None)) - continue - mo = RE_AM_VAR.search(line) - if mo: - cur_vars[mo.group(1)] = am_eval(mo.group(2).strip()) - continue - - #filter: - if filters != None: - ret = {} - for i in filters: - ret[i] = cur_vars.get(i, '') - return ret - else: - return cur_vars - -def main(argv): - parser = optparse.OptionParser() - parser.add_option('-p', '--perl', dest='perl', metavar='PATH', default='C:\\Perl\\bin\\perl.exe', action='store', help='path to the perl interpretor (default: C:\\Perl\\bin\\perl.exe)') - opt, args = parser.parse_args(argv) - srcroot = get_srcroot() - #print 'srcroot', srcroot - ver = get_version(srcroot) - #print 'ver', ver - config_vars = ver.copy() - config_vars['GETTEXT_PACKAGE'] = 'Glib' - process_in(os.path.join(srcroot, 'config.h.win32.in'), - os.path.join(srcroot, 'config.h'), - config_vars) - glibconfig_vars = ver.copy() - glibconfig_vars['GLIB_WIN32_STATIC_COMPILATION_DEFINE'] = '' - process_in(os.path.join(srcroot, 'glib', 'glibconfig.h.win32.in'), - os.path.join(srcroot, 'glib', 'glibconfig.h'), - glibconfig_vars) - - for submodule in ['glib', 'gobject', 'gthread', 'gmodule', 'gio']: - process_in(os.path.join(srcroot, submodule, submodule + '.rc.in'), - os.path.join(srcroot, submodule, submodule + '.rc'), - ver) - - #------------ submodule gobject ------------------- - generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'win32', 'libglib.sourcefiles'), '9') - generate_libglib_sourcefiles(srcroot, - os.path.join(srcroot, 'win32', 'libglib.vs10.sourcefiles'), '10') - generate_libglib_sourcefiles(srcroot, - 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') - with open(os.path.join(srcroot, 'glib', 'gspawn-win64-helper-console.c'), 'w') as c: - c.write('#define HELPER_CONSOLE\n') - c.write('#include "gspawn-win32-helper.c"\n') - with open(os.path.join(srcroot, 'glib', 'gspawn-win64-helper.c'), 'w') as c: - c.write('#include "gspawn-win32-helper.c"\n') - #------------ end of submodule glib ------------------- - - #------------ submodule gobject ------------------- - mkenums_vars = ver.copy() - process_in(os.path.join(srcroot, 'gobject', 'glib-mkenums.in'), - os.path.join(srcroot, 'gobject', 'glib-mkenums'), - mkenums_vars) - - generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'win32', 'libgobject.sourcefiles'), '9') - generate_libgobject_sourcefiles(srcroot, - os.path.join(srcroot, 'win32', 'libgobject.vs10.sourcefiles'), '10') - generate_libgobject_sourcefiles(srcroot, - 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, 'win32', 'libgio.sourcefiles'), '9') - generate_libgio_sourcefiles(srcroot, - os.path.join(srcroot, 'win32', 'libgio.vs10.sourcefiles'), '10') - generate_libgio_sourcefiles(srcroot, - 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 ------------------- - - #------------ submodule gmodule ------------------- - #------------ end of submodule gmodule ------------------- - return 0 - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/vs10/.gitignore b/win32/vs10/.gitignore deleted file mode 100644 index 0bdbb5048..000000000 --- a/win32/vs10/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -gio.vcxproj -gio.vcxproj.filters -glib.vcxproj -glib.vcxproj.filters -gobject.vcxproj -gobject.vcxproj.filters -glib-compile-resources.vcxproj -glib-compile-resources.vcxproj.filters -glib-compile-schemas.vcxproj -glib-compile-schemas.vcxproj.filters -glib-version-paths.props -glib-install.props diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am deleted file mode 100644 index cddbb444e..000000000 --- a/win32/vs10/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -GENERATED_ITEMS = \ - glib.vcxproj \ - glib.vcxproj.filters \ - gobject.vcxproj \ - gobject.vcxproj.filters \ - gio.vcxproj \ - gio.vcxproj.filters \ - glib-compile-schemas.vcxproj \ - glib-compile-schemas.vcxproj.filters \ - glib-compile-resources.vcxproj \ - glib-compile-resources.vcxproj.filters \ - gio-tool.vcxproj \ - gio-tool.vcxproj.filters \ - glib-version-paths.props \ - glib-install.props - -MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers - -EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcxprojin \ - glib.vcxproj.filtersin \ - gspawn-win32-helper-console.vcxproj \ - gspawn-win32-helper-console.vcxproj.filters \ - gspawn-win32-helper.vcxproj \ - gspawn-win32-helper.vcxproj.filters \ - gmodule.vcxproj \ - gmodule.vcxproj.filters \ - gobject.vcxprojin \ - gobject.vcxproj.filtersin \ - gthread.vcxproj \ - gthread.vcxproj.filters \ - gio.vcxprojin \ - gio.vcxproj.filtersin \ - glib-compile-schemas.vcxprojin \ - glib-compile-schemas.vcxproj.filtersin \ - gsettings.vcxproj \ - gsettings.vcxproj.filters \ - glib-compile-resources.vcxprojin \ - glib-compile-resources.vcxproj.filtersin \ - gio-tool.vcxprojin \ - gio-tool.vcxproj.filtersin \ - gresource.vcxproj \ - gresource.vcxproj.filters \ - gio-querymodules.vcxproj \ - gio-querymodules.vcxproj.filters \ - gdbus.vcxproj \ - gdbus.vcxproj.filters \ - glib-install.vcxproj \ - glib-install.vcxproj.filters \ - glib-build-defines.props \ - glib-install.propsin \ - glib-version-paths.props.in \ - glib-gen-srcs.props \ - $(GENERATED_ITEMS) - -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 - -$(RM) $(top_builddir)/win32/vs15/glib-install.props - $(CPP) -P - <$(top_srcdir)/win32/vs10/glib-install.propsin >$@ - rm $(MSVC10_HEADERS_LIST) - -DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt deleted file mode 100644 index e73fcc931..000000000 --- a/win32/vs10/README.txt +++ /dev/null @@ -1,96 +0,0 @@ -Please do not compile this package (GLib) in paths that contain -spaces in them-as strange problems may occur during compilation or during -the use of the library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building GLib and its dependencies with Visual C++: - -https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS10 solution and the projects it includes are intented to be used -in a GLib source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or run build/win32/setup.py, -which will do the work for you: - -$python build/win32/setup.py --perl path_to_your_perl.exe - -for more usage on this script, run -$python build/win32/setup.py -h/--help - -The required dependencies are zlib, proxy-libintl and LibFFI. Fetch the latest -proxy-libintl-dev and zlib-dev zipfiles from -http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ for 32-bit -builds, and correspondingly -http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ for 64-bit -builds. - -A Python 2.7.x or 3.x interpreter is also required, in order to generate -the utility scripts, as well as the pkg-config files for the build. Please -see the entry "PythonDir" in glib-version-paths.props to verify that -it is correct. - -One may wish to build his/her own ZLib-It is recommended that ZLib is -built using the win32/Makefile.msc makefile with VS10 with the ASM routines -to avoid linking problems-see win32/Makefile.msc in ZLib for more details. - -For LibFFI, please use the Centricular fork of it, which can be found at -https://github.com/centricular/libffi. Please refer to the instructions -there on building, as it involves using the Meson build system and possibly -the Ninja build tool if the Visual Studio project generation is not used -or is unavailable. - -Please note, although using one's own existing PCRE installation to build GLib -is possible, it is still recommended to build PCRE during the process of building -GLib (i.e. using the Debug or Release configurations), as GLib's bundled PCRE -has been patched to work optimally with GLib. If building against an existing -PCRE is desired, use the(BuildType)_ExtPCRE configurations, but one needs to ensure -that the existing PCRE is: --Built with VS10 --Unicode support is built in (please see the CMake options for this) --It is built with the Multithreaded DLL (/MD, for release builds) or the - Multithreaded DLL Debug (/MDd, for debug builds) - -If using static builds of PCRE, please add PCRE_STATIC to the "Preprocessor -Definitions" of the glib project settings. - -Please be aware that the GLib's regex test program will only pass with PCRE directly -built into GLib. - -Set up the source tree as follows under some arbitrary top -folder : - -\ -\vs10\ - -*this* file you are now reading is thus located at -\\build\win32\vs10\README. - - is either Win32 or x64, as in VS10 project files. - -You should unpack the proxy-libintl-dev zip file into -\vs10\, so that for instance libintl.h end up at -\vs10\\include\libintl.h. - -For LibFFI, one should also put the generated ffi.h and ffitarget.h -into \vs10\\include\ and the compiled static libffi.lib -(or copy libffi-convenience.lib into libffi.lib) into -\vs10\\lib\. - -The "install" project will copy build results and headers into their -appropriate location under \vs10\. For instance, -built DLLs go into \vs10\\bin, built LIBs into -\vs10\\lib and GLib headers into -\vs10\\include\glib-2.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific GLib source tree. - -Note: If you see C4819 errors and you are compiling GLib on a DBCS -(Chinese/Korean/Japanese) version of Windows, you may need to switch -to an English locale in Control Panel->Region and Languages->System-> -Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf, -ATK and GTK+ is built correctly. This is due to a bug in Visual C++ running -on DBCS locales, and also affects many other opensource projects which are -built with Visual C++, including but not limited to QT and the Mozilla apps. - ---Tor Lillqvist ---Updated by Chun-wei Fan diff --git a/win32/vs10/gdbus.vcxproj b/win32/vs10/gdbus.vcxproj deleted file mode 100644 index 6ffc4eacf..000000000 --- a/win32/vs10/gdbus.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {95A1571F-61BE-4C51-BE53-2F2DAB280687} - gresource - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - - - MachineX64 - - - - - MaxSpeed - true - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - - - MachineX64 - - - - - - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - - - - diff --git a/win32/vs10/gdbus.vcxproj.filters b/win32/vs10/gdbus.vcxproj.filters deleted file mode 100644 index 1921c4967..000000000 --- a/win32/vs10/gdbus.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - diff --git a/win32/vs10/gio-querymodules.vcxproj b/win32/vs10/gio-querymodules.vcxproj deleted file mode 100644 index 2a6551fd6..000000000 --- a/win32/vs10/gio-querymodules.vcxproj +++ /dev/null @@ -1,183 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {95A1571F-61BE-4C51-BE53-2F2DAB280686} - gresource - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - - - MachineX64 - - - - - MaxSpeed - true - ..\..\gmodule;%(AdditionalIncludeDirectories) - $(GioInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - ..\..\gmodule;%(AdditionalIncludeDirectories) - $(GioInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - - - MachineX64 - - - - - - - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - {4214047c-f5c1-40b3-8369-5dced8c32770} - false - - - - - - diff --git a/win32/vs10/gio-querymodules.vcxproj.filters b/win32/vs10/gio-querymodules.vcxproj.filters deleted file mode 100644 index 7119db1b2..000000000 --- a/win32/vs10/gio-querymodules.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - diff --git a/win32/vs10/gio-tool.vcxproj.filtersin b/win32/vs10/gio-tool.vcxproj.filtersin deleted file mode 100644 index 42b9cdb75..000000000 --- a/win32/vs10/gio-tool.vcxproj.filtersin +++ /dev/null @@ -1,12 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - -#include "gio-tool.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/gio-tool.vcxprojin b/win32/vs10/gio-tool.vcxprojin deleted file mode 100644 index 9a7905deb..000000000 --- a/win32/vs10/gio-tool.vcxprojin +++ /dev/null @@ -1,186 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338} - glibtool - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - $(OutDir)gio.exe - true - Console - $(OutDir)gio.pdb - MachineX86 - - - - - Disabled - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)gio.exe - true - Console - - - $(OutDir)gio.pdb - MachineX64 - - - - - MaxSpeed - true - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - $(GioInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - $(OutDir)gio.exe - true - Console - true - true - $(OutDir)gio.pdb - MachineX86 - - - - - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - $(GioInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)gio.exe - true - Console - true - true - - - $(OutDir)gio.pdb - MachineX64 - - - -#include "gio-tool.vs10.sourcefiles" - - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - - - - diff --git a/win32/vs10/gio.vcxproj.filtersin b/win32/vs10/gio.vcxproj.filtersin deleted file mode 100644 index 72a62016f..000000000 --- a/win32/vs10/gio.vcxproj.filtersin +++ /dev/null @@ -1,28 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "gio.vs10.sourcefiles.filters" - - - Resource Files - - - - Resource Files - - - diff --git a/win32/vs10/gio.vcxprojin b/win32/vs10/gio.vcxprojin deleted file mode 100644 index ae7d5f839..000000000 --- a/win32/vs10/gio.vcxprojin +++ /dev/null @@ -1,206 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F3D1583C-5613-4809-BD98-7CC1C1276F92} - gio - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - false - true - false - - - - Disabled - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX86 - - - - - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - $(GioBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX86 - - - - - Disabled - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;$(GioBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX64 - - - - - ..\..\gio;..\..\gmodule;%(AdditionalIncludeDirectories) - $(GioBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - zlib1.lib;$(WindowsNetworkingLibs);%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX64 - - - -#include "gio.vs10.sourcefiles" - - - - Copying gnetworking.h from gnetworking.h.win32... - $(GenGNetworkingH) - ..\..\gio\gnetworking.h;%(Outputs) - - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {4214047c-f5c1-40b3-8369-5dced8c32770} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - - - - diff --git a/win32/vs10/glib-build-defines.props b/win32/vs10/glib-build-defines.props deleted file mode 100644 index 86314a8c3..000000000 --- a/win32/vs10/glib-build-defines.props +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;G_LOG_DOMAIN="GLib-GRegex" - PCRE_EXP_DECL=__declspec(dllexport)extern;PCRE_EXP_DEFN= - -UBSR_ANYCRLF -UEBCDIC - LIBDIR="blah" - DLL_EXPORT - USE_SYSTEM_PCRE - GLIB_COMPILATION - GIO_COMPILATION - $(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN="GLib" - G_LOG_DOMAIN="GThread" - G_LOG_DOMAIN="GModule" - GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject" - $(GioInBuildMacro);G_LOG_DOMAIN="GLib-GIO";$(DllExportDefines) - ws2_32.lib;shlwapi.lib;dnsapi.lib;iphlpapi.lib - - - <_PropertySheetDisplayName>glibbuilddefinesprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - ..\..;..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - true - /d2Zi+ %(AdditionalOptions) - - - intl.lib;%(AdditionalDependencies) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - - - - - $(GLibBundledPCREDefines) - - - $(GlibBundledPCREExportDefines) - - - $(GLibBundledPCREUndefs) - - - $(LocalCharsetDefs) - - - $(DllExportDefines) - - - $(UseSystemPCREDefines) - - - $(GLibInBuildMacro) - - - $(GioInBuildMacro) - - - $(GLibBuildDefines) - - - $(GThreadBuildDefines) - - - $(GModuleBuildDefines) - - - $(GObjectBuildDefines) - - - $(GioBuildDefines) - - - $(WindowsNetworkingLibs) - - - diff --git a/win32/vs10/glib-compile-resources.vcxproj.filtersin b/win32/vs10/glib-compile-resources.vcxproj.filtersin deleted file mode 100644 index 68e8a5d52..000000000 --- a/win32/vs10/glib-compile-resources.vcxproj.filtersin +++ /dev/null @@ -1,12 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - -#include "glib-compile-resources.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/glib-compile-resources.vcxprojin b/win32/vs10/glib-compile-resources.vcxprojin deleted file mode 100644 index 31a6be13f..000000000 --- a/win32/vs10/glib-compile-resources.vcxprojin +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A} - glibcompileresources - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) - _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) - _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - - - MachineX64 - - - - - MaxSpeed - true - ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) - $(GioInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - ..\..\gmodule;..\..\gio;%(AdditionalIncludeDirectories) - $(GioInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - - - MachineX64 - - - -#include "glib-compile-resources.vs10.sourcefiles" - - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - - - - diff --git a/win32/vs10/glib-compile-schemas.vcxproj.filtersin b/win32/vs10/glib-compile-schemas.vcxproj.filtersin deleted file mode 100644 index 645779daa..000000000 --- a/win32/vs10/glib-compile-schemas.vcxproj.filtersin +++ /dev/null @@ -1,12 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - -#include "glib-compile-schemas.vs10.sourcefiles.filters" - - diff --git a/win32/vs10/glib-compile-schemas.vcxprojin b/win32/vs10/glib-compile-schemas.vcxprojin deleted file mode 100644 index 239e662f4..000000000 --- a/win32/vs10/glib-compile-schemas.vcxprojin +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {015D69D0-8B42-438A-ADAE-052AC036E065} - glibcompileschemas - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - - - MachineX64 - - - - - MaxSpeed - true - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - - - MachineX64 - - - -#include "glib-compile-schemas.vs10.sourcefiles" - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - - - - diff --git a/win32/vs10/glib-gen-srcs.props b/win32/vs10/glib-gen-srcs.props deleted file mode 100644 index ff15ea0b3..000000000 --- a/win32/vs10/glib-gen-srcs.props +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - copy ..\..\config.h.win32 ..\..\config.h - copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h - copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h - copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h - - - <_PropertySheetDisplayName>glibgensrcsprops - - - - $(GenConfigH) - - - $(GenGLibConfigH) - - - $(GenGModuleConfH) - - - $(GenGNetworkingH) - - - diff --git a/win32/vs10/glib-install.propsin b/win32/vs10/glib-install.propsin deleted file mode 100644 index 93762dfdb..000000000 --- a/win32/vs10/glib-install.propsin +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - $(SolutionDir)$(Configuration)\$(Platform)\bin - -mkdir $(CopyDir) -mkdir $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).dll $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).pdb $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).dll $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).pdb $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).dll $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).pdb $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).dll $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).pdb $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).dll $(CopyDir)\bin -copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).pdb $(CopyDir)\bin -copy $(BinDir)\gspawn-win*-helper*.exe $(CopyDir)\bin -copy $(BinDir)\gspawn-win*-helper*.pdb $(CopyDir)\bin -copy $(BinDir)\glib-compile-schemas.exe $(CopyDir)\bin -copy $(BinDir)\glib-compile-schemas.pdb $(CopyDir)\bin -copy $(BinDir)\gsettings.exe $(CopyDir)\bin -copy $(BinDir)\gsettings.pdb $(CopyDir)\bin -copy $(BinDir)\glib-compile-resources.exe $(CopyDir)\bin -copy $(BinDir)\glib-compile-resources.pdb $(CopyDir)\bin -copy $(BinDir)\gresource.exe $(CopyDir)\bin -copy $(BinDir)\gresource.pdb $(CopyDir)\bin -copy $(BinDir)\gio-querymodules.exe $(CopyDir)\bin -copy $(BinDir)\gio-querymodules.pdb $(CopyDir)\bin -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 ..\..\gobject\glib-mkenums $(CopyDir)\bin -copy ..\..\gobject\glib-genmarshal $(CopyDir)\bin -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(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) -#include "glib.vs10.headers" - -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 - -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 - -mkdir $(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 -copy $(BinDir)\gobject-$(ApiVersion).lib $(CopyDir)\lib -copy $(BinDir)\gio-$(ApiVersion).lib $(CopyDir)\lib - -mkdir $(CopyDir)\lib\pkgconfig -copy ..\gio-windows-2.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gio-2.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gobject-2.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gmodule-no-export-2.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gmodule-export-2.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gmodule-2.0.pc $(CopyDir)\lib\pkgconfig -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 - -mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen -copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen - - ..\..\gobject\glib-mkenums;..\..\gobject\glib-genmarshal;..\..\gio\gdbus-2.0\codegen\gdbus-codegen - ..\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 - $(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion) - $(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal --version=$(GlibVersion) - $(PythonDir)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion) - (if not exist $(CopyDir) mkdir $(CopyDir)) & ($(PythonDir)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion)) - - - <_PropertySheetDisplayName>glibinstallprops - - - - $(BinDir) - - - $(GlibDoInstall) - - - $(GlibUtilScripts) - - - $(GlibPCFiles) - - - $(GenGLibMKEnums) - - - $(GenGLibGenmarshal) - - - $(GenGDBusCodegen) - - - $(GlibGenPC) - - - diff --git a/win32/vs10/glib-install.vcxproj b/win32/vs10/glib-install.vcxproj deleted file mode 100644 index 3204bb0ba..000000000 --- a/win32/vs10/glib-install.vcxproj +++ /dev/null @@ -1,188 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2093D218-190E-4194-9421-3BA7CBF33B10} - glibinstall - Win32Proj - - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - - - - - - - - - - - - Generating .pc files... - $(GlibGenPC) - $(GlibPCFiles);%(Outputs) - Generating .pc files... - $(GlibGenPC) - $(GlibPCFiles);%(Outputs) - - - Generating glib-mkenums... - $(GenGLibMKEnums) - ..\..\gobject\glib-mkenums;%(Outputs) - Generating glib-mkenums... - $(GenGLibMKEnums) - ..\..\gobject\glib-mkenums;%(Outputs) - - - Generating glib-genmarshal... - $(GenGLibGenmarshal) - ..\..\gobject\glib-genmarshal;%(Outputs) - Generating glib-genmarshal... - $(GenGLibGenmarshal) - ..\..\gobject\glib-genmarshal;%(Outputs) - - - Generating gdbus-codegen... - $(GenGDBusCodegen) - ..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs) - Generating gdbus-codegen... - $(GenGDBusCodegen) - ..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs) - - - Installing Build Results... - $(GlibPCFiles);$(GlibUtilScripts) - $(GlibDoInstall) - blah;%(Outputs) - Installing Build Results... - $(GlibPCFiles);$(GlibUtilScripts) - $(GlibDoInstall) - blah;%(Outputs) - - - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {4214047c-f5c1-40b3-8369-5dced8c32770} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - {e40e8a7e-7cae-4659-9b8b-bc38898e3074} - false - - - {289240e7-e167-47ce-a20c-58d852e520ba} - false - - - {c8afb8c3-fffd-460f-bc13-9ac25d7b117c} - false - - - {015d69d0-8b42-438a-adae-052ac036e065} - false - - - {05041c63-f1c5-49ba-a7de-61ebb5307eaa} - false - - - {b0cdec7f-dce1-4f7e-b8a4-a3009c18fb2a} - false - - - {95a1571f-61be-4c51-be53-2f2dab280685} - false - - - {95a1571f-61be-4c51-be53-2f2dab280686} - false - - - {95a1571f-61be-4c51-be53-2f2dab280687} - false - - - {d0403e9a-2b00-4fd3-b3dd-3c8f9cb9a338} - false - - - - - - diff --git a/win32/vs10/glib-install.vcxproj.filters b/win32/vs10/glib-install.vcxproj.filters deleted file mode 100644 index aae121554..000000000 --- a/win32/vs10/glib-install.vcxproj.filters +++ /dev/null @@ -1,16 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Resource Files - Resource Files - Resource Files - Resource Files - Resource Files - - diff --git a/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in deleted file mode 100644 index f55157c5e..000000000 --- a/win32/vs10/glib-version-paths.props.in +++ /dev/null @@ -1,46 +0,0 @@ - - - - 10 - @GLIB_VERSION@ - 2.0 - ..\..\..\vs$(VSVer)\$(Platform) - $(GlibEtcInstallRoot) - - -2.0-0 - c:\python34 - c:\python34 - c:\python34 - c:\python36 - c:\python36 - - - <_PropertySheetDisplayName>glibversionpathsprops - - - - $(VSVer) - - - $(GlibVersion) - - - $(ApiVersion) - - - $(GlibEtcInstallRoot) - - - $(CopyDir) - - - $(GlibDllPrefix) - - - $(GlibDllSuffix) - - - $(PythonDir) - - - diff --git a/win32/vs10/glib.sln b/win32/vs10/glib.sln deleted file mode 100644 index 71c671e4b..000000000 --- a/win32/vs10/glib.sln +++ /dev/null @@ -1,289 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcxproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmodule", "gmodule.vcxproj", "{4214047C-F5C1-40B3-8369-5DCED8C32770}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcxproj", "{F172EFFC-E30F-4593-809E-DB2024B1E753}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcxproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio", "gio.vcxproj", "{F3D1583C-5613-4809-BD98-7CC1C1276F92}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspawn-win32-helper.vcxproj", "{289240E7-E167-47CE-A20C-58D852E520BA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console", "gspawn-win32-helper-console.vcxproj", "{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-schemas", "glib-compile-schemas.vcxproj", "{015D69D0-8B42-438A-ADAE-052AC036E065}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsettings", "gsettings.vcxproj", "{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gresource", "gresource.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280685}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-resources", "glib-compile-resources.vcxproj", "{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-querymodules", "gio-querymodules.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280686}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280687}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcxproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Debug_BundledPCRE|Win32 = Debug_BundledPCRE|Win32 - Debug_BundledPCRE|x64 = Debug_BundledPCRE|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - Release_BundledPCRE|Win32 = Release_BundledPCRE|Win32 - Release_BundledPCRE|x64 = Release_BundledPCRE|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.ActiveCfg = Debug|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.Build.0 = Debug|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.ActiveCfg = Debug_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.Build.0 = Debug_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.ActiveCfg = Debug_BundledPCRE|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.Build.0 = Debug_BundledPCRE|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.ActiveCfg = Release|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.ActiveCfg = Release_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.Build.0 = Release_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.ActiveCfg = Release_BundledPCRE|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.Build.0 = Release_BundledPCRE|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.ActiveCfg = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.Build.0 = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.ActiveCfg = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.ActiveCfg = Release|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.Build.0 = Release|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.ActiveCfg = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.Build.0 = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.ActiveCfg = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.ActiveCfg = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.Build.0 = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.ActiveCfg = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.Build.0 = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.ActiveCfg = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.ActiveCfg = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.Build.0 = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.ActiveCfg = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.Build.0 = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.ActiveCfg = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.ActiveCfg = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.Build.0 = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.ActiveCfg = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.Build.0 = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.ActiveCfg = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.ActiveCfg = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.Build.0 = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.ActiveCfg = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.Build.0 = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.ActiveCfg = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.ActiveCfg = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.Build.0 = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.ActiveCfg = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.Build.0 = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.ActiveCfg = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.Build.0 = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.ActiveCfg = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.Build.0 = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.ActiveCfg = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.Build.0 = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.ActiveCfg = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.Build.0 = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.ActiveCfg = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.Build.0 = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.ActiveCfg = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.Build.0 = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.ActiveCfg = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.Build.0 = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.ActiveCfg = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.Build.0 = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.ActiveCfg = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.Build.0 = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.ActiveCfg = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.Build.0 = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.ActiveCfg = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.Build.0 = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.Build.0 = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs10/glib.vcxproj.filtersin b/win32/vs10/glib.vcxproj.filtersin deleted file mode 100644 index 7a5084c8e..000000000 --- a/win32/vs10/glib.vcxproj.filtersin +++ /dev/null @@ -1,66 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {bb961775-fd45-4205-b1fd-901c3c8fd64c} - - - {f630c518-4c58-4dfa-ab43-5fa0b0eb10f1} - - - {9fef0e23-cf71-48aa-979b-7eb84df56143} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "glib.vs10.sourcefiles.filters" - Source Files - Source Files - Source Files - Source Files - Source Files\libcharset - Source Files\gnulib - Source Files\gnulib - Source Files\gnulib - Source Files\gnulib - Source Files\gnulib - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - Source Files\pcre - - - Resource Files - Resource Files - - - - Resource Files - - - diff --git a/win32/vs10/glib.vcxprojin b/win32/vs10/glib.vcxprojin deleted file mode 100644 index ab6616778..000000000 --- a/win32/vs10/glib.vcxprojin +++ /dev/null @@ -1,525 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug_BundledPCRE - Win32 - - - Debug_BundledPCRE - x64 - - - Release - Win32 - - - Release - x64 - - - Release_BundledPCRE - Win32 - - - Release_BundledPCRE - x64 - - - - {12BCA020-EABF-429E-876A-A476BC9C10C0} - glib - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - Debug\$(Platform)\bin\ - true - false - Release\$(Platform)\bin\ - false - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX86 - - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX86 - - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX64 - - - - - Disabled - _DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX64 - - - - - $(GLibBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX86 - - - - - $(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX86 - - - - - $(GLibBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX64 - - - - - $(GLibBuildDefines);$(UseSystemPCREDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX64 - - - -#include "glib.vs10.sourcefiles" - - - - - - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - $(LocalCharsetDefs);%(PreprocessorDefinitions) - - - - - - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - $(GLibBundledPCREDefines);%(PreprocessorDefinitions) - $(GLibBundledPCREUndefs) %(AdditionalOptions) - true - - - - - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\config.h;%(Outputs) - - - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\glib\glibconfig.h;%(Outputs) - Copying glibconfig.h from glibconfig.h.win32... - $(GenGLibConfigH) - ..\..\glib\glibconfig.h;%(Outputs) - - - - - - - - - diff --git a/win32/vs10/gmodule.vcxproj b/win32/vs10/gmodule.vcxproj deleted file mode 100644 index abfbb5322..000000000 --- a/win32/vs10/gmodule.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4214047C-F5C1-40B3-8369-5DCED8C32770} - gmodule - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - false - - - - Disabled - _DEBUG;$(GModuleBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX86 - - - - - $(GModuleBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX86 - - - - - Disabled - _DEBUG;$(GModuleBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX64 - - - - - $(GModuleBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX64 - - - - - - - - Copying gmoduleconf.h from gmoduleconf.h.win32... - $(GenGModuleConfH) - ..\..\gmodule\gmoduleconf.h;%(Outputs) - Copying gmoduleconf.h from gmoduleconf.h.win32... - $(GenGModuleConfH) - ..\..\gmodule\gmoduleconf.h;%(Outputs) - - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - - - - diff --git a/win32/vs10/gmodule.vcxproj.filters b/win32/vs10/gmodule.vcxproj.filters deleted file mode 100644 index df97a6b67..000000000 --- a/win32/vs10/gmodule.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - Resource Files - - - - Resource Files - - - diff --git a/win32/vs10/gobject.vcxproj.filtersin b/win32/vs10/gobject.vcxproj.filtersin deleted file mode 100644 index 85af63ff2..000000000 --- a/win32/vs10/gobject.vcxproj.filtersin +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "gobject.vs10.sourcefiles.filters" - - - Resource Files - - diff --git a/win32/vs10/gobject.vcxprojin b/win32/vs10/gobject.vcxprojin deleted file mode 100644 index 50fe2038b..000000000 --- a/win32/vs10/gobject.vcxprojin +++ /dev/null @@ -1,186 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F172EFFC-E30F-4593-809E-DB2024B1E753} - gobject - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - false - - - - Disabled - _DEBUG;$(GObjectBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ffi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX86 - - - - - $(GObjectBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - ffi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX86 - - - - - Disabled - _DEBUG;$(GObjectBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - ffi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX64 - - - - - $(GObjectBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - ffi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX64 - - - -#include "gobject.vs10.sourcefiles" - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {c8afb8c3-fffd-460f-bc13-9ac25d7b117c} - false - - - - - - diff --git a/win32/vs10/gresource.vcxproj b/win32/vs10/gresource.vcxproj deleted file mode 100644 index 766e371e8..000000000 --- a/win32/vs10/gresource.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {95A1571F-61BE-4C51-BE53-2F2DAB280685} - gresource - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - - - MachineX64 - - - - - MaxSpeed - true - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - - - MachineX64 - - - - - - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - - - - diff --git a/win32/vs10/gresource.vcxproj.filters b/win32/vs10/gresource.vcxproj.filters deleted file mode 100644 index 2e373bb9f..000000000 --- a/win32/vs10/gresource.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - diff --git a/win32/vs10/gsettings.vcxproj b/win32/vs10/gsettings.vcxproj deleted file mode 100644 index c0a366308..000000000 --- a/win32/vs10/gsettings.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA} - gsettings - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - ..\..\gmodule;%(AdditionalIncludeDirectories) - DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - - - MachineX64 - - - - - MaxSpeed - true - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - ..\..\gmodule;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - - - MachineX64 - - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - {f3d1583c-5613-4809-bd98-7cc1c1276f92} - false - - - - - - diff --git a/win32/vs10/gsettings.vcxproj.filters b/win32/vs10/gsettings.vcxproj.filters deleted file mode 100644 index 843c0cb2b..000000000 --- a/win32/vs10/gsettings.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - diff --git a/win32/vs10/gspawn-win32-helper-console.vcxproj b/win32/vs10/gspawn-win32-helper-console.vcxproj deleted file mode 100644 index 6b31acf83..000000000 --- a/win32/vs10/gspawn-win32-helper-console.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074} - gspawnwin32helperconsole - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - false - true - false - - - - Disabled - _DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - true - Console - - - MachineX86 - - - - - $(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - - - MachineX86 - - - - - Disabled - _DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)gspawn-win64-helper-console.exe - true - $(OutDir)gspawn-win64-helper-console.pdb - Console - - - MachineX64 - - - - - $(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)gspawn-win64-helper-console.exe - true - $(OutDir)gspawn-win64-helper-console.pdb - Console - true - true - - - MachineX64 - - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - - - - diff --git a/win32/vs10/gspawn-win32-helper-console.vcxproj.filters b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters deleted file mode 100644 index 85fd3f6f3..000000000 --- a/win32/vs10/gspawn-win32-helper-console.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - diff --git a/win32/vs10/gspawn-win32-helper.vcxproj b/win32/vs10/gspawn-win32-helper.vcxproj deleted file mode 100644 index dc30edc44..000000000 --- a/win32/vs10/gspawn-win32-helper.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {289240E7-E167-47CE-A20C-58D852E520BA} - gspawnwin32helper - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(GLibInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - true - Windows - - - MachineX86 - - - - - Disabled - _DEBUG;$(GLibInBuildMacro);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)gspawn-win64-helper.exe - true - $(OutDir)gspawn-win64-helper.pdb - Windows - - - MachineX64 - - - - - $(GLibInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Windows - true - true - - - MachineX86 - - - - - $(GLibInBuildMacro);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)gspawn-win64-helper.exe - true - $(OutDir)gspawn-win64-helper.pdb - Windows - true - true - - - MachineX64 - - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - - - - diff --git a/win32/vs10/gspawn-win32-helper.vcxproj.filters b/win32/vs10/gspawn-win32-helper.vcxproj.filters deleted file mode 100644 index 85fd3f6f3..000000000 --- a/win32/vs10/gspawn-win32-helper.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - diff --git a/win32/vs10/gthread.vcxproj b/win32/vs10/gthread.vcxproj deleted file mode 100644 index 7dc57e7ef..000000000 --- a/win32/vs10/gthread.vcxproj +++ /dev/null @@ -1,184 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} - gthread - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - false - true - false - - - - Disabled - _DEBUG;$(GThreadBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX86 - - - - - $(GThreadBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX86 - - - - - Disabled - _DEBUG;$(GThreadBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - - - MachineX64 - - - - - $(GThreadBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - true - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - Windows - true - true - - - MachineX64 - - - - - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - - - - diff --git a/win32/vs10/gthread.vcxproj.filters b/win32/vs10/gthread.vcxproj.filters deleted file mode 100644 index 82d30ab16..000000000 --- a/win32/vs10/gthread.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Source Files - - - Resource Files - - diff --git a/win32/vs11/.gitignore b/win32/vs11/.gitignore deleted file mode 100644 index a7e3d4a30..000000000 --- a/win32/vs11/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -gio.vcxproj -gio.vcxproj.filters -glib-compile-resources.vcxproj -glib-compile-resources.vcxproj.filters -glib-compile-schemas.vcxproj -glib-compile-schemas.vcxproj.filters -glib-genmarshal.vcxproj -glib-genmarshal.vcxproj.filters -glib.vcxproj -glib.vcxproj.filters -gmodule.vcxproj -gmodule.vcxproj.filters -gobject.vcxproj -gobject.vcxproj.filters -gresource.vcxproj -gresource.vcxproj.filters -gsettings.vcxproj -gsettings.vcxproj.filters -gspawn-win32-helper-console.vcxproj -gspawn-win32-helper-console.vcxproj.filters -gspawn-win32-helper.vcxproj -gspawn-win32-helper.vcxproj.filters -gthread.vcxproj -gthread.vcxproj.filters -install.vcxproj -glib.sln -README.txt -glib-build-defines.props -glib-install.props -glib-version-paths.props -glibprepbuild.props diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am deleted file mode 100644 index b1fbcaec6..000000000 --- a/win32/vs11/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcxproj \ - glib.vcxproj.filters \ - gspawn-win32-helper-console.vcxproj \ - gspawn-win32-helper-console.vcxproj.filters \ - gspawn-win32-helper.vcxproj \ - gspawn-win32-helper.vcxproj.filters \ - gmodule.vcxproj \ - gmodule.vcxproj.filters \ - gobject.vcxproj \ - gobject.vcxproj.filters \ - gthread.vcxproj \ - gthread.vcxproj.filters \ - gio.vcxproj \ - gio.vcxproj.filters \ - glib-compile-schemas.vcxproj \ - glib-compile-schemas.vcxproj.filters \ - gsettings.vcxproj \ - gsettings.vcxproj.filters \ - glib-compile-resources.vcxproj \ - glib-compile-resources.vcxproj.filters \ - gio-tool.vcxproj \ - gio-tool.vcxproj.filters \ - gresource.vcxproj \ - gresource.vcxproj.filters \ - gio-querymodules.vcxproj \ - gio-querymodules.vcxproj.filters \ - gdbus.vcxproj \ - gdbus.vcxproj.filters \ - glib-install.vcxproj \ - glib-install.vcxproj.filters \ - glib-build-defines.props \ - glib-install.props \ - glib-version-paths.props \ - glib-gen-srcs.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 11 -MSVC_VER_LONG = 2012 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs12/.gitignore b/win32/vs12/.gitignore deleted file mode 100644 index a7e3d4a30..000000000 --- a/win32/vs12/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -gio.vcxproj -gio.vcxproj.filters -glib-compile-resources.vcxproj -glib-compile-resources.vcxproj.filters -glib-compile-schemas.vcxproj -glib-compile-schemas.vcxproj.filters -glib-genmarshal.vcxproj -glib-genmarshal.vcxproj.filters -glib.vcxproj -glib.vcxproj.filters -gmodule.vcxproj -gmodule.vcxproj.filters -gobject.vcxproj -gobject.vcxproj.filters -gresource.vcxproj -gresource.vcxproj.filters -gsettings.vcxproj -gsettings.vcxproj.filters -gspawn-win32-helper-console.vcxproj -gspawn-win32-helper-console.vcxproj.filters -gspawn-win32-helper.vcxproj -gspawn-win32-helper.vcxproj.filters -gthread.vcxproj -gthread.vcxproj.filters -install.vcxproj -glib.sln -README.txt -glib-build-defines.props -glib-install.props -glib-version-paths.props -glibprepbuild.props diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am deleted file mode 100644 index a57df617b..000000000 --- a/win32/vs12/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcxproj \ - glib.vcxproj.filters \ - gspawn-win32-helper-console.vcxproj \ - gspawn-win32-helper-console.vcxproj.filters \ - gspawn-win32-helper.vcxproj \ - gspawn-win32-helper.vcxproj.filters \ - gmodule.vcxproj \ - gmodule.vcxproj.filters \ - gobject.vcxproj \ - gobject.vcxproj.filters \ - gthread.vcxproj \ - gthread.vcxproj.filters \ - gio.vcxproj \ - gio.vcxproj.filters \ - glib-compile-schemas.vcxproj \ - glib-compile-schemas.vcxproj.filters \ - gsettings.vcxproj \ - gsettings.vcxproj.filters \ - glib-compile-resources.vcxproj \ - glib-compile-resources.vcxproj.filters \ - gio-tool.vcxproj \ - gio-tool.vcxproj.filters \ - gresource.vcxproj \ - gresource.vcxproj.filters \ - gio-querymodules.vcxproj \ - gio-querymodules.vcxproj.filters \ - gdbus.vcxproj \ - gdbus.vcxproj.filters \ - glib-install.vcxproj \ - glib-install.vcxproj.filters \ - glib-build-defines.props \ - glib-install.props \ - glib-version-paths.props \ - glib-gen-srcs.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 12 -MSVC_VER_LONG = 2013 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am deleted file mode 100644 index c22d2ac73..000000000 --- a/win32/vs14/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcxproj \ - glib.vcxproj.filters \ - gspawn-win32-helper-console.vcxproj \ - gspawn-win32-helper-console.vcxproj.filters \ - gspawn-win32-helper.vcxproj \ - gspawn-win32-helper.vcxproj.filters \ - gmodule.vcxproj \ - gmodule.vcxproj.filters \ - gobject.vcxproj \ - gobject.vcxproj.filters \ - gthread.vcxproj \ - gthread.vcxproj.filters \ - gio.vcxproj \ - gio.vcxproj.filters \ - glib-compile-schemas.vcxproj \ - glib-compile-schemas.vcxproj.filters \ - gsettings.vcxproj \ - gsettings.vcxproj.filters \ - glib-compile-resources.vcxproj \ - glib-compile-resources.vcxproj.filters \ - gio-tool.vcxproj \ - gio-tool.vcxproj.filters \ - gresource.vcxproj \ - gresource.vcxproj.filters \ - gio-querymodules.vcxproj \ - gio-querymodules.vcxproj.filters \ - gdbus.vcxproj \ - gdbus.vcxproj.filters \ - glib-install.vcxproj \ - glib-install.vcxproj.filters \ - glib-build-defines.props \ - glib-install.props \ - glib-version-paths.props \ - glib-gen-srcs.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 14 -MSVC_VER_LONG = 14 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am deleted file mode 100644 index fcea2b3d7..000000000 --- a/win32/vs15/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcxproj \ - glib.vcxproj.filters \ - gspawn-win32-helper-console.vcxproj \ - gspawn-win32-helper-console.vcxproj.filters \ - gspawn-win32-helper.vcxproj \ - gspawn-win32-helper.vcxproj.filters \ - gmodule.vcxproj \ - gmodule.vcxproj.filters \ - gobject.vcxproj \ - gobject.vcxproj.filters \ - gthread.vcxproj \ - gthread.vcxproj.filters \ - gio.vcxproj \ - gio.vcxproj.filters \ - glib-compile-schemas.vcxproj \ - glib-compile-schemas.vcxproj.filters \ - gsettings.vcxproj \ - gsettings.vcxproj.filters \ - glib-compile-resources.vcxproj \ - glib-compile-resources.vcxproj.filters \ - gio-tool.vcxproj \ - gio-tool.vcxproj.filters \ - gresource.vcxproj \ - gresource.vcxproj.filters \ - gio-querymodules.vcxproj \ - gio-querymodules.vcxproj.filters \ - gdbus.vcxproj \ - gdbus.vcxproj.filters \ - glib-install.vcxproj \ - glib-install.vcxproj.filters \ - glib-build-defines.props \ - glib-install.props \ - glib-version-paths.props \ - glib-gen-srcs.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 15 -MSVC_VER_LONG = 15 -#MSVC_TOOLSET = 141 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs9/.gitignore b/win32/vs9/.gitignore deleted file mode 100644 index c23b304ce..000000000 --- a/win32/vs9/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -glib.vcproj -gobject.vcproj -gio.vcproj -glib-compile-resources.vcproj -glib-compile-schemas.vcproj -glib-version-paths.vsprops -glib-install.vsprops diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am deleted file mode 100644 index 01fa052e6..000000000 --- a/win32/vs9/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -GENERATED_ITEMS = \ - glib.vcproj \ - gobject.vcproj \ - gio.vcproj \ - glib-compile-schemas.vcproj \ - glib-compile-resources.vcproj \ - gio-tool.vcproj \ - glib-version-paths.vsprops \ - glib-install.vsprops - -MSVC_HEADERS_LIST = glib.headers gobject.headers gio.headers - -EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcprojin \ - gspawn-win32-helper-console.vcproj \ - gspawn-win32-helper.vcproj \ - gmodule.vcproj \ - gobject.vcprojin \ - gthread.vcproj \ - gio.vcprojin \ - gsettings.vcproj \ - gresource.vcproj \ - gio-querymodules.vcproj \ - gdbus.vcproj \ - glib-compile-schemas.vcprojin \ - glib-compile-resources.vcprojin \ - gio-tool.vcprojin \ - glib-install.vcproj \ - glib-build-defines.vsprops \ - glib-version-paths.vsprops.in \ - glib-gen-srcs.vsprops \ - glib-install.vspropsin \ - $(GENERATED_ITEMS) - -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/win32/vs9/README.txt b/win32/vs9/README.txt deleted file mode 100644 index 2dbd41bb1..000000000 --- a/win32/vs9/README.txt +++ /dev/null @@ -1,95 +0,0 @@ -Please do not compile this package (GLib) in paths that contain -spaces in them-as strange problems may occur during compilation or during -the use of the library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building GLib and its dependencies with Visual C++: - -https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS9 solution and the projects it includes are intented to be used -in a GLib source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or run build/win32/setup.py, -which will do the work for you: - -$python build/win32/setup.py --perl path_to_your_perl.exe - -for more usage on this script, run -$python build/win32/setup.py -h/--help - -The required dependencies are zlib and proxy-libintl. Fetch the latest -proxy-libintl-dev and zlib-dev zipfiles from -http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ for 32-bit -builds, and correspondingly -http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ for 64-bit -builds. - -A Python 2.7.x or 3.x interpreter is also required, in order to generate -the utility scripts, as well as the pkg-config files for the build. Please -see the entry "PythonDir" in glib-version-paths.vsprops to verify that -it is correct. - -One may wish to build his/her own ZLib-It is recommended that ZLib is -built using the win32/Makefile.msc makefile with VS9 with the ASM routines -to avoid linking problems-see win32/Makefile.msc in ZLib for more details. - -For LibFFI, please use the Centricular fork of it, which can be found at -https://github.com/centricular/libffi. Please refer to the build instructions -there on how to build it, which involves using the Meson build system, and -the Ninja build tool. - -Please note, although using one's own existing PCRE installation to build GLib -is possible, it is still recommended to build PCRE during the process of building -GLib (i.e. using the Debug or Release configurations), as GLib's bundled PCRE -has been patched to work optimally with GLib. If building against an existing -PCRE is desired, use the(BuildType)_ExtPCRE configurations, but one needs to ensure -that the existing PCRE is: --Built with VS9 --Unicode support is built in (please see the CMake options for this) --It is built with the Multithreaded DLL (/MD, for release builds) or the - Multithreaded DLL Debug (/MDd, for debug builds) - -If using static builds of PCRE, please add PCRE_STATIC to the "Preprocessor -Definitions" of the glib project settings. - -Please be aware that the GLib's regex test program will only pass with PCRE directly -built into GLib. - -Set up the source tree as follows under some arbitrary top -folder : - -\ -\vs9\ - -*this* file you are now reading is thus located at -\\build\win32\vs9\README. - - is either Win32 or x64, as in VS9 project files. - -You should unpack the proxy-libintl-dev zip file into -\vs9\, so that for instance libintl.h end up at -\vs9\\include\libintl.h. - -For LibFFI, one should also put the generated ffi.h and ffitarget.h -into \vs9\\include\ and the compiled static libffi.lib -(or copy libffi-convenience.lib into libffi.lib) into -\vs9\\lib\. - -The "install" project will copy build results and headers into their -appropriate location under \vs9\. For instance, -built DLLs go into \vs9\\bin, built LIBs into -\vs9\\lib and GLib headers into -\vs9\\include\glib-2.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific GLib source tree. - -Note: If you see C4819 errors and you are compiling GLib on a DBCS -(Chinese/Korean/Japanese) version of Windows, you may need to switch -to an English locale in Control Panel->Region and Languages->System-> -Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf, -ATK and GTK+ is built correctly. This is due to a bug in Visual C++ running -on DBCS locales, and also affects many other opensource projects which are -built with Visual C++, including but not limited to QT and the Mozilla apps. - ---Tor Lillqvist ---Updated by Chun-wei Fan diff --git a/win32/vs9/gdbus.vcproj b/win32/vs9/gdbus.vcproj deleted file mode 100644 index b95252f99..000000000 --- a/win32/vs9/gdbus.vcproj +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gio-querymodules.vcproj b/win32/vs9/gio-querymodules.vcproj deleted file mode 100644 index d9cc29731..000000000 --- a/win32/vs9/gio-querymodules.vcproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gio-tool.vcprojin b/win32/vs9/gio-tool.vcprojin deleted file mode 100644 index 05576acb5..000000000 --- a/win32/vs9/gio-tool.vcprojin +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gio-tool.sourcefiles" - - - - - - - - - diff --git a/win32/vs9/gio.vcprojin b/win32/vs9/gio.vcprojin deleted file mode 100644 index 8abd220e2..000000000 --- a/win32/vs9/gio.vcprojin +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gio.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/glib-build-defines.vsprops b/win32/vs9/glib-build-defines.vsprops deleted file mode 100644 index cccf36fe7..000000000 --- a/win32/vs9/glib-build-defines.vsprops +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/glib-compile-resources.vcprojin b/win32/vs9/glib-compile-resources.vcprojin deleted file mode 100644 index e76b485ad..000000000 --- a/win32/vs9/glib-compile-resources.vcprojin +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "glib-compile-resources.sourcefiles" - - - - - diff --git a/win32/vs9/glib-compile-schemas.vcprojin b/win32/vs9/glib-compile-schemas.vcprojin deleted file mode 100644 index f3f54d102..000000000 --- a/win32/vs9/glib-compile-schemas.vcprojin +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "glib-compile-schemas.sourcefiles" - - - - - diff --git a/win32/vs9/glib-gen-srcs.vsprops b/win32/vs9/glib-gen-srcs.vsprops deleted file mode 100644 index 02a6a5a8c..000000000 --- a/win32/vs9/glib-gen-srcs.vsprops +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/win32/vs9/glib-install.vcproj b/win32/vs9/glib-install.vcproj deleted file mode 100644 index 37a6a7c5f..000000000 --- a/win32/vs9/glib-install.vcproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/glib-install.vspropsin b/win32/vs9/glib-install.vspropsin deleted file mode 100644 index c1e36d2c4..000000000 --- a/win32/vs9/glib-install.vspropsin +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - diff --git a/win32/vs9/glib-version-paths.vsprops.in b/win32/vs9/glib-version-paths.vsprops.in deleted file mode 100644 index c5c6c1b85..000000000 --- a/win32/vs9/glib-version-paths.vsprops.in +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - diff --git a/win32/vs9/glib.sln b/win32/vs9/glib.sln deleted file mode 100644 index 2add2077b..000000000 --- a/win32/vs9/glib.sln +++ /dev/null @@ -1,362 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmodule", "gmodule.vcproj", "{4214047C-F5C1-40B3-8369-5DCED8C32770}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcproj", "{F172EFFC-E30F-4593-809E-DB2024B1E753}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} = {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio", "gio.vcproj", "{F3D1583C-5613-4809-BD98-7CC1C1276F92}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspawn-win32-helper.vcproj", "{289240E7-E167-47CE-A20C-58D852E520BA}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console", "gspawn-win32-helper-console.vcproj", "{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-schemas", "glib-compile-schemas.vcproj", "{015D69D0-8B42-438A-ADAE-052AC036E065}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsettings", "gsettings.vcproj", "{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-resources", "glib-compile-resources.vcproj", "{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gresource", "gresource.vcproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280685}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-querymodules", "gio-querymodules.vcproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280686}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280687}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}" - ProjectSection(ProjectDependencies) = postProject - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} - {4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770} - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074} = {E40E8A7E-7CAE-4659-9B8B-BC38898E3074} - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} = {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} - {289240E7-E167-47CE-A20C-58D852E520BA} = {289240E7-E167-47CE-A20C-58D852E520BA} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {015D69D0-8B42-438A-ADAE-052AC036E065} = {015D69D0-8B42-438A-ADAE-052AC036E065} - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA} = {05041C63-F1C5-49BA-A7DE-61EBB5307EAA} - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A} = {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A} - {95A1571F-61BE-4C51-BE53-2F2DAB280685} = {95A1571F-61BE-4C51-BE53-2F2DAB280685} - {95A1571F-61BE-4C51-BE53-2F2DAB280686} = {95A1571F-61BE-4C51-BE53-2F2DAB280686} - {95A1571F-61BE-4C51-BE53-2F2DAB280687} = {95A1571F-61BE-4C51-BE53-2F2DAB280687} - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338} = {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_BundledPCRE|Win32 = Debug_BundledPCRE|Win32 - Debug_BundledPCRE|x64 = Debug_BundledPCRE|x64 - Release_BundledPCRE|Win32 = Release_BundledPCRE|Win32 - Release_BundledPCRE|x64 = Release_BundledPCRE|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.ActiveCfg = Debug_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|Win32.Build.0 = Debug_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.ActiveCfg = Debug_BundledPCRE|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug_BundledPCRE|x64.Build.0 = Debug_BundledPCRE|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.ActiveCfg = Release_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|Win32.Build.0 = Release_BundledPCRE|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.ActiveCfg = Release_BundledPCRE|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release_BundledPCRE|x64.Build.0 = Release_BundledPCRE|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.ActiveCfg = Debug|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|x64.Build.0 = Debug|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.ActiveCfg = Release|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.ActiveCfg = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|x64.Build.0 = Debug|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.ActiveCfg = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.ActiveCfg = Release|x64 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|x64.Build.0 = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.ActiveCfg = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|x64.Build.0 = Debug|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.ActiveCfg = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.ActiveCfg = Release|x64 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|x64.Build.0 = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.ActiveCfg = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|x64.Build.0 = Debug|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.ActiveCfg = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.ActiveCfg = Release|x64 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|x64.Build.0 = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.ActiveCfg = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.Build.0 = Debug|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.ActiveCfg = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.ActiveCfg = Release|x64 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|x64.Build.0 = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.ActiveCfg = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|x64.Build.0 = Debug|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.ActiveCfg = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.ActiveCfg = Release|x64 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|x64.Build.0 = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.ActiveCfg = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|x64.Build.0 = Debug|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.ActiveCfg = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.ActiveCfg = Release|x64 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.Build.0 = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.ActiveCfg = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.Build.0 = Debug|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.ActiveCfg = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.Build.0 = Debug|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.ActiveCfg = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|Win32.Build.0 = Release|Win32 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.ActiveCfg = Release|x64 - {015D69D0-8B42-438A-ADAE-052AC036E065}.Release|x64.Build.0 = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.ActiveCfg = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|Win32.Build.0 = Debug|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.ActiveCfg = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Debug|x64.Build.0 = Debug|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.ActiveCfg = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|Win32.Build.0 = Release|Win32 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.ActiveCfg = Release|x64 - {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release|x64.Build.0 = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.ActiveCfg = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.Build.0 = Debug|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.ActiveCfg = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.Build.0 = Debug|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.ActiveCfg = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.Build.0 = Release|Win32 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.ActiveCfg = Release|x64 - {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Debug|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280686}.Release|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.ActiveCfg = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|Win32.Build.0 = Debug|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.ActiveCfg = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Debug|x64.Build.0 = Debug|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.ActiveCfg = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.Build.0 = Release|Win32 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.ActiveCfg = Release|x64 - {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.Build.0 = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64 - {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.Build.0 = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs9/glib.vcprojin b/win32/vs9/glib.vcprojin deleted file mode 100644 index e92415373..000000000 --- a/win32/vs9/glib.vcprojin +++ /dev/null @@ -1,634 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "glib.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gmodule.vcproj b/win32/vs9/gmodule.vcproj deleted file mode 100644 index 6ea16b438..000000000 --- a/win32/vs9/gmodule.vcproj +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gobject.vcprojin b/win32/vs9/gobject.vcprojin deleted file mode 100644 index 1660f7216..000000000 --- a/win32/vs9/gobject.vcprojin +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "gobject.sourcefiles" - - - - - - - - diff --git a/win32/vs9/gresource.vcproj b/win32/vs9/gresource.vcproj deleted file mode 100644 index 1d7ae0a9d..000000000 --- a/win32/vs9/gresource.vcproj +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gsettings.vcproj b/win32/vs9/gsettings.vcproj deleted file mode 100644 index 6a8c2f383..000000000 --- a/win32/vs9/gsettings.vcproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gspawn-win32-helper-console.vcproj b/win32/vs9/gspawn-win32-helper-console.vcproj deleted file mode 100644 index 6f14391ff..000000000 --- a/win32/vs9/gspawn-win32-helper-console.vcproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gspawn-win32-helper.vcproj b/win32/vs9/gspawn-win32-helper.vcproj deleted file mode 100644 index e846e4c88..000000000 --- a/win32/vs9/gspawn-win32-helper.vcproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/gthread.vcproj b/win32/vs9/gthread.vcproj deleted file mode 100644 index cc9e111c3..000000000 --- a/win32/vs9/gthread.vcproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 6888e3278c715066ca336946e75e556f5a40f91b Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 6 Jun 2018 14:42:23 +0800 Subject: [PATCH 2/6] README.win32: Update build instructions Let people know that they should use Meson for building GLib under Visual Studio, and the steps that they may need to know. --- README.win32 | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/README.win32 b/README.win32 index 4fda64ae0..809cdfa33 100644 --- a/README.win32 +++ b/README.win32 @@ -172,32 +172,34 @@ and libtool documentation. Building with Visual Studio =========================== -A more detailed outline of building GLib with its dependencies can -now be found on the GNOME wiki: +Meson is now the supported method of building GLib using Visual Studio. + +Note that you will need a libintl implementation, zlib, and libFFI. + +You will also need the following items: +-Python 3.6.x, you need the 32-bit version if you are building GLib + as a 32-bit/x86 build, or the amd64/x64 version for building 64-bit/x86-64 + builds. You will then need to install or update Meson by using pip. +-The Ninja build tool, required for Visual Studio 2008, 2012 and 2013 builds, + and optional for 2010, 2015 and 2017 builds, where Visual Studio projects + can be generated instead of the Ninja build files. + +One can also refer to the following page for building the dependencies: https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack -Please do not build GLib in paths that contain spaces in them, as -this may cause problems during compilation and during usage of the -library. +Note that if building the sources with Visual Studio 2008, note the following steps: -In an unpacked tarball, you will find in build\win32\vs9 (VS 2008) and -build\win32\vs10 (VS 2010) a solution file that can be used to build -the GLib DLLs and some auxiliary programs under VS 2008 and VS 2010 -(Express Edition will suffice with the needed dependencies) respectively. -Read the README.txt file in those folders for more -information. Note that you will need a libintl implementation, zlib, and -libFFI. +-You need to run the following lines from your build directory, to embed the manifests + that are generated during the build, assuming the built binaries are installed + to $(PREFIX), after a successful build/installation: -If you are building from a GIT checkout, you will first need to use some -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 win32/setup.py -as follows: +for /r %f in (*.dll.manifest) do if exist $(PREFIX)\bin\%~nf mt /manifest %f $(PREFIX)\bin\%~nf;2 +for /r %f in (*.exe.manifest) do if exist $(PREFIX)\bin\%~nf mt /manifest %f $(PREFIX)\bin\%~nf;1 -$python win32/setup.py --perl path_to_your_perl.exe - -for more usage on this script, run -$python win32/setup.py -h/--help - -[1]: https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack under "Preparations" +-If building for amd64/x86_64/x64, sometimes the compilation of sources may seem to hang, which + is caused by an optimization issue in the 2008 x64 compiler. You need to use Task Manager to + remove all running instances of cl.exe, which will cause the build process to terminate. Update + the build flags of the sources that hang on compilation by changing its "/O2" flag to "/O1", and + things should continue to build normally. At the time of writing, this is needed for compiling + glib/gtestutils.c, gio/gsettings.c and gio/gsettingsschema.c From efd19088b0655f539e5073ce5503638ec030fd55 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 6 Jun 2018 15:26:25 +0800 Subject: [PATCH 3/6] Drop config.h.win32.in and glib/glibconfig.h.win32.in Since the Visual Studio projects are dropped, the pre-configured config.h.win32.in and glib/glibconfig.h.win32.in are no longer needed. --- config.h.win32.in | 854 ------------------------------------- glib/glibconfig.h.win32.in | 262 ------------ 2 files changed, 1116 deletions(-) delete mode 100644 config.h.win32.in delete mode 100644 glib/glibconfig.h.win32.in diff --git a/config.h.win32.in b/config.h.win32.in deleted file mode 100644 index 25ff47252..000000000 --- a/config.h.win32.in +++ /dev/null @@ -1,854 +0,0 @@ -/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* The normal alignment of `guint32', in bytes. */ -#define ALIGNOF_GUINT32 4 - -/* The normal alignment of `guint64', in bytes. */ -#define ALIGNOF_GUINT64 8 - -/* The normal alignment of `unsigned long', in bytes. */ -#define ALIGNOF_UNSIGNED_LONG 4 - -/* poll doesn't work on devices */ -#define BROKEN_POLL 1 - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* always defined to indicate that i18n is enabled */ -#define ENABLE_NLS 1 - -/* Define the gettext package to be used */ -#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" - -/* Define to the GLIB binary age */ -#define GLIB_BINARY_AGE @GLIB_BINARY_AGE@ - -/* Define to the GLIB interface age */ -#define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@ - -/* Define the location where the catalogs will be installed */ -#define GLIB_LOCALE_DIR "NONE/share/locale" - -/* Define to the GLIB major version */ -#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@ - -/* Define to the GLIB micro version */ -#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@ - -/* Define to the GLIB minor version */ -#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ - -/* A 'va_copy' style function */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -# define G_VA_COPY va_copy -#else /* _MSC_VER && _MSC_VER < 1800 */ -/* #undef G_VA_COPY */ -#endif - -/* 'va_lists' cannot be copies as values */ -/* #undef G_VA_COPY_AS_ARRAY */ - -/* Define to 1 if you have `alloca', as a function or macro. */ -/* #undef HAVE_ALLOCA */ - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ATTR_XATTR_H */ - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 - -/* Define if you have a version of the snprintf function with semantics as - specified by the ISO C99 standard. */ -#undef HAVE_C99_SNPRINTF - -/* Define if you have a version of the vsnprintf function with semantics as - specified by the ISO C99 standard. */ -#undef HAVE_C99_VSNPRINTF - -/* define to 1 if Carbon is available */ -/* #undef HAVE_CARBON */ - -/* Define to 1 if you have the `clock_gettime' function. */ -/* #undef HAVE_CLOCK_GETTIME */ - -/* define to 1 if Cocoa is available */ -/* #undef HAVE_COCOA */ - -/* Have nl_langinfo (CODESET) */ -/* #undef HAVE_CODESET */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_CRT_EXTERNS_H */ - -/* Define if dbus-1 is available */ -/* #undef HAVE_DBUS1 */ - -/* Define to 1 if you have the `dcgettext' function. */ -#define HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#ifndef _MSC_VER -# define HAVE_DIRENT_H 1 -#else -/* # undef HAVE_DIRENT_H */ -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if using dtrace probes. */ -/* #undef HAVE_DTRACE */ - -/* Define to 1 if you have the `endmntent' function. */ -/* #undef HAVE_ENDMNTENT */ - -/* Define to 1 if you have the `endservent' function. */ -/* #undef HAVE_ENDSERVENT */ - -/* we have the eventfd(2) system call */ -/* #undef HAVE_EVENTFD */ - -/* Define to 1 if you have the `fallocate' function. */ -/* #undef HAVE_FALLOCATE */ - -/* Define if we have FAM */ -/* #undef HAVE_FAM */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_FAM_H */ - -/* Define if we have FAMNoExists in fam */ -/* #undef HAVE_FAM_NO_EXISTS */ - -/* Define to 1 if you have the `fchmod' function. */ -/* #undef HAVE_FCHMOD */ - -/* Define to 1 if you have the `fchown' function. */ -/* #undef HAVE_FCHOWN */ - -/* Define to 1 if you have the `fdwalk' function. */ -/* #undef HAVE_FDWALK */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_FSTAB_H */ - -/* Define to 1 if you have the `fsync' function. */ -/* #undef HAVE_FSYNC */ - -/* we have the futex(2) system call */ -/* #undef HAVE_FUTEX */ - -/* Define to 1 if you have the `getc_unlocked' function. */ -/* #undef HAVE_GETC_UNLOCKED */ - -/* Define to 1 if you have the `getfsstat' function. */ -/* #undef HAVE_GETFSSTAT */ - -/* Define to 1 if you have the `getgrgid_r' function. */ -/* #undef HAVE_GETGRGID_R */ - -/* Define to 1 if you have the `getmntent_r' function. */ -/* #undef HAVE_GETMNTENT_R */ - -/* Define to 1 if you have the `getprotobyname_r' function. */ -/* #undef HAVE_GETPROTOBYNAME_R */ - -/* Define to 1 if you have the `getpwuid_r' function. */ -/* #undef HAVE_GETPWUID_R */ - -/* Define to 1 if you have the `getresuid' function. */ -/* #undef HAVE_GETRESUID */ - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT 1 - -/* Define to 1 if you have the `getvfsstat' function. */ -/* #undef HAVE_GETVFSSTAT */ - -/* Define to 1 if you have the `gmtime_r' function. */ -/* #undef HAVE_GMTIME_R */ - -/* define to use system printf */ -/* #undef HAVE_GOOD_PRINTF */ - -/* Define to 1 if you have the `hasmntopt' function. */ -/* #undef HAVE_HASMNTOPT */ - -/* Define to 1 if you have the `if_indextoname' function. */ -#define HAVE_IF_INDEXTONAME 1 - -/* Define to 1 if you have the `if_nametoindex' function. */ -#define HAVE_IF_NAMETOINDEX 1 - -/* Define to 1 if you have the `inotify_init1' function. */ -/* #undef HAVE_INOTIFY_INIT1 */ - -/* define to support printing 64-bit integers with format I64 */ -/* #undef HAVE_INT64_AND_I64 */ - -/* Define if you have the 'intmax_t' type in or . */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1600) -# define HAVE_INTMAX_T 1 -#endif - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -# define HAVE_INTTYPES_H 1 -#endif - -/* Define if exists, doesn't clash with , and - declares uintmax_t. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -# define HAVE_INTTYPES_H_WITH_UINTMAX 1 -#endif - -/* Define if we have struct ip_mreqn */ -/* #undef HAVE_IP_MREQN */ - -/* Define to 1 if you have the `issetugid' function. */ -/* #undef HAVE_ISSETUGID */ - -/* Define to 1 if you have the `kevent' function. */ -/* #undef HAVE_KEVENT */ - -/* Define to 1 if you have the `kqueue' function. */ -/* #undef HAVE_KQUEUE */ - -/* Define if you have and nl_langinfo(CODESET). */ -/* #undef HAVE_LANGINFO_CODESET */ - -/* Have nl_langinfo (_NL_CTYPE_OUTDIGITn_MB) */ -/* #undef HAVE_LANGINFO_OUTDIGIT */ - -/* Have nl_langinfo (PM_STR) */ -/* #undef HAVE_LANGINFO_TIME */ - -/* Define to 1 if you have the `lchmod' function. */ -/* #undef HAVE_LCHMOD */ - -/* Define to 1 if you have the `lchown' function. */ -/* #undef HAVE_LCHOWN */ - -/* Define if your file defines LC_MESSAGES. */ -/* #undef HAVE_LC_MESSAGES */ - -/* Define if libelf is available */ -/* #undef HAVE_LIBELF */ - -/* Define to 1 if you have the `link' function. */ -/* #undef HAVE_LINK */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_MAGIC_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the `localtime_r' function. */ -/* #undef HAVE_LOCALTIME_R */ - -/* Define if you have the 'long double' type. */ -#define HAVE_LONG_DOUBLE 1 - -/* Define if you have the 'long long' type. */ -#define HAVE_LONG_LONG 1 - -/* Define to 1 if you have the `lstat' function. */ -/* #undef HAVE_LSTAT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MACH_MACH_TIME_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the `mbrtowc' function. */ -#define HAVE_MBRTOWC 1 - -/* Define to 1 if you have the `memalign' function. */ -/* #undef HAVE_MEMALIGN */ - -/* Define to 1 if you have the `memmem' function. */ -/* #undef HAVE_MEMMEM */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mmap' function. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MNTENT_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* We have AF_NETLINK sockets */ -/* #undef HAVE_NETLINK */ - -/* Define to 1 if you have the `newlocale' function. */ -/* #undef HAVE_NEWLOCALE */ - -/* open option O_DIRECTORY */ -/* #undef HAVE_OPEN_O_DIRECTORY */ - -/* Define to 1 if you have the `pipe2' function. */ -/* #undef HAVE_PIPE2 */ - -/* Define to 1 if you have the `poll' function. */ -/* #undef HAVE_POLL */ - -/* Define to 1 if you have the `posix_memalign' function. */ -/* #undef HAVE_POSIX_MEMALIGN */ - -/* Define to 1 if you have the `prlimit' function. */ -/* #undef HAVE_PRLIMIT */ - -/* Have function pthread_attr_setstacksize */ -/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ - -/* Have function pthread_cond_timedwait_relative_np */ -/* #undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP */ - -/* Have function pthread_condattr_setclock */ -/* #undef HAVE_PTHREAD_CONDATTR_SETCLOCK */ - -/* Have function pthread_setname_np without TID as argument */ -/* #undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID */ - -/* Have function pthread_setname_np with TID as argument */ -/* #undef HAVE_PTHREAD_SETNAME_NP_WITH_TID */ - -/* Define to 1 if the system has the type `ptrdiff_t'. */ -#define HAVE_PTRDIFF_T 1 - -/* Define to 1 if you have the `readlink' function. */ -/* #undef HAVE_READLINK */ - -/* Define to 1 if you have the `recvmmsg' function. */ -/* #undef HAVE_RECVMMSG */ - -/* Define to 1 if you have the 'res_init' function. */ -/* #undef HAVE_RES_INIT */ - -/* Define to 1 if you have the 'res_nclose' function. */ -/* #undef HAVE_RES_NCLOSE */ - -/* Define to 1 if you have the 'res_ndestroy' function. */ -/* #undef HAVE_RES_NDESTROY */ - -/* Define to 1 if you have the 'res_ninit' function. */ -/* #undef HAVE_RES_NINIT */ - -/* Define to 1 if you have the 'res_nquery' function. */ -/* #undef HAVE_RES_NQUERY */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Define to 1 if libselinux is available */ -/* #undef HAVE_SELINUX */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SELINUX_SELINUX_H */ - -/* Define to 1 if you have the `sendmmsg' function. */ -/* #undef HAVE_SENDMMSG */ - -/* Define to 1 if you have the `setenv' function. */ -/* #undef HAVE_SETENV */ - -/* Define to 1 if you have the `setmntent' function. */ -/* #undef HAVE_SETMNTENT */ - -/* Define if you have the 'sig_atomic_t' type. */ -#define HAVE_SIG_ATOMIC_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 -#if defined (_MSC_VER) && (_MSC_VER < 1900) -# define snprintf _snprintf -#endif - -/* Define to 1 if you have the `splice' function. */ -/* #undef HAVE_SPLICE */ - -/* Define to 1 if you have the `statfs' function. */ -/* #undef HAVE_STATFS */ - -/* Define to 1 if you have the `statvfs' function. */ -/* #undef HAVE_STATVFS */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1600) -# define HAVE_STDINT_H 1 -#endif - -/* Define if exists, doesn't clash with , and declares - uintmax_t. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1600) -# define HAVE_STDINT_H_WITH_UINTMAX 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `stpcpy' function. */ -/* #undef HAVE_STPCPY */ - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 -#ifdef _MSC_VER -# define strcasecmp _stricmp -#endif - -/* Define to 1 if you have the `strerror_r' function. */ -/* #undef HAVE_STRERROR_R */ - -/* Define if strerror_r returns char * */ -/* #undef STRERROR_R_CHAR_P */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -# define HAVE_STRINGS_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Have functions strlcpy and strlcat */ -/* #undef HAVE_STRLCPY */ - -/* Define to 1 if you have the `strncasecmp' function. */ -#define HAVE_STRNCASECMP 1 -#ifdef _MSC_VER -# define strncasecmp _strnicmp -#endif - -/* Define to 1 if you have the `strnlen' function. */ -#define HAVE_STRNLEN 1 - -/* Define to 1 if you have the `strsignal' function. */ -/* #undef HAVE_STRSIGNAL */ - -/* Define to 1 if you have the `strtod_l' function. */ -/* #undef HAVE_STRTOD_L */ - -/* Define to 1 if you have the `strtoll_l' function. */ -/* #undef HAVE_STRTOLL_L */ - -/* Define to 1 if you have the `strtoull_l' function. */ -/* #undef HAVE_STRTOULL_L */ - -/* Define to 1 if `d_type' is a member of `struct dirent'. */ -/* #undef HAVE_STRUCT_DIRENT_D_TYPE */ - -/* Define to 1 if `f_bavail' is a member of `struct statfs'. */ -/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */ - -/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */ -/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ - -/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */ -/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ - -/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */ -/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */ - -/* Define to 1 if `st_atimensec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */ - -/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */ - -/* Define to 1 if `st_birthtim' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIM */ - -/* Define to 1 if `st_birthtime' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIME */ - -/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC */ - -/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC */ - -/* Define to 1 if `st_blksize' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ - -/* Define to 1 if `st_blocks' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */ - -/* Define to 1 if `st_ctimensec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */ - -/* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */ - -/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */ - -/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */ - -/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */ -/* #undef HAVE_STRUCT_TM_TM_GMTOFF */ - -/* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */ -/* #undef HAVE_STRUCT_TM___TM_GMTOFF */ - -/* Define to 1 if you have the `symlink' function. */ -/* #undef HAVE_SYMLINK */ - -/* Define to 1 if you have the `sysctlbyname' function. */ -/* #undef HAVE_SYSCTLBYNAME */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_EVENT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_FILIO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_INOTIFY_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MKDEV_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MNTCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MNTTAB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MOUNT_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -# define HAVE_SYS_PARAM_H 1 -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_POLL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_RESOURCE_H */ - -/* found fd_set in sys/select.h */ -/* #undef HAVE_SYS_SELECT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STATFS_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STATVFS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SYSCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIMES_H */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -# define HAVE_SYS_TIME_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_UIO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_VFSTAB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_VFS_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_VMOUNT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_WAIT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_XATTR_H */ - -/* Define to 1 if you have the `timegm' function. */ -/* #undef HAVE_TIMEGM */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -# define HAVE_UNISTD_H 1 -#endif - -/* Define if your printf function family supports positional parameters as - specified by Unix98. */ -/* #undef HAVE_UNIX98_PRINTF */ - -/* Define to 1 if you have the `unsetenv' function. */ -/* #undef HAVE_UNSETENV */ - -/* Define to 1 if you have the `uselocale' function. */ -/* #undef HAVE_USELOCALE */ - -/* Define to 1 if you have the `utimes' function. */ -/* #undef HAVE_UTIMES */ - -/* Define to 1 if you have the `valloc' function. */ -/* #undef HAVE_VALLOC */ - -/* Define to 1 if you have the header file. */ -#ifdef _MSC_VER -# define HAVE_VALUES_H 1 -#endif - -/* Define to 1 if you have the `vasprintf' function. */ -#define HAVE_VASPRINTF 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define if you have the 'wchar_t' type. */ -#define HAVE_WCHAR_T 1 - -/* Define to 1 if you have the `wcslen' function. */ -#define HAVE_WCSLEN 1 - -/* Define if you have the 'wint_t' type. */ -#define HAVE_WINT_T 1 - -/* Have a working bcopy */ -/* #undef HAVE_WORKING_BCOPY */ - -/* Define to 1 if xattr is available */ -/* #undef HAVE_XATTR */ - -/* Define to 1 if xattr API uses XATTR_NOFOLLOW */ -/* #undef HAVE_XATTR_NOFOLLOW */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_XLOCALE_H */ - -/* Define to 1 if you have the `_NSGetEnviron' function. */ -/* #undef HAVE__NSGETENVIRON */ - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR "" - -/* Do we cache iconv descriptors */ -/* #undef NEED_ICONV_CACHE */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "glib" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "glib @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "glib" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@" - -/* The size of `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 - -/* The size of `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 - -/* The size of `size_t', as computed by sizeof. */ -#ifdef _WIN64 -# define SIZEOF_SIZE_T 8 -#else -# define SIZEOF_SIZE_T 4 -#endif - -/* The size of `ssize_t', as computed by sizeof. */ -#ifdef _WIN64 -# define SIZEOF_SSIZE_T 8 -#else -# define SIZEOF_SSIZE_T 4 -#endif - -/* The size of `void *', as computed by sizeof. */ -#ifdef _WIN64 -# define SIZEOF_VOID_P 8 -#else -# define SIZEOF_VOID_P 4 -#endif - -/* The size of `__int64', as computed by sizeof. */ -#define SIZEOF___INT64 8 - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Number of arguments to statfs() */ -/* #undef STATFS_ARGS */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Use no threads */ -/* #undef THREADS_NONE */ - -/* Use pthreads */ -/* #undef THREADS_POSIX */ - -/* Use w32 threads */ -#define THREADS_WIN32 1 - -/* Using GNU libiconv */ -/* #undef USE_LIBICONV_GNU */ - -/* Using a native implementation of iconv in a separate library */ -#define USE_LIBICONV_NATIVE 1 - -/* Define to use statfs() */ -/* #undef USE_STATFS */ - -/* Define to use statvfs() */ -/* #undef USE_STATVFS */ - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -/* #undef _POSIX_PTHREAD_SEMANTICS */ -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -/* #undef _TANDEM_SOURCE */ -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -#define __EXTENSIONS__ 1 -#endif - -/* using the system-supplied PCRE library */ -/* This is determined in the MSVC projects */ -/* #undef USE_SYSTEM_PCRE */ - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* defines how to decorate public symbols while building */ -#ifdef _MSC_VER -# define _GLIB_EXTERN __declspec (dllexport) extern -#else -# define _GLIB_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern -#endif - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Target the Windows 7 API */ -#define _WIN32_WINNT 0x0601 - -/* Needed to get declarations for msg_control and msg_controllen on Solaris */ -/* #undef _XOPEN_SOURCE */ - -/* Needed to get declarations for msg_control and msg_controllen on Solaris */ -/* #undef _XOPEN_SOURCE_EXTENDED */ - -/* Needed to get declarations for msg_control and msg_controllen on Solaris */ -#define __EXTENSIONS__ 1 - -/* compiler supports atomic operations */ -/* #undef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to long or long long if and don't define. */ -/* #undef intmax_t */ - -/* Define to empty if the C compiler doesn't support this keyword. */ -/* #undef signed */ - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -#define EXEEXT ".exe" - -/* #undef MAJOR_IN_MKDEV */ -/* #undef MAJOR_IN_SYSMACROS */ -/* #undef HAVE_RTLD_LAZY */ -/* #undef HAVE_RTLD_NOW */ -/* #undef HAVE_RTLD_GLOBAL */ diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in deleted file mode 100644 index b8214c009..000000000 --- a/glib/glibconfig.h.win32.in +++ /dev/null @@ -1,262 +0,0 @@ -/* glibconfig.h.win32.in. Originally merged from two versions of - * glibconfig.h, generated by the GLib configure script, for gcc and - * MSVC. - */ - -/* glibconfig.h - * - * This is a generated file. Please modify 'glibconfig.h.win32.in' - */ - -#ifndef __G_LIBCONFIG_H__ -#define __G_LIBCONFIG_H__ - -#include - -#include -#include -/* #undef GLIB_HAVE_ALLOCA_H */ - -/* Specifies that GLib's g_print*() functions wrap the - * system printf functions. This is useful to know, for example, - * when using glibc's register_printf_function(). - */ -#define GLIB_USING_SYSTEM_PRINTF - -G_BEGIN_DECLS - -#define G_MINFLOAT FLT_MIN -#define G_MAXFLOAT FLT_MAX -#define G_MINDOUBLE DBL_MIN -#define G_MAXDOUBLE DBL_MAX -#define G_MINSHORT SHRT_MIN -#define G_MAXSHORT SHRT_MAX -#define G_MAXUSHORT USHRT_MAX -#define G_MININT INT_MIN -#define G_MAXINT INT_MAX -#define G_MAXUINT UINT_MAX -#define G_MINLONG LONG_MIN -#define G_MAXLONG LONG_MAX -#define G_MAXULONG ULONG_MAX - -typedef signed char gint8; -typedef unsigned char guint8; -typedef signed short gint16; -typedef unsigned short guint16; -#define G_GINT16_MODIFIER "h" -#define G_GINT16_FORMAT "hi" -#define G_GUINT16_FORMAT "hu" -typedef signed int gint32; -typedef unsigned int guint32; -#define G_GINT32_MODIFIER "" -#define G_GINT32_FORMAT "i" -#define G_GUINT32_FORMAT "u" -#define G_HAVE_GINT64 1 /* deprecated, always true */ - -G_GNUC_EXTENSION typedef signed long long gint64; -G_GNUC_EXTENSION typedef unsigned long long guint64; - -#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL)) -#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL)) -#define G_GINT64_MODIFIER "I64" -#define G_GINT64_FORMAT "I64i" -#define G_GUINT64_FORMAT "I64u" - -#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) - -#define GLIB_SIZEOF_VOID_P 8 -#define GLIB_SIZEOF_LONG 4 -#define GLIB_SIZEOF_SIZE_T 8 - -typedef signed long long gssize; -typedef unsigned long long gsize; -#define G_GSIZE_MODIFIER "I64" -#define G_GSSIZE_MODIFIER "I64" -#define G_GSIZE_FORMAT "I64u" -#define G_GSSIZE_FORMAT "I64i" - -#define G_MAXSIZE G_MAXUINT64 -#define G_MINSSIZE G_MININT64 -#define G_MAXSSIZE G_MAXINT64 - -#else - -#define GLIB_SIZEOF_VOID_P 4 -#define GLIB_SIZEOF_LONG 4 -#define GLIB_SIZEOF_SIZE_T 4 - -typedef signed int gssize; -typedef unsigned int gsize; -#define G_GSIZE_MODIFIER "" -#define G_GSSIZE_MODIFIER "" -#define G_GSIZE_FORMAT "u" -#define G_GSSIZE_FORMAT "i" - -#define G_MAXSIZE G_MAXUINT -#define G_MINSSIZE G_MININT -#define G_MAXSSIZE G_MAXINT - -#endif - -typedef gint64 goffset; -#define G_MINOFFSET G_MININT64 -#define G_MAXOFFSET G_MAXINT64 - -#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER -#define G_GOFFSET_FORMAT G_GINT64_FORMAT -#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) - - -#ifdef _WIN64 -# define G_POLLFD_FORMAT "%#I64x" -# define GPOINTER_TO_INT(p) ((gint) (gint64) (p)) -# define GPOINTER_TO_UINT(p) ((guint) (guint64) (p)) - -# define GINT_TO_POINTER(i) ((gpointer) (gint64) (i)) -# define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u)) - -typedef signed long long gintptr; -typedef unsigned long long guintptr; - -# define G_GINTPTR_MODIFIER "I64" -# define G_GINTPTR_FORMAT "I64i" -# define G_GUINTPTR_FORMAT "I64u" -#else -# define G_POLLFD_FORMAT "%#x" - -# define GPOINTER_TO_INT(p) ((gint) (gint) (p)) -# define GPOINTER_TO_UINT(p) ((guint) (guint) (p)) - -# define GINT_TO_POINTER(i) ((gpointer) (gint) (i)) -# define GUINT_TO_POINTER(u) ((gpointer) (guint) (u)) - -typedef signed int gintptr; -typedef unsigned int guintptr; - -# define G_GINTPTR_MODIFIER "" -# define G_GINTPTR_FORMAT "i" -# define G_GUINTPTR_FORMAT "u" -#endif - -#ifndef G_DISABLE_DEPRECATED -#define g_ATEXIT(proc) (atexit (proc)) - -#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END -#endif - -#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@ -#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ -#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@ - -#define G_OS_WIN32 -#define G_PLATFORM_WIN32 -@GLIB_WIN32_STATIC_COMPILATION_DEFINE@ - -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define G_VA_COPY va_copy -#endif /* not _MSC_VER or 2013 or later */ - -#ifndef _MSC_VER -# define G_HAVE_ISO_VARARGS 1 -# define G_HAVE_GNUC_VARARGS 1 -# define G_HAVE_GNUC_VISIBILITY 1 - -/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi - * is passed ISO vararg support is turned off, and there is no work - * around to turn it on, so we unconditionally turn it off. - */ -#if __GNUC__ == 2 && __GNUC_MINOR__ == 95 -# undef G_HAVE_ISO_VARARGS -#endif - -#define G_HAVE_GROWING_STACK 0 - -#else /* _MSC_VER */ -# define G_HAVE_ISO_VARARGS 1 -#endif /* not _MSC_VER */ - -#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) -# define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) -#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) -# define G_GNUC_INTERNAL __hidden -#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY) -# define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) -#else -# define G_GNUC_INTERNAL -#endif - -#define G_THREADS_ENABLED -#define G_THREADS_IMPL_WIN32 - -#define G_ATOMIC_LOCK_FREE - -#define GINT16_TO_LE(val) ((gint16) (val)) -#define GUINT16_TO_LE(val) ((guint16) (val)) -#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val)) -#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val)) -#define GINT32_TO_LE(val) ((gint32) (val)) -#define GUINT32_TO_LE(val) ((guint32) (val)) -#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val)) -#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val)) -#define GINT64_TO_LE(val) ((gint64) (val)) -#define GUINT64_TO_LE(val) ((guint64) (val)) -#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val)) -#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val)) -#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val)) -#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val)) -#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) -#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) -#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val)) -#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) -#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) -#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) - -#ifdef _WIN64 -# define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val)) -# define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val)) -# define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val)) -# define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val)) -#else -# define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) -# define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) -# define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) -# define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) -#endif - -#define G_BYTE_ORDER G_LITTLE_ENDIAN - -#define GLIB_SYSDEF_POLLIN =768 -#define GLIB_SYSDEF_POLLOUT =16 -#define GLIB_SYSDEF_POLLPRI =1024 -#define GLIB_SYSDEF_POLLHUP =2 -#define GLIB_SYSDEF_POLLERR =1 -#define GLIB_SYSDEF_POLLNVAL =4 - -#define G_MODULE_SUFFIX "dll" - -/* A GPid is an abstraction for a process "handle". It is *not* an - * abstraction for a process identifier in general. GPid is used in - * GLib only for descendant processes spawned with the g_spawn* - * functions. On POSIX there is no "process handle" concept as such, - * but on Windows a GPid is a handle to a process, a kind of pointer, - * not a process identifier. - */ -typedef void * GPid; -#define G_PID_FORMAT "p" - -#define GLIB_SYSDEF_AF_UNIX 1 -#define GLIB_SYSDEF_AF_INET 2 -#define GLIB_SYSDEF_AF_INET6 23 - -#define GLIB_SYSDEF_MSG_OOB 1 -#define GLIB_SYSDEF_MSG_PEEK 2 -#define GLIB_SYSDEF_MSG_DONTROUTE 4 - -#define G_DIR_SEPARATOR '\\' -#define G_DIR_SEPARATOR_S "\\" -#define G_SEARCHPATH_SEPARATOR ';' -#define G_SEARCHPATH_SEPARATOR_S ";" - -G_END_DECLS - -#endif /* GLIBCONFIG_H */ From 4bb173b297c3ef0723b69d690ae6d2ca00bf7fb2 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 6 Jun 2018 18:20:10 +0800 Subject: [PATCH 4/6] build: Remove leftovers of Visual Studio project stuff There are more leftover preconfigured stuff that we ought to remove... --- configure.ac | 2 - gio/Makefile.am | 1 - gio/gnetworking.h.win32 | 81 ------------------------------------- glib/.gitignore | 1 - gmodule/Makefile.am | 1 - gmodule/gmoduleconf.h.win32 | 39 ------------------ 6 files changed, 125 deletions(-) delete mode 100644 gio/gnetworking.h.win32 delete mode 100644 gmodule/gmoduleconf.h.win32 diff --git a/configure.ac b/configure.ac index d2f4067e6..2ab633648 100644 --- a/configure.ac +++ b/configure.ac @@ -3524,8 +3524,6 @@ if false; then AC_CONFIG_FILES([ INSTALL README - config.h.win32 - glib/glibconfig.h.win32 glib/glib.rc gmodule/gmodule.rc gobject/gobject.rc diff --git a/gio/Makefile.am b/gio/Makefile.am index b9ea1a2b9..7c7f247c0 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -787,7 +787,6 @@ EXTRA_DIST += \ gio.rc.in \ gschema.dtd \ gconstructor_as_data.h \ - gnetworking.h.win32 \ $(NULL) BUILT_EXTRA_DIST += \ diff --git a/gio/gnetworking.h.win32 b/gio/gnetworking.h.win32 deleted file mode 100644 index 1f45dba32..000000000 --- a/gio/gnetworking.h.win32 +++ /dev/null @@ -1,81 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2008-2011 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#ifndef __G_NETWORKING_H__ -#define __G_NETWORKING_H__ - -#include - -#ifdef G_OS_WIN32 - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#endif -#include -#include -#include -#include -#include -#include -#undef interface - -#else /* !G_OS_WIN32 */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifndef T_SRV -#define T_SRV 33 -#endif - -#ifndef _PATH_RESCONF -#define _PATH_RESCONF "/etc/resolv.conf" -#endif - -#ifndef CMSG_LEN -/* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on - * some older platforms. - */ -#define CMSG_LEN(len) ((size_t)CMSG_DATA((struct cmsghdr *)NULL) + (len)) - -/* CMSG_SPACE must add at least as much padding as CMSG_NXTHDR() - * adds. We overestimate here. - */ -#define GLIB_ALIGN_TO_SIZEOF(len, obj) (((len) + sizeof (obj) - 1) & ~(sizeof (obj) - 1)) -#define CMSG_SPACE(len) GLIB_ALIGN_TO_SIZEOF (CMSG_LEN (len), struct cmsghdr) -#endif -#endif - -G_BEGIN_DECLS - -GLIB_AVAILABLE_IN_2_36 -void g_networking_init (void); - -G_END_DECLS - -#endif /* __G_NETWORKING_H__ */ diff --git a/glib/.gitignore b/glib/.gitignore index 17142a60c..f79e130df 100644 --- a/glib/.gitignore +++ b/glib/.gitignore @@ -1,5 +1,4 @@ glibconfig.h -glibconfig.h.win32 glibconfig-stamp gtester diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 00e0e68d4..26578dd0c 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -15,7 +15,6 @@ EXTRA_DIST += \ gmodule-dyld.c \ gmodule-win32.c \ gmodule-ar.c \ - gmoduleconf.h.win32 \ gmodule.rc.in BUILT_EXTRA_DIST += \ diff --git a/gmodule/gmoduleconf.h.win32 b/gmodule/gmoduleconf.h.win32 deleted file mode 100644 index 478365382..000000000 --- a/gmodule/gmoduleconf.h.win32 +++ /dev/null @@ -1,39 +0,0 @@ -/* GMODULE - GLIB wrapper code for dynamic module loading - * Copyright (C) 1998 Tim Janik - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ -#ifndef __G_MODULE_CONF_H__ -#define __G_MODULE_CONF_H__ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define G_MODULE_IMPL_NONE 0 -#define G_MODULE_IMPL_DL 1 -#define G_MODULE_IMPL_WIN32 3 -#define G_MODULE_IMPL_DYLD 6 - -#define G_MODULE_IMPL G_MODULE_IMPL_WIN32 -#undef G_MODULE_HAVE_DLERROR - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __G_MODULE_CONF_H__ */ From b806ab8906aefbf2ddf91fdb94e5552695d3d7ee Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 6 Jun 2018 23:10:59 +0800 Subject: [PATCH 5/6] build: Remove build/win32/vs8 The Visual Studio 2005 projects have not been updated nor dist'ed in a while, plus we are directing people using Visual Studio to build using Meson, so it's time to remove them from the source tree. --- build/win32/vs8/Makefile.am | 11 - build/win32/vs8/README | 4 - build/win32/vs8/gio.vcproj | 486 -------------- build/win32/vs8/glib-genmarshal.vcproj | 199 ------ build/win32/vs8/glib.sln | 84 --- build/win32/vs8/glib.vcproj | 605 ------------------ build/win32/vs8/gmodule.vcproj | 217 ------- build/win32/vs8/gobject.vcproj | 295 --------- .../vs8/gspawn-win32-helper-console.vcproj | 201 ------ build/win32/vs8/gspawn-win32-helper.vcproj | 201 ------ build/win32/vs8/gthread.vcproj | 215 ------- 11 files changed, 2518 deletions(-) delete mode 100644 build/win32/vs8/Makefile.am delete mode 100644 build/win32/vs8/README delete mode 100644 build/win32/vs8/gio.vcproj delete mode 100644 build/win32/vs8/glib-genmarshal.vcproj delete mode 100644 build/win32/vs8/glib.sln delete mode 100644 build/win32/vs8/glib.vcproj delete mode 100644 build/win32/vs8/gmodule.vcproj delete mode 100644 build/win32/vs8/gobject.vcproj delete mode 100644 build/win32/vs8/gspawn-win32-helper-console.vcproj delete mode 100644 build/win32/vs8/gspawn-win32-helper.vcproj delete mode 100644 build/win32/vs8/gthread.vcproj diff --git a/build/win32/vs8/Makefile.am b/build/win32/vs8/Makefile.am deleted file mode 100644 index 69cd83f42..000000000 --- a/build/win32/vs8/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = \ - README \ - gio.vcproj \ - glib-genmarshal.vcproj \ - glib.sln \ - glib.vcproj \ - gmodule.vcproj \ - gobject.vcproj \ - gspawn-win32-helper-console.vcproj \ - gspawn-win32-helper.vcproj \ - gthread.vcproj diff --git a/build/win32/vs8/README b/build/win32/vs8/README deleted file mode 100644 index 4576aaeb6..000000000 --- a/build/win32/vs8/README +++ /dev/null @@ -1,4 +0,0 @@ -Note that this is mostly experimental and not really maintained. It -seems that the OAH project at https://code.launchpad.net/oah might be -a better choice if you want to start building GLib (and more of the -GTK+ stack) with Visual Studio. diff --git a/build/win32/vs8/gio.vcproj b/build/win32/vs8/gio.vcproj deleted file mode 100644 index 13902acc4..000000000 --- a/build/win32/vs8/gio.vcproj +++ /dev/null @@ -1,486 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs8/glib-genmarshal.vcproj b/build/win32/vs8/glib-genmarshal.vcproj deleted file mode 100644 index 06cb39866..000000000 --- a/build/win32/vs8/glib-genmarshal.vcproj +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs8/glib.sln b/build/win32/vs8/glib.sln deleted file mode 100644 index 544560e10..000000000 --- a/build/win32/vs8/glib.sln +++ /dev/null @@ -1,84 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmodule", "gmodule.vcproj", "{4214047C-F5C1-40B3-8369-5DCED8C32770}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcproj", "{F172EFFC-E30F-4593-809E-DB2024B1E753}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-genmarshal", "glib-genmarshal.vcproj", "{BD12E835-5C52-4E5D-8234-1C579F33E27A}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio", "gio.vcproj", "{F3D1583C-5613-4809-BD98-7CC1C1276F92}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} - {4214047C-F5C1-40B3-8369-5DCED8C32770} = {4214047C-F5C1-40B3-8369-5DCED8C32770} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspawn-win32-helper.vcproj", "{289240E7-E167-47CE-A20C-58D852E520BA}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console", "gspawn-win32-helper-console.vcproj", "{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.ActiveCfg = Debug|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Debug|Win32.Build.0 = Debug|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.ActiveCfg = Release|Win32 - {12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.ActiveCfg = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Debug|Win32.Build.0 = Debug|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.ActiveCfg = Release|Win32 - {4214047C-F5C1-40B3-8369-5DCED8C32770}.Release|Win32.Build.0 = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.ActiveCfg = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Debug|Win32.Build.0 = Debug|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.ActiveCfg = Release|Win32 - {F172EFFC-E30F-4593-809E-DB2024B1E753}.Release|Win32.Build.0 = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Debug|Win32.Build.0 = Debug|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.ActiveCfg = Release|Win32 - {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release|Win32.Build.0 = Release|Win32 - {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.ActiveCfg = Debug|Win32 - {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.Build.0 = Debug|Win32 - {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.ActiveCfg = Release|Win32 - {BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.Build.0 = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.ActiveCfg = Release|Win32 - {F3D1583C-5613-4809-BD98-7CC1C1276F92}.Release|Win32.Build.0 = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Debug|Win32.Build.0 = Debug|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.ActiveCfg = Release|Win32 - {289240E7-E167-47CE-A20C-58D852E520BA}.Release|Win32.Build.0 = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.ActiveCfg = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Debug|Win32.Build.0 = Debug|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.ActiveCfg = Release|Win32 - {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/win32/vs8/glib.vcproj b/build/win32/vs8/glib.vcproj deleted file mode 100644 index de358764f..000000000 --- a/build/win32/vs8/glib.vcproj +++ /dev/null @@ -1,605 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs8/gmodule.vcproj b/build/win32/vs8/gmodule.vcproj deleted file mode 100644 index bf519f70b..000000000 --- a/build/win32/vs8/gmodule.vcproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs8/gobject.vcproj b/build/win32/vs8/gobject.vcproj deleted file mode 100644 index dc1d542da..000000000 --- a/build/win32/vs8/gobject.vcproj +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs8/gspawn-win32-helper-console.vcproj b/build/win32/vs8/gspawn-win32-helper-console.vcproj deleted file mode 100644 index 5bf95af71..000000000 --- a/build/win32/vs8/gspawn-win32-helper-console.vcproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs8/gspawn-win32-helper.vcproj b/build/win32/vs8/gspawn-win32-helper.vcproj deleted file mode 100644 index 6e34dbcd7..000000000 --- a/build/win32/vs8/gspawn-win32-helper.vcproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs8/gthread.vcproj b/build/win32/vs8/gthread.vcproj deleted file mode 100644 index 386838dbb..000000000 --- a/build/win32/vs8/gthread.vcproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From cd2081d6a8e0add423da4dc957deb56e85dfb914 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 6 Jun 2018 23:15:27 +0800 Subject: [PATCH 6/6] README.win32: More updates on GLib usage Remove mentions of the pre-configured glibconfig.h.win32, as it does not exist anymore. Also make the 2008/x64 build workarounds clearer. --- README.win32 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/README.win32 b/README.win32 index 809cdfa33..cd755e091 100644 --- a/README.win32 +++ b/README.win32 @@ -150,14 +150,11 @@ library. The DLL generated by either compiler is binary compatible with the other one. Thus one either has to manually edit glibconfig.h -afterwards, or use the supplied glibconfig.h.win32 which has been -produced by running configure twice, once using gcc and once using -MSVC, and merging the resulting files with diff -D. +afterwards. For MSVC7 and later (Visual C++ .NET 2003, Visual C++ 2005, Visual C++ 2008 etc) it is preferred to use specific builds of GLib DLLs that use -the same C runtime as the code that uses GLib. Such DLLs should be -named differently than the ones that use msvcrt.dll. +the same C runtime as the code that uses GLib. For GLib, the DLL that uses msvcrt.dll is called libglib-2.0-0.dll, and the import libraries libglib-2.0.dll.a and glib-2.0.lib. Note that @@ -201,5 +198,5 @@ for /r %f in (*.exe.manifest) do if exist $(PREFIX)\bin\%~nf mt /manifest %f $(P is caused by an optimization issue in the 2008 x64 compiler. You need to use Task Manager to remove all running instances of cl.exe, which will cause the build process to terminate. Update the build flags of the sources that hang on compilation by changing its "/O2" flag to "/O1", and - things should continue to build normally. At the time of writing, this is needed for compiling - glib/gtestutils.c, gio/gsettings.c and gio/gsettingsschema.c + retry the build, where things should continue to build normally. At the time of writing, this + is needed for compiling glib/gtestutils.c, gio/gsettings.c and gio/gsettingsschema.c