[glib][glibmm] Fix for non-windows. For glibmm, use CMake replacement buildsystem.

12 files changed, 412 insertions, 5068 deletions

diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 25218a7f8..3743b0a34 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.0)
 project(glib C)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_STANDARD 11)
+
 set(GLIB_DLL_SUFFIX 2)
 set(GLIB_LIB_SUFFIX 2.0)
 
@@ -9,7 +12,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
 endif()
 
 if(BUILD_SHARED_LIBS)
-    set(GLIB_EXPORT_MACRO DLL_EXPORT)
+    add_definitions(-DDLL_EXPORT)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -23,27 +26,70 @@ find_path(PCRE_INCLUDE_DIR pcre.h)
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
     set(PCRE_SUFFIX d)
 endif()
-find_library(PCRE_LIBRARY pcre${PCRE_SUFFIX})
-# libiconv
-find_path(ICONV_INCLUDE_DIR iconv.h)
-find_library(ICONV_LIBRARY NAMES iconv libiconv)
+find_library(PCRE_LIBRARY NAMES pcre${PCRE_SUFFIX} pcre)
 # libiconv
-find_library(CHARSET_LIBRARY NAMES charset libcharset)
+find_package(unofficial-iconv REQUIRED)
 # libffi
 find_path(FFI_INCLUDE_DIR ffi.h)
 find_library(FFI_LIBRARY NAMES ffi libffi)
-# libintl(gettext)
-find_path(LIBINTL_INCLUDE_DIR libintl.h)
-find_library(LIBINTL_LIBRARY NAMES intl libintl)
+get_filename_component(LIB_DIR "${FFI_LIBRARY}" DIRECTORY)
+if(APPLE)
+    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+    find_library(FOUNDATION_LIBRARY Foundation)
+    find_library(CORESERVICES_LIBRARY CoreServices)
+    link_libraries(${CORESERVICES_LIBRARY} ${COREFOUNDATION_LIBRARY} ${FOUNDATION_LIBRARY})
+endif()
+
+if(WIN32 OR APPLE)
+    # libintl(gettext)
+    find_path(LIBINTL_INCLUDE_DIR libintl.h)
+    find_library(LIBINTL_LIBRARY NAMES intl libintl)
+else()
+    set(LIBINTL_INCLUDE_DIR)
+    set(LIBINTL_LIBRARY)
+endif()
+
+if(WIN32)
+    set(LIBRESOLV_LIBRARY)
+else()
+    find_library(LIBRESOLV_LIBRARY NAMES resolv libresolv)
+endif()
 
 #prepare config files
-configure_file(config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY)
-configure_file(glib/glibconfig.h.win32 ${CMAKE_SOURCE_DIR}/glib/glibconfig.h COPYONLY)
-configure_file(gmodule/gmoduleconf.h.win32 ${CMAKE_SOURCE_DIR}/gmodule/gmoduleconf.h COPYONLY)
-configure_file(gio/gnetworking.h.win32 ${CMAKE_SOURCE_DIR}/gio/gnetworking.h COPYONLY)
-add_definitions(-DHAVE_CONFIG_H)
+if(WIN32)
+    configure_file(config.h.win32 ${CMAKE_BINARY_DIR}/config/config.h COPYONLY)
+    configure_file(glib/glibconfig.h.win32 ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h COPYONLY)
+    configure_file(gmodule/gmoduleconf.h.win32 ${CMAKE_BINARY_DIR}/config/gmodule/gmoduleconf.h COPYONLY)
+    configure_file(gio/gnetworking.h.win32 ${CMAKE_BINARY_DIR}/config/gio/gnetworking.h COPYONLY)
+    add_definitions(-DHAVE_CONFIG_H)
+else()
+    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/config)
+    set(ENV{LIBFFI_LIBS} "${FFI_LIBRARY}")
+    set(ENV{PCRE_LIBS} "${PCRE_LIBRARY}")
+    set(ENV{LIBFFI_CFLAGS} "-I${FFI_INCLUDE_DIR}")
+    set(ENV{PCRE_CFLAGS} "-I${PCRE_INCLUDE_DIR}")
+    set(ENV{MSGFMT} "/bin/echo")
+    set(ENV{GMSGFMT} "/bin/echo")
+    if(NOT EXISTS "${CMAKE_BINARY_DIR}/config/config.h")
+        execute_process(
+            COMMAND "${CMAKE_SOURCE_DIR}/configure"
+                --disable-libelf
+                --disable-libmount
+                "CPPFLAGS=-I${PCRE_INCLUDE_DIR}"
+                "CFLAGS=-I${PCRE_INCLUDE_DIR}"
+                "LDFLAGS=-L${LIB_DIR}"
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/config
+            RESULT_VARIABLE res
+        )
+        if(NOT res EQUAL 0)
+            message(FATAL_ERROR "Configure failed.")
+        endif()
+    endif()
+    add_definitions("-DGIO_MODULE_DIR=\"gio/modules\"")
+endif()
 
-include_directories(. ./glib)
+include_directories(${CMAKE_BINARY_DIR}/config ${CMAKE_BINARY_DIR}/config/glib ${CMAKE_BINARY_DIR}/config/gio ${CMAKE_BINARY_DIR}/config/gmodule)
+include_directories(. glib)
 
 # This macro purposely doesn't find nodes with sources that have additional properties set
 # Most of such files in glib are PCRE sources which we don't use anyway
@@ -64,60 +110,155 @@ endmacro()
 # main module
 extract_vcproj_sources(win32/vs14/glib.vcxproj GLIB_SOURCES)
 list(APPEND GLIB_SOURCES glib/libcharset/localcharset.c) # modified internal version with prefixed symbols
+if(NOT WIN32)
+    list(FILTER GLIB_SOURCES EXCLUDE REGEX "win32.c\$|win32-helper.c\$")
+    list(APPEND GLIB_SOURCES "glib/gthread-posix.c" "glib/giounix.c" "glib/gspawn.c" "glib/glib-unix.c")
+endif()
 add_library(glib ${GLIB_SOURCES})
-target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE ${GLIB_EXPORT_MACRO} GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR)
-target_link_libraries(glib ws2_32 winmm ${PCRE_LIBRARY} ${ICONV_LIBRARY} ${CHARSET_LIBRARY} ${LIBINTL_LIBRARY})
+target_compile_definitions(glib PRIVATE GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR="")
+target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} unofficial::iconv::libiconv unofficial::iconv::libcharset ${LIBINTL_LIBRARY})
+if(WIN32)
+    target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE)
+    target_link_libraries(glib PRIVATE ws2_32 winmm)
+else()
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    find_package(Threads REQUIRED)
+    target_link_libraries(glib PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
+endif()
 target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR} ${ICONV_INCLUDE_DIR})
-target_include_directories(glib PUBLIC  ${LIBINTL_INCLUDE_DIR})
+target_include_directories(glib PUBLIC ${LIBINTL_INCLUDE_DIR})
 list(APPEND GLIB_TARGETS glib)
+if(NOT GLIB_SKIP_HEADERS)
+    install(FILES glib/glib.h glib/glib-object.h ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h DESTINATION include)
+
+    file(GLOB GLIB_HEADERS glib/*.h)
+    list(FILTER GLIB_HEADERS EXCLUDE REGEX "/glib.h\$|/glib-object.h\$|private.h\$")
+    install(FILES ${GLIB_HEADERS} DESTINATION include/glib)
+
+    file(GLOB GLIB_DEP_HEADERS glib/deprecated/*.h)
+    install(FILES ${GLIB_DEP_HEADERS} DESTINATION include/glib/deprecated)
+endif()
 
 # gthread
 add_library(gthread gthread/gthread-impl.c)
 target_compile_definitions(gthread PRIVATE G_LOG_DOMAIN="GThread")
-target_link_libraries(gthread glib ${LIBINTL_LIBRARY})
+target_link_libraries(gthread PRIVATE glib ${LIBINTL_LIBRARY})
 target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR})
 list(APPEND GLIB_TARGETS gthread)
 
 # gobject
 extract_vcproj_sources(win32/vs14/gobject.vcxproj GOBJECT_SOURCES)
 add_library(gobject ${GOBJECT_SOURCES})
-target_compile_definitions(gobject PRIVATE GOBJECT_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GObject")
-target_link_libraries(gobject gthread glib ${FFI_LIBRARY})
+target_compile_definitions(gobject PRIVATE GOBJECT_COMPILATION G_LOG_DOMAIN="GLib-GObject")
+target_link_libraries(gobject PRIVATE gthread glib ${FFI_LIBRARY})
 target_include_directories(gobject PRIVATE ${FFI_INCLUDE_DIR})
 list(APPEND GLIB_TARGETS gobject)
+if(NOT GLIB_SKIP_HEADERS)
+    file(GLOB GOBJECT_HEADERS gobject/*.h gobject/gobjectnotifyqueue.c)
+    list(FILTER GOBJECT_HEADERS EXCLUDE REGEX "private.h\$")
+    install(FILES ${GOBJECT_HEADERS} DESTINATION include/gobject)
+endif()
 
 # gmodule
 add_library(gmodule gmodule/gmodule.c)
 target_compile_definitions(gmodule PRIVATE G_LOG_DOMAIN="GModule")
-target_link_libraries(gmodule glib ${LIBINTL_LIBRARY})
+target_link_libraries(gmodule PRIVATE glib ${LIBINTL_LIBRARY})
+target_include_directories(gmodule PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gmodule>)
 target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR})
 list(APPEND GLIB_TARGETS gmodule)
+if(NOT GLIB_SKIP_HEADERS)
+    install(FILES gmodule/gmodule.h DESTINATION include)
+endif()
+
+# gio subdirs
+if(NOT WIN32)
+    file(GLOB XDGMIME_SOURCES gio/xdgmime/*.c)
+    add_library(xdgmime ${XDGMIME_SOURCES})
+    target_compile_definitions(xdgmime PRIVATE -DXDG_PREFIX=_gio_xdg)
+    list(APPEND GLIB_TARGETS xdgmime)
+endif()
+
+if(NOT WIN32 AND NOT APPLE)
+    file(GLOB INOTIFY_SOURCES gio/inotify/*.c)
+    add_library(inotify ${INOTIFY_SOURCES})
+    target_link_libraries(inotify PRIVATE gmodule)
+    target_compile_definitions(inotify PRIVATE -DG_LOG_DOMAIN=\"GLib-GIO\" -DGIO_COMPILATION -DG_DISABLE_DEPRECATED)
+    list(APPEND GLIB_TARGETS inotify)
+endif()
+
+if(APPLE)
+    file(GLOB KQUEUE_SOURCES gio/kqueue/*.c)
+    add_library(kqueue ${KQUEUE_SOURCES})
+    target_link_libraries(kqueue PRIVATE gmodule)
+    target_compile_definitions(kqueue PRIVATE -DG_LOG_DOMAIN=\"GLib-GIO\" -DGIO_COMPILATION -DG_DISABLE_DEPRECATED)
+    list(APPEND GLIB_TARGETS kqueue)
+endif()
 
 # gio
 extract_vcproj_sources(win32/vs14/gio.vcxproj GIO_SOURCES)
+if(NOT WIN32)
+    file(GLOB GIO_UNIX_SOURCES "gio/gunix*.c" "gio/g*notificationbackend.c" "gio/g*portal*.c")
+    list(APPEND GIO_SOURCES ${GIO_UNIX_SOURCES})
+    list(APPEND GIO_SOURCES
+        "gio/gcontenttype.c"
+        "gio/gfiledescriptorbased.c"
+        "gio/gnetworkmonitornm.c"
+        "gio/xdp-dbus.c"
+    )
+    list(FILTER GIO_SOURCES EXCLUDE REGEX "/gwin32[^/]+\$|win32/[^/]+\$|win32.c\$|gregistrysettingsbackend.c\$")
+    if(APPLE)
+        set_property(SOURCE
+            gio/gcocoanotificationbackend.c
+            gio/gosxappinfo.c
+            gio/gnextstepsettingsbackend.c
+            PROPERTY COMPILE_FLAGS "-x objective-c")
+        list(APPEND GIO_SOURCES
+            "gio/gnextstepsettingsbackend.c"
+            "gio/gosxappinfo.c"
+        )
+    else()
+        list(APPEND GIO_SOURCES
+            "gio/gnetworkmonitornetlink.c"
+            "gio/gdesktopappinfo.c"
+        )
+        list(FILTER GIO_SOURCES EXCLUDE REGEX "gcocoanotificationbackend.c\$")
+    endif()
+endif()
+if(NOT GLIB_SKIP_HEADERS)
+    file(GLOB GIO_HEADERS gio/*.h)
+    list(FILTER GIO_HEADERS EXCLUDE REGEX "private.h\$")
+    install(FILES ${GIO_HEADERS} ${CMAKE_BINARY_DIR}/config/gio/gnetworking.h DESTINATION include/gio)
+endif()
 add_library(gio ${GIO_SOURCES})
-target_compile_definitions(gio PRIVATE GIO_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GIO")
-target_link_libraries(gio glib gmodule gobject ws2_32 shlwapi dnsapi iphlpapi ${ZLIB_LIBRARIES})
-target_include_directories(gio PRIVATE ./gio ./gmodule ${ZLIB_INCLUDE_DIRS})
+target_compile_definitions(gio PRIVATE GIO_COMPILATION G_LOG_DOMAIN="GLib-GIO")
+target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${LIBINTL_LIBRARY})
+target_include_directories(gio PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gio>)
+if(WIN32)
+    target_link_libraries(gio PRIVATE ws2_32 shlwapi dnsapi iphlpapi)
+elseif(APPLE)
+    target_link_libraries(gio PRIVATE xdgmime kqueue)
+else()
+    target_link_libraries(gio PRIVATE xdgmime inotify)
+endif()
 list(APPEND GLIB_TARGETS gio)
 
 foreach(GTARGET ${GLIB_TARGETS})
-    set_target_properties(${GTARGET} PROPERTIES 
+    set_target_properties(${GTARGET} PROPERTIES
         OUTPUT_NAME ${GTARGET}-${GLIB_DLL_SUFFIX}
         ARCHIVE_OUTPUT_NAME ${GTARGET}-${GLIB_LIB_SUFFIX})
 endforeach()
 
 macro(add_glib_tool TOOL_NAME)
     add_executable(${TOOL_NAME} ${ARGN})
-    target_link_libraries(${TOOL_NAME} glib)
+    target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY})
     target_compile_definitions(${TOOL_NAME} PRIVATE GLIB_COMPILATION)
     list(APPEND GLIB_TOOLS ${TOOL_NAME})
 endmacro()
 
 macro(add_gio_tool TOOL_NAME)
     add_executable(${TOOL_NAME} ${ARGN})
-    target_link_libraries(${TOOL_NAME} glib gio gobject gmodule)
-    target_include_directories(${TOOL_NAME} PRIVATE ./gmodule ./gio)
+    target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${LIBINTL_LIBRARY})
+    target_include_directories(${TOOL_NAME} PRIVATE gmodule gio)
     target_compile_definitions(${TOOL_NAME} PRIVATE GIO_COMPILATION)
     list(APPEND GLIB_TOOLS ${TOOL_NAME})
 endmacro()
@@ -125,22 +266,22 @@ endmacro()
 if(NOT GLIB_SKIP_TOOLS)
     configure_file(gobject/glib-mkenums.in ${CMAKE_SOURCE_DIR}/gobject/glib-mkenums @ONLY) # uses GLIB_VERSION
     install(FILES gobject/glib-mkenums DESTINATION tools/glib)
-    
+
     configure_file(gio/gdbus-2.0/codegen/gdbus-codegen.in ${CMAKE_SOURCE_DIR}/gio/gdbus-2.0/codegen/gdbus-codegen COPYONLY)
     install(FILES gio/gdbus-2.0/codegen/gdbus-codegen DESTINATION tools/glib)
     file(GLOB CODEGEN_SOURCES gio/gdbus-2.0/codegen/*.py)
     install(FILES ${CODEGEN_SOURCES} DESTINATION tools/glib/codegen)
-    
-    add_gio_tool(gdbus gio/gdbus-tool.c)    
+
+    add_gio_tool(gdbus gio/gdbus-tool.c)
     add_gio_tool(gio-querymodules gio/gio-querymodules.c)
     file(GLOB GIO_TOOL_SOURCES gio/gio-tool*.c)
     add_gio_tool(gio-tool ${GIO_TOOL_SOURCES})
     set_target_properties(gio-tool PROPERTIES OUTPUT_NAME gio)
     add_gio_tool(glib-compile-resources gio/glib-compile-resources.c gio/gvdb/gvdb-builder.c)
-    add_gio_tool(glib-compile-schemas gio/glib-compile-schemas.c gio/gvdb/gvdb-builder.c)   
+    add_gio_tool(glib-compile-schemas gio/glib-compile-schemas.c gio/gvdb/gvdb-builder.c)
     add_gio_tool(gresource gio/gresource-tool.c)
     add_gio_tool(gsettings gio/gsettings-tool.c)
-    
+
     if(CMAKE_SIZEOF_VOID_P EQUAL 4)
         set(WIN win32)
     else()
@@ -148,16 +289,15 @@ if(NOT GLIB_SKIP_TOOLS)
     endif()
 
     add_glib_tool(glib-genmarshal gobject/glib-genmarshal.c)
-    add_glib_tool(gspawn-${WIN}-helper WIN32 glib/gspawn-win32-helper.c)
-    add_glib_tool(gspawn-${WIN}-helper-console glib/gspawn-win32-helper-console.c)
-    
+    if(WIN32)
+        add_glib_tool(gspawn-${WIN}-helper WIN32 glib/gspawn-win32-helper.c)
+        add_glib_tool(gspawn-${WIN}-helper-console glib/gspawn-win32-helper-console.c)
+    endif()
+
     install(TARGETS ${GLIB_TOOLS} RUNTIME DESTINATION tools/glib)
 endif()
 
 install(TARGETS ${GLIB_TARGETS} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
-if(NOT GLIB_SKIP_HEADERS)
-    include(install_headers)
-endif()
 
 message(STATUS "Link-time dependencies:")
 message(STATUS "  " ${ZLIB_LIBRARIES})
diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL
index 4f06e4e2e..f37b794cb 100644
--- a/ports/glib/CONTROL
+++ b/ports/glib/CONTROL
@@ -1,4 +1,4 @@
 Source: glib
-Version: 2.52.3-2
+Version: 2.52.3-9
 Description: Portable, general-purpose utility library.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv
diff --git a/ports/glib/cmake/install_headers.cmake b/ports/glib/cmake/install_headers.cmake
index 0cfc207a4..7840f34ab 100644
--- a/ports/glib/cmake/install_headers.cmake
+++ b/ports/glib/cmake/install_headers.cmake
@@ -1,7 +1,6 @@
 # generated from glib-install.props
 install(FILES glib/glib.h DESTINATION include)
-install(FILES glib/glibconfig.h DESTINATION include)
-install(FILES glib/glib.h DESTINATION include)
+install(FILES ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h DESTINATION include)
 install(FILES glib/glib-object.h DESTINATION include)
 install(FILES glib/deprecated/gallocator.h DESTINATION include/glib/deprecated)
 install(FILES glib/deprecated/gcache.h DESTINATION include/glib/deprecated)
@@ -251,6 +250,6 @@ install(FILES gio/gdbusobjectmanagerclient.h DESTINATION include/gio)
 install(FILES gio/gdbusobjectmanagerserver.h DESTINATION include/gio)
 install(FILES gio/gtestdbus.h DESTINATION include/gio)
 install(FILES gio/gioenumtypes.h DESTINATION include/gio)
-install(FILES gio/gnetworking.h DESTINATION include/gio)
+install(FILES ${CMAKE_BINARY_DIR}/config/gio/gnetworking.h DESTINATION include/gio)
 install(FILES gio/gwin32inputstream.h DESTINATION include/gio)
 install(FILES gio/gwin32outputstream.h DESTINATION include/gio)
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
index 9618b6686..a500cbd24 100644
--- a/ports/glib/portfile.cmake
+++ b/ports/glib/portfile.cmake
@@ -3,9 +3,15 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")
 endif()
 
-# Glib relies on DllMain
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "Glib only supports dynamic library and crt linkage")
+# Glib relies on DllMain on Windows
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        message("Glib relies on DllMain and therefore cannot be built statically")
+        set(VCPKG_LIBRARY_LINKAGE "dynamic")
+    endif()
+    if(VCPKG_CRT_LINKAGE STREQUAL "static")
+        message(FATAL_ERROR "Glib only supports dynamic library and crt linkage")
+    endif()
 endif()
 
 include(vcpkg_common_functions)
@@ -25,6 +31,7 @@ vcpkg_apply_patches(
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH})
 file(REMOVE_RECURSE ${SOURCE_PATH}/glib/pcre)
+file(WRITE ${SOURCE_PATH}/glib/pcre/Makefile.in)
 file(REMOVE ${SOURCE_PATH}/glib/win_iconv.c)
 
 vcpkg_configure_cmake(
@@ -34,7 +41,8 @@ vcpkg_configure_cmake(
         -DGLIB_VERSION=${GLIB_VERSION}
     OPTIONS_DEBUG
         -DGLIB_SKIP_HEADERS=ON
-        -DGLIB_SKIP_TOOLS=ON)
+        -DGLIB_SKIP_TOOLS=ON
+    )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
diff --git a/ports/glibmm/CMakeLists.txt b/ports/glibmm/CMakeLists.txt
new file mode 100644
index 000000000..9f0165786
--- /dev/null
+++ b/ports/glibmm/CMakeLists.txt
@@ -0,0 +1,121 @@
+cmake_minimum_required(VERSION 3.9)

+project(glibmm)

+

+set(CMAKE_CXX_STANDARD 17)

+

+find_path(GLIB_INCLUDE_DIR NAMES glib.h)

+find_library(GLIB_LIBRARY NAMES glib-2.0)

+find_library(GIO_LIBRARY NAMES gio-2.0)

+find_library(GOBJECT_LIBRARY NAMES gobject-2.0)

+find_library(GMODULE_LIBRARY NAMES gmodule-2.0)

+find_library(GTHREAD_LIBRARY NAMES gthread-2.0)

+find_program(GLIB_COMPILE_SCHEMAS NAMES glib-compile-schemas)

+find_library(PCRE_LIBRARY NAMES pcre)

+find_library(SIGC_LIBRARY NAMES sigc-2.0)

+find_library(FFI_LIBRARY NAMES ffi libffi)

+

+include_directories(${GLIB_INCLUDE_DIR})

+link_libraries(

+    ${GIO_LIBRARY}

+    ${GOBJECT_LIBRARY}

+    ${GMODULE_LIBRARY}

+    ${GTHREAD_LIBRARY}

+    ${GLIB_LIBRARY}

+    ${PCRE_LIBRARY}

+    ${SIGC_LIBRARY}

+    ${FFI_LIBRARY}

+)

+

+if(APPLE)

+  find_library(LIBINTL_LIBRARY NAMES intl)

+endif()

+

+find_package(unofficial-iconv REQUIRED)

+link_libraries(${LIBINTL_LIBRARY} unofficial::iconv::libiconv)

+

+if(APPLE)

+  find_library(COREFOUNDATION_LIBRARY CoreFoundation)

+  find_library(CORESERVICES_LIBRARY CoreServices)

+  find_library(FOUNDATION_LIBRARY Foundation)

+  link_libraries(${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${FOUNDATION_LIBRARY})

+endif()

+

+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)

+

+if(BUILD_SHARED_LIBS)

+    add_definitions(-DGLIBMM_DLL -DGIOMM_DLL)

+else()

+    add_definitions(-DGLIBMM_STATIC_LIB -DGIOMM_STATIC_LIB)

+endif()

+

+if(WIN32)

+    add_compile_options(/FI${WARNINGS_HEADER} -DSIZEOF_WCHAR_T=2)

+else()

+    set(THREADS_PREFER_PTHREAD_FLAG ON)

+    find_package(Threads REQUIRED)

+    link_libraries(Threads::Threads ${CMAKE_DL_LIBS})

+endif()

+

+if(WIN32)

+    configure_file(MSVC_Net2013/giomm/giommconfig.h ${CMAKE_BINARY_DIR}/config/gio/giommconfig.h COPYONLY)

+    configure_file(MSVC_Net2013/glibmm/glibmmconfig.h ${CMAKE_BINARY_DIR}/config/glib/glibmmconfig.h COPYONLY)

+else()

+    set(ENV{GLIB_COMPILE_SCHEMAS} "${GLIB_COMPILE_SCHEMAS}")

+    set(ENV{GLIBMM_CFLAGS} -I${GLIB_INCLUDE_DIR})

+    set(ENV{GLIBMM_LIBS} "${GLIB_LIBRARY}")

+    set(ENV{GIOMM_CFLAGS} -I${GLIB_INCLUDE_DIR})

+    set(ENV{GIOMM_LIBS} "${GIO_LIBRARY}")

+    set(ENV{PKG_CONFIG} "echo")

+

+    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/config)

+    execute_process(

+        COMMAND "${CMAKE_SOURCE_DIR}/configure"

+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/config

+        RESULT_VARIABLE res

+    )

+    if(NOT res EQUAL 0)

+        message(FATAL_ERROR "Configure failed.")

+    endif()

+endif()

+

+file(GLOB GLIBMM_SOURCES glib/glibmm/*.cc)

+add_library(glibmm ${GLIBMM_SOURCES})

+target_compile_definitions(glibmm PRIVATE -DGLIBMM_BUILD)

+target_include_directories(glibmm PUBLIC glib ${CMAKE_BINARY_DIR}/config/glib)

+

+file(GLOB GIOMM_SOURCES gio/giomm/*.cc)

+if(WIN32)

+    list(FILTER GIOMM_SOURCES EXCLUDE REGEX "desktopappinfo.cc\$|/unix[^/]+.cc\$")

+endif()

+add_library(giomm ${GIOMM_SOURCES})

+target_compile_definitions(giomm PRIVATE -DGIOMM_BUILD)

+target_link_libraries(giomm PUBLIC glibmm)

+target_include_directories(giomm PUBLIC gio ${CMAKE_BINARY_DIR}/config/gio)

+

+install(

+    TARGETS glibmm giomm

+    RUNTIME DESTINATION bin

+    ARCHIVE DESTINATION lib

+    LIBRARY DESTINATION lib

+)

+

+if(NOT DISABLE_INSTALL_HEADERS)

+    install(

+        FILES

+            ${CMAKE_BINARY_DIR}/config/gio/giommconfig.h

+            gio/giomm.h

+            ${CMAKE_BINARY_DIR}/config/glib/glibmmconfig.h

+            glib/glibmm.h

+        DESTINATION include

+    )

+    install(

+        DIRECTORY gio/giomm glib/glibmm

+        DESTINATION include

+        FILES_MATCHING PATTERN *.h

+    )

+endif()

+

+if(NOT DISABLE_EXAMPLES)

+    add_executable(options examples/options/main.cc)

+    target_link_libraries(options PRIVATE giomm)

+endif()

diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL
index 52a4e0e05..a7ccbe937 100644
--- a/ports/glibmm/CONTROL
+++ b/ports/glibmm/CONTROL
@@ -1,4 +1,4 @@
 Source: glibmm
-Version: 2.52.1
+Version: 2.52.1-7
 Description: This is glibmm, a C++ API for parts of glib that are useful for C++. See http://www.gtkmm.org.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
diff --git a/ports/glibmm/COPYING b/ports/glibmm/COPYING
deleted file mode 100644
index 5e1f37e13..000000000
--- a/ports/glibmm/COPYING
+++ /dev/null
@@ -1,514 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-You should also get your employer (if you work as a programmer) or
-your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/ports/glibmm/README b/ports/glibmm/README
deleted file mode 100644
index 341c67e43..000000000
--- a/ports/glibmm/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This is glibmm, a C++ API for parts of glib that are useful for C++.
-See http://www.gtkmm.org
-
-
diff --git a/ports/glibmm/fix_charset.patch b/ports/glibmm/fix_charset.patch
deleted file mode 100644
index 8831fc946..000000000
--- a/ports/glibmm/fix_charset.patch
+++ /dev/null
@@ -1,2702 +0,0 @@
-diff --git a/MSVC_Net2013/compose.vcxproj b/MSVC_Net2013/compose.vcxproj
-index 4775af3..72a7054 100644
---- a/MSVC_Net2013/compose.vcxproj
-+++ b/MSVC_Net2013/compose.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{D1C74410-023C-48DE-B636-E8B6D177C306}</ProjectGuid>
-     <RootNamespace>compose</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -189,4 +190,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/dispatcher.vcxproj b/MSVC_Net2013/dispatcher.vcxproj
-index 6c403c0..90d254a 100644
---- a/MSVC_Net2013/dispatcher.vcxproj
-+++ b/MSVC_Net2013/dispatcher.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{129ECC08-6D30-4884-B824-4AF96EF0A45C}</ProjectGuid>
-     <RootNamespace>dispatcher</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -189,4 +190,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/dispatcher2.vcxproj b/MSVC_Net2013/dispatcher2.vcxproj
-index db6a5fd..9cf6b57 100644
---- a/MSVC_Net2013/dispatcher2.vcxproj
-+++ b/MSVC_Net2013/dispatcher2.vcxproj
-@@ -22,26 +22,27 @@
-     <ProjectName>dispatcher2</ProjectName>
-     <ProjectGuid>{18A82706-B645-4DF5-AB09-06B90128BAC5}</ProjectGuid>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -188,4 +189,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj
-index 8894039..0b2cb08 100644
---- a/MSVC_Net2013/gendef.vcxproj
-+++ b/MSVC_Net2013/gendef.vcxproj
-@@ -1,168 +1,169 @@
--???<?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--  <ItemGroup Label="ProjectConfigurations">
--    <ProjectConfiguration Include="Debug|Win32">
--      <Configuration>Debug</Configuration>
--      <Platform>Win32</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Debug|x64">
--      <Configuration>Debug</Configuration>
--      <Platform>x64</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Release|Win32">
--      <Configuration>Release</Configuration>
--      <Platform>Win32</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Release|x64">
--      <Configuration>Release</Configuration>
--      <Platform>x64</Platform>
--    </ProjectConfiguration>
--  </ItemGroup>
--  <PropertyGroup Label="Globals">
--    <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
--    <Keyword>Win32Proj</Keyword>
--  </PropertyGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--    <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--    <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
--    <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
--    <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--  <ImportGroup Label="ExtensionSettings">
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <PropertyGroup Label="UserMacros" />
--  <PropertyGroup>
--    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
--    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
--    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
--    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
--  </PropertyGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--    <ClCompile>
--      <Optimization>Disabled</Optimization>
--      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <MinimalRebuild>true</MinimalRebuild>
--      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
--      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
--    </ClCompile>
--    <Link>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
--      <SubSystem>Console</SubSystem>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX86</TargetMachine>
-+???<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+  <ItemGroup Label="ProjectConfigurations">
-+    <ProjectConfiguration Include="Debug|Win32">
-+      <Configuration>Debug</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|Win32">
-+      <Configuration>Release</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+  </ItemGroup>
-+  <PropertyGroup Label="Globals">
-+    <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
-+    <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+    <ConfigurationType>Application</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+    <ConfigurationType>Application</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+    <ConfigurationType>Application</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+    <ConfigurationType>Application</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+  <ImportGroup Label="ExtensionSettings">
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <PropertyGroup Label="UserMacros" />
-+  <PropertyGroup>
-+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-+  </PropertyGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+    <ClCompile>
-+      <Optimization>Disabled</Optimization>
-+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <MinimalRebuild>true</MinimalRebuild>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
-+      <SubSystem>Console</SubSystem>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX86</TargetMachine>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
--    <ClCompile>
--      <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <Link>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <SubSystem>Console</SubSystem>
--      <OptimizeReferences>true</OptimizeReferences>
--      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX86</TargetMachine>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+    <ClCompile>
-+      <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <SubSystem>Console</SubSystem>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX86</TargetMachine>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
--    <Midl>
--      <TargetEnvironment>X64</TargetEnvironment>
--    </Midl>
--    <ClCompile>
--      <Optimization>Disabled</Optimization>
--      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <MinimalRebuild>true</MinimalRebuild>
--      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
--      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <Link>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
--      <SubSystem>Console</SubSystem>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX64</TargetMachine>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+    <Midl>
-+      <TargetEnvironment>X64</TargetEnvironment>
-+    </Midl>
-+    <ClCompile>
-+      <Optimization>Disabled</Optimization>
-+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <MinimalRebuild>true</MinimalRebuild>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
-+      <SubSystem>Console</SubSystem>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX64</TargetMachine>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
--    <Midl>
--      <TargetEnvironment>X64</TargetEnvironment>
--    </Midl>
--    <ClCompile>
--      <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <Link>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <SubSystem>Console</SubSystem>
--      <OptimizeReferences>true</OptimizeReferences>
--      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX64</TargetMachine>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+    <Midl>
-+      <TargetEnvironment>X64</TargetEnvironment>
-+    </Midl>
-+    <ClCompile>
-+      <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <SubSystem>Console</SubSystem>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX64</TargetMachine>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemGroup>
--    <ClCompile Include=".\gendef\gendef.cc" />
--  </ItemGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--  <ImportGroup Label="ExtensionTargets">
--  </ImportGroup>
--</Project>
-\ No newline at end of file
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemGroup>
-+    <ClCompile Include=".\gendef\gendef.cc" />
-+  </ItemGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+  <ImportGroup Label="ExtensionTargets">
-+  </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/giomm.vcxproj b/MSVC_Net2013/giomm.vcxproj
-index df3c4f8..f9baf6b 100644
---- a/MSVC_Net2013/giomm.vcxproj
-+++ b/MSVC_Net2013/giomm.vcxproj
-@@ -1,458 +1,459 @@
--???<?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--  <ItemGroup Label="ProjectConfigurations">
--    <ProjectConfiguration Include="Debug|Win32">
--      <Configuration>Debug</Configuration>
--      <Platform>Win32</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Debug|x64">
--      <Configuration>Debug</Configuration>
--      <Platform>x64</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Release|Win32">
--      <Configuration>Release</Configuration>
--      <Platform>Win32</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Release|x64">
--      <Configuration>Release</Configuration>
--      <Platform>x64</Platform>
--    </ProjectConfiguration>
--  </ItemGroup>
--  <PropertyGroup Label="Globals">
--    <ProjectName>giomm</ProjectName>
--    <ProjectGuid>{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}</ProjectGuid>
--  </PropertyGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--  <ImportGroup Label="ExtensionSettings">
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <PropertyGroup Label="UserMacros" />
--  <PropertyGroup>
--  </PropertyGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <Optimization>Disabled</Optimization>
-+???<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+  <ItemGroup Label="ProjectConfigurations">
-+    <ProjectConfiguration Include="Debug|Win32">
-+      <Configuration>Debug</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|Win32">
-+      <Configuration>Release</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+  </ItemGroup>
-+  <PropertyGroup Label="Globals">
-+    <ProjectName>giomm</ProjectName>
-+    <ProjectGuid>{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}</ProjectGuid>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+  <ImportGroup Label="ExtensionSettings">
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <PropertyGroup Label="UserMacros" />
-+  <PropertyGroup>
-+  </PropertyGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <MinimalRebuild>true</MinimalRebuild>
--      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
--      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate giomm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+      <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <MinimalRebuild>true</MinimalRebuild>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate giomm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
--    <Midl>
--      <TargetEnvironment>X64</TargetEnvironment>
--    </Midl>
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <Optimization>Disabled</Optimization>
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+    <Midl>
-+      <TargetEnvironment>X64</TargetEnvironment>
-+    </Midl>
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <MinimalRebuild>true</MinimalRebuild>
--      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
--      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate giomm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+      <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <MinimalRebuild>true</MinimalRebuild>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate giomm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX64</TargetMachine>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX64</TargetMachine>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-       <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate giomm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+      <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate giomm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
--      <OptimizeReferences>true</OptimizeReferences>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
--    <Midl>
--      <TargetEnvironment>X64</TargetEnvironment>
--    </Midl>
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+    <Midl>
-+      <TargetEnvironment>X64</TargetEnvironment>
-+    </Midl>
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-       <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate giomm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+      <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate giomm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
--      <OptimizeReferences>true</OptimizeReferences>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX64</TargetMachine>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemGroup>
--    <ClCompile Include="..\gio\giomm\action.cc" />
--    <ClCompile Include="..\gio\giomm\actiongroup.cc" />
--    <ClCompile Include="..\gio\giomm\actionmap.cc" />
--    <ClCompile Include="..\gio\giomm\appinfo.cc" />
--    <ClCompile Include="..\gio\giomm\applaunchcontext.cc" />
--    <ClCompile Include="..\gio\giomm\application.cc" />
--    <ClCompile Include="..\gio\giomm\applicationcommandline.cc" />
--    <ClCompile Include="..\gio\giomm\asyncresult.cc" />
--    <ClCompile Include="..\gio\giomm\asyncinitable.cc" />
--    <ClCompile Include="..\gio\giomm\bufferedinputstream.cc" />
--    <ClCompile Include="..\gio\giomm\bufferedoutputstream.cc" />
--    <ClCompile Include="..\gio\giomm\cancellable.cc" />
--    <ClCompile Include="..\gio\giomm\charsetconverter.cc" />
--    <ClCompile Include="..\gio\giomm\contenttype.cc" />
--    <ClCompile Include="..\gio\giomm\converter.cc" />
--    <ClCompile Include="..\gio\giomm\converterinputstream.cc" />
--    <ClCompile Include="..\gio\giomm\converteroutputstream.cc" />
--    <ClCompile Include="..\gio\giomm\credentials.cc" />
--    <ClCompile Include="..\gio\giomm\datainputstream.cc" />
--    <ClCompile Include="..\gio\giomm\dataoutputstream.cc" />
--    <ClCompile Include="..\gio\giomm\dbusactiongroup.cc" />
--    <ClCompile Include="..\gio\giomm\dbusaddress.cc" />
--    <ClCompile Include="..\gio\giomm\dbusauthobserver.cc" />
--    <ClCompile Include="..\gio\giomm\dbusconnection.cc" />
--    <ClCompile Include="..\gio\giomm\dbuserror.cc" />
--    <ClCompile Include="..\gio\giomm\dbuserrorutils.cc" />
--    <ClCompile Include="..\gio\giomm\dbusinterface.cc" />
--    <ClCompile Include="..\gio\giomm\dbusinterfaceskeleton.cc" />
--    <ClCompile Include="..\gio\giomm\dbusinterfacevtable.cc" />
--    <ClCompile Include="..\gio\giomm\dbusintrospection.cc" />
--    <ClCompile Include="..\gio\giomm\dbusmenumodel.cc" />
--    <ClCompile Include="..\gio\giomm\dbusmessage.cc" />
--    <ClCompile Include="..\gio\giomm\dbusmethodinvocation.cc" />
--    <ClCompile Include="..\gio\giomm\dbusobject.cc" />
--    <ClCompile Include="..\gio\giomm\dbusownname.cc" />
--    <ClCompile Include="..\gio\giomm\dbusproxy.cc" />
--    <ClCompile Include="..\gio\giomm\dbusserver.cc" />
--    <ClCompile Include="..\gio\giomm\dbussubtreevtable.cc" />
--    <ClCompile Include="..\gio\giomm\dbusutils.cc" />
--    <ClCompile Include="..\gio\giomm\dbuswatchname.cc" />
--    <ClCompile Include="..\gio\giomm\drive.cc" />
--    <ClCompile Include="..\gio\giomm\emblem.cc" />
--    <ClCompile Include="..\gio\giomm\emblemedicon.cc" />
--    <ClCompile Include="..\gio\giomm\enums.cc" />
--    <ClCompile Include="..\gio\giomm\error.cc" />
--    <ClCompile Include="..\gio\giomm\file.cc" />
--    <ClCompile Include="..\gio\giomm\fileattributeinfo.cc" />
--    <ClCompile Include="..\gio\giomm\fileattributeinfolist.cc" />
--    <ClCompile Include="..\gio\giomm\fileenumerator.cc" />
--    <ClCompile Include="..\gio\giomm\fileicon.cc" />
--    <ClCompile Include="..\gio\giomm\fileinfo.cc" />
--    <ClCompile Include="..\gio\giomm\fileinputstream.cc" />
--    <ClCompile Include="..\gio\giomm\fileiostream.cc" />
--    <ClCompile Include="..\gio\giomm\filemonitor.cc" />
--    <ClCompile Include="..\gio\giomm\filenamecompleter.cc" />
--    <ClCompile Include="..\gio\giomm\fileoutputstream.cc" />
--    <ClCompile Include="..\gio\giomm\filterinputstream.cc" />
--    <ClCompile Include="..\gio\giomm\filteroutputstream.cc" />
--    <ClCompile Include="..\gio\giomm\icon.cc" />
--    <ClCompile Include="..\gio\giomm\inetaddress.cc" />
--    <ClCompile Include="..\gio\giomm\inetsocketaddress.cc" />
--    <ClCompile Include="..\gio\giomm\init.cc" />
--    <ClCompile Include="..\gio\giomm\initable.cc" />
--    <ClCompile Include="..\gio\giomm\inputstream.cc" />
--    <ClCompile Include="..\gio\giomm\iostream.cc" />
--    <ClCompile Include="..\gio\giomm\listmodel.cc" />
--    <ClCompile Include="..\gio\giomm\liststore.cc" />
--    <ClCompile Include="..\gio\giomm\loadableicon.cc" />
--    <ClCompile Include="..\gio\giomm\memoryinputstream.cc" />
--    <ClCompile Include="..\gio\giomm\memoryoutputstream.cc" />
--    <ClCompile Include="..\gio\giomm\menu.cc" />
--    <ClCompile Include="..\gio\giomm\menuattributeiter.cc" />
--    <ClCompile Include="..\gio\giomm\menuitem.cc" />
--    <ClCompile Include="..\gio\giomm\menulinkiter.cc" />
--    <ClCompile Include="..\gio\giomm\menumodel.cc" />
--    <ClCompile Include="..\gio\giomm\mount.cc" />
--    <ClCompile Include="..\gio\giomm\mountoperation.cc" />
--    <ClCompile Include="..\gio\giomm\networkaddress.cc" />
--    <ClCompile Include="..\gio\giomm\networkmonitor.cc" />
--    <ClCompile Include="..\gio\giomm\networkservice.cc" />
--    <ClCompile Include="..\gio\giomm\notification.cc" />
--    <ClCompile Include="..\gio\giomm\outputstream.cc" />
--    <ClCompile Include="..\gio\giomm\permission.cc" />
--    <ClCompile Include="..\gio\giomm\pollableinputstream.cc" />
--    <ClCompile Include="..\gio\giomm\pollableoutputstream.cc" />
--    <ClCompile Include="..\gio\giomm\proxy.cc" />
--    <ClCompile Include="..\gio\giomm\proxyaddress.cc" />
--    <ClCompile Include="..\gio\giomm\proxyresolver.cc" />
--    <ClCompile Include="..\gio\giomm\remoteactiongroup.cc" />
--    <ClCompile Include="..\gio\giomm\resolver.cc" />
--    <ClCompile Include="..\gio\giomm\resource.cc" />
--    <ClCompile Include="..\gio\giomm\seekable.cc" />
--    <ClCompile Include="..\gio\giomm\settings.cc" />
--    <ClCompile Include="..\gio\giomm\settingsschema.cc" />
--    <ClCompile Include="..\gio\giomm\settingsschemakey.cc" />
--    <ClCompile Include="..\gio\giomm\settingsschemasource.cc" />
--    <ClCompile Include="..\gio\giomm\simpleaction.cc" />
--    <ClCompile Include="..\gio\giomm\simpleactiongroup.cc" />
--    <ClCompile Include="..\gio\giomm\simpleiostream.cc" />
--    <ClCompile Include="..\gio\giomm\simplepermission.cc" />
--    <ClCompile Include="..\gio\giomm\slot_async.cc" />
--    <ClCompile Include="..\gio\giomm\socket.cc" />
--    <ClCompile Include="..\gio\giomm\socketaddress.cc" />
--    <ClCompile Include="..\gio\giomm\socketaddressenumerator.cc" />
--    <ClCompile Include="..\gio\giomm\socketclient.cc" />
--    <ClCompile Include="..\gio\giomm\socketconnectable.cc" />
--    <ClCompile Include="..\gio\giomm\socketconnection.cc" />
--    <ClCompile Include="..\gio\giomm\socketcontrolmessage.cc" />
--    <ClCompile Include="..\gio\giomm\socketlistener.cc" />
--    <ClCompile Include="..\gio\giomm\socketservice.cc" />
--    <ClCompile Include="..\gio\giomm\socketsource.cc" />
--    <ClCompile Include="..\gio\giomm\srvtarget.cc" />
--    <ClCompile Include="..\gio\giomm\tcpconnection.cc" />
--    <ClCompile Include="..\gio\giomm\tcpwrapperconnection.cc" />
--    <ClCompile Include="..\gio\giomm\themedicon.cc" />
--    <ClCompile Include="..\gio\giomm\threadedsocketservice.cc" />
--    <ClCompile Include="..\gio\giomm\tlscertificate.cc" />
--    <ClCompile Include="..\gio\giomm\tlsclientconnection.cc" />
--    <ClCompile Include="..\gio\giomm\tlsconnection.cc" />
--    <ClCompile Include="..\gio\giomm\tlsdatabase.cc" />
--    <ClCompile Include="..\gio\giomm\tlsinteraction.cc" />
--    <ClCompile Include="..\gio\giomm\tlspassword.cc" />
--    <ClCompile Include="..\gio\giomm\tlsserverconnection.cc" />
--    <ClCompile Include="..\gio\giomm\volume.cc" />
--    <ClCompile Include="..\gio\giomm\volumemonitor.cc" />
--    <ClCompile Include="..\gio\giomm\wrap_init.cc" />
--    <ClCompile Include="..\gio\giomm\zlibcompressor.cc" />
--    <ClCompile Include="..\gio\giomm\zlibdecompressor.cc" />
--  </ItemGroup>
--  <ItemGroup>
--    <ClInclude Include="..\gio\giomm\action.h" />
--    <ClInclude Include="..\gio\giomm\actiongroup.h" />
--    <ClInclude Include="..\gio\giomm\actionmap.h" />
--    <ClInclude Include="..\gio\giomm\appinfo.h" />
--    <ClInclude Include="..\gio\giomm\applaunchcontext.h" />
--    <ClInclude Include="..\gio\giomm\application.h" />
--    <ClInclude Include="..\gio\giomm\applicationcommandline.h" />
--    <ClInclude Include="..\gio\giomm\asyncinitable.h" />
--    <ClInclude Include="..\gio\giomm\asyncresult.h" />
--    <ClInclude Include="..\gio\giomm\bufferedinputstream.h" />
--    <ClInclude Include="..\gio\giomm\bufferedoutputstream.h" />
--    <ClInclude Include="..\gio\giomm\cancellable.h" />
--    <ClInclude Include="..\gio\giomm\charsetconverter.h" />
--    <ClInclude Include="..\gio\giomm\contenttype.h" />
--    <ClInclude Include="..\gio\giomm\converter.h" />
--    <ClInclude Include="..\gio\giomm\converterinputstream.h" />
--    <ClInclude Include="..\gio\giomm\converteroutputstream.h" />
--    <ClInclude Include="..\gio\giomm\credentials.h" />
--    <ClInclude Include="..\gio\giomm\datainputstream.h" />
--    <ClInclude Include="..\gio\giomm\dataoutputstream.h" />
--    <ClInclude Include="..\gio\giomm\dbusactiongroup.h" />
--    <ClInclude Include="..\gio\giomm\dbusaddress.h" />
--    <ClInclude Include="..\gio\giomm\dbusauthobserver.h" />
--    <ClInclude Include="..\gio\giomm\dbusconnection.h" />
--    <ClInclude Include="..\gio\giomm\dbuserror.h" />
--    <ClInclude Include="..\gio\giomm\dbuserrorutils.h" />
--    <ClInclude Include="..\gio\giomm\dbusinterface.h" />
--    <ClInclude Include="..\gio\giomm\dbusinterfaceskeleton.h" />
--    <ClInclude Include="..\gio\giomm\dbusinterfacevtable.h" />
--    <ClInclude Include="..\gio\giomm\dbusintrospection.h" />
--    <ClInclude Include="..\gio\giomm\dbusmenumodel.h" />
--    <ClInclude Include="..\gio\giomm\dbusmessage.h" />
--    <ClInclude Include="..\gio\giomm\dbusmethodinvocation.h" />
--    <ClInclude Include="..\gio\giomm\dbusobject.h" />
--    <ClInclude Include="..\gio\giomm\dbusownname.h" />
--    <ClInclude Include="..\gio\giomm\dbusproxy.h" />
--    <ClInclude Include="..\gio\giomm\dbusserver.h" />
--    <ClInclude Include="..\gio\giomm\dbussubtreevtable.h" />
--    <ClInclude Include="..\gio\giomm\dbusutils.h" />
--    <ClInclude Include="..\gio\giomm\dbuswatchname.h" />
--    <ClInclude Include="..\gio\giomm\drive.h" />
--    <ClInclude Include="..\gio\giomm\emblem.h" />
--    <ClInclude Include="..\gio\giomm\emblemedicon.h" />
--    <ClInclude Include="..\gio\giomm\enums.h" />
--    <ClInclude Include="..\gio\giomm\error.h" />
--    <ClInclude Include="..\gio\giomm\file.h" />
--    <ClInclude Include="..\gio\giomm\fileattributeinfo.h" />
--    <ClInclude Include="..\gio\giomm\fileattributeinfolist.h" />
--    <ClInclude Include="..\gio\giomm\fileenumerator.h" />
--    <ClInclude Include="..\gio\giomm\fileicon.h" />
--    <ClInclude Include="..\gio\giomm\fileinfo.h" />
--    <ClInclude Include="..\gio\giomm\fileinputstream.h" />
--    <ClInclude Include="..\gio\giomm\fileiostream.h" />
--    <ClInclude Include="..\gio\giomm\filemonitor.h" />
--    <ClInclude Include="..\gio\giomm\filenamecompleter.h" />
--    <ClInclude Include="..\gio\giomm\fileoutputstream.h" />
--    <ClInclude Include="..\gio\giomm\filterinputstream.h" />
--    <ClInclude Include="..\gio\giomm\filteroutputstream.h" />
--    <ClInclude Include="..\gio\giomm\icon.h" />
--    <ClInclude Include="..\gio\giomm\inetaddress.h" />
--    <ClInclude Include="..\gio\giomm\inetsocketaddress.h" />
--    <ClInclude Include="..\gio\giomm\init.h" />
--    <ClInclude Include="..\gio\giomm\initable.h" />
--    <ClInclude Include="..\gio\giomm\inputstream.h" />
--    <ClInclude Include="..\gio\giomm\iostream.h" />
--    <ClInclude Include="..\gio\giomm\listmodel.h" />
--    <ClInclude Include="..\gio\giomm\liststore.h" />
--    <ClInclude Include="..\gio\giomm\loadableicon.h" />
--    <ClInclude Include="..\gio\giomm\memoryinputstream.h" />
--    <ClInclude Include="..\gio\giomm\memoryoutputstream.h" />
--    <ClInclude Include="..\gio\giomm\menu.h" />
--    <ClInclude Include="..\gio\giomm\menuattributeiter.h" />
--    <ClInclude Include="..\gio\giomm\menuitem.h" />
--    <ClInclude Include="..\gio\giomm\menulinkiter.h" />
--    <ClInclude Include="..\gio\giomm\menumodel.h" />
--    <ClInclude Include="..\gio\giomm\mount.h" />
--    <ClInclude Include="..\gio\giomm\mountoperation.h" />
--    <ClInclude Include="..\gio\giomm\networkaddress.h" />
--    <ClInclude Include="..\gio\giomm\networkmonitor.h" />
--    <ClInclude Include="..\gio\giomm\networkservice.h" />
--    <ClInclude Include="..\gio\giomm\notification.h" />
--    <ClInclude Include="..\gio\giomm\outputstream.h" />
--    <ClInclude Include="..\gio\giomm\permission.h" />
--    <ClInclude Include="..\gio\giomm\pollableinputstream.h" />
--    <ClInclude Include="..\gio\giomm\pollableoutputstream.h" />
--    <ClInclude Include="..\gio\giomm\proxy.h" />
--    <ClInclude Include="..\gio\giomm\proxyaddress.h" />
--    <ClInclude Include="..\gio\giomm\proxyresolver.h" />
--    <ClInclude Include="..\gio\giomm\remoteactiongroup.h" />
--    <ClInclude Include="..\gio\giomm\resolver.h" />
--    <ClInclude Include="..\gio\giomm\resource.h" />
--    <ClInclude Include="..\gio\giomm\seekable.h" />
--    <ClInclude Include="..\gio\giomm\settings.h" />
--    <ClInclude Include="..\gio\giomm\settingsschema.h" />
--    <ClInclude Include="..\gio\giomm\settingsschemakey.h" />
--    <ClInclude Include="..\gio\giomm\settingsschemasource.h" />
--    <ClInclude Include="..\gio\giomm\simpleaction.h" />
--    <ClInclude Include="..\gio\giomm\simpleactiongroup.h" />
--    <ClInclude Include="..\gio\giomm\simpleiostream.h" />
--    <ClInclude Include="..\gio\giomm\simplepermission.h" />
--    <ClInclude Include="..\gio\giomm\slot_async.h" />
--    <ClInclude Include="..\gio\giomm\socket.h" />
--    <ClInclude Include="..\gio\giomm\socketaddress.h" />
--    <ClInclude Include="..\gio\giomm\socketaddressenumerator.h" />
--    <ClInclude Include="..\gio\giomm\socketclient.h" />
--    <ClInclude Include="..\gio\giomm\socketconnectable.h" />
--    <ClInclude Include="..\gio\giomm\socketconnection.h" />
--    <ClInclude Include="..\gio\giomm\socketcontrolmessage.h" />
--    <ClInclude Include="..\gio\giomm\socketlistener.h" />
--    <ClInclude Include="..\gio\giomm\socketservice.h" />
--    <ClInclude Include="..\gio\giomm\socketsource.h" />
--    <ClInclude Include="..\gio\giomm\srvtarget.h" />
--    <ClInclude Include="..\gio\giomm\tcpconnection.h" />
--    <ClInclude Include="..\gio\giomm\tcpwrapperconnection.h" />
--    <ClInclude Include="..\gio\giomm\themedicon.h" />
--    <ClInclude Include="..\gio\giomm\threadedsocketservice.h" />
--    <ClInclude Include="..\gio\giomm\tlscertificate.h" />
--    <ClInclude Include="..\gio\giomm\tlsclientconnection.h" />
--    <ClInclude Include="..\gio\giomm\tlsconnection.h" />
--    <ClInclude Include="..\gio\giomm\tlsdatabase.h" />
--    <ClInclude Include="..\gio\giomm\tlsinteraction.h" />
--    <ClInclude Include="..\gio\giomm\tlspassword.h" />
--    <ClInclude Include="..\gio\giomm\tlsserverconnection.h" />
--    <ClInclude Include="..\gio\giomm\volume.h" />
--    <ClInclude Include="..\gio\giomm\volumemonitor.h" />
--    <ClInclude Include="..\gio\giomm\wrap_init.h" />
--    <ClInclude Include="..\gio\giomm\zlibcompressor.h" />
--    <ClInclude Include="..\gio\giomm\zlibdecompressor.h" />
--  </ItemGroup>
--  <ItemGroup>
--    <ResourceCompile Include=".\giomm\giomm.rc" />
--  </ItemGroup>
--  <ItemGroup>
--    <ProjectReference Include="glibmm.vcxproj">
--      <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
--      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--    </ProjectReference>
--  </ItemGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--  <ImportGroup Label="ExtensionTargets">
--  </ImportGroup>
--</Project>
-\ No newline at end of file
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX64</TargetMachine>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemGroup>
-+    <ClCompile Include="..\gio\giomm\action.cc" />
-+    <ClCompile Include="..\gio\giomm\actiongroup.cc" />
-+    <ClCompile Include="..\gio\giomm\actionmap.cc" />
-+    <ClCompile Include="..\gio\giomm\appinfo.cc" />
-+    <ClCompile Include="..\gio\giomm\applaunchcontext.cc" />
-+    <ClCompile Include="..\gio\giomm\application.cc" />
-+    <ClCompile Include="..\gio\giomm\applicationcommandline.cc" />
-+    <ClCompile Include="..\gio\giomm\asyncresult.cc" />
-+    <ClCompile Include="..\gio\giomm\asyncinitable.cc" />
-+    <ClCompile Include="..\gio\giomm\bufferedinputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\bufferedoutputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\cancellable.cc" />
-+    <ClCompile Include="..\gio\giomm\charsetconverter.cc" />
-+    <ClCompile Include="..\gio\giomm\contenttype.cc" />
-+    <ClCompile Include="..\gio\giomm\converter.cc" />
-+    <ClCompile Include="..\gio\giomm\converterinputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\converteroutputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\credentials.cc" />
-+    <ClCompile Include="..\gio\giomm\datainputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\dataoutputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusactiongroup.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusaddress.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusauthobserver.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusconnection.cc" />
-+    <ClCompile Include="..\gio\giomm\dbuserror.cc" />
-+    <ClCompile Include="..\gio\giomm\dbuserrorutils.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusinterface.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusinterfaceskeleton.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusinterfacevtable.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusintrospection.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusmenumodel.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusmessage.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusmethodinvocation.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusobject.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusownname.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusproxy.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusserver.cc" />
-+    <ClCompile Include="..\gio\giomm\dbussubtreevtable.cc" />
-+    <ClCompile Include="..\gio\giomm\dbusutils.cc" />
-+    <ClCompile Include="..\gio\giomm\dbuswatchname.cc" />
-+    <ClCompile Include="..\gio\giomm\drive.cc" />
-+    <ClCompile Include="..\gio\giomm\emblem.cc" />
-+    <ClCompile Include="..\gio\giomm\emblemedicon.cc" />
-+    <ClCompile Include="..\gio\giomm\enums.cc" />
-+    <ClCompile Include="..\gio\giomm\error.cc" />
-+    <ClCompile Include="..\gio\giomm\file.cc" />
-+    <ClCompile Include="..\gio\giomm\fileattributeinfo.cc" />
-+    <ClCompile Include="..\gio\giomm\fileattributeinfolist.cc" />
-+    <ClCompile Include="..\gio\giomm\fileenumerator.cc" />
-+    <ClCompile Include="..\gio\giomm\fileicon.cc" />
-+    <ClCompile Include="..\gio\giomm\fileinfo.cc" />
-+    <ClCompile Include="..\gio\giomm\fileinputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\fileiostream.cc" />
-+    <ClCompile Include="..\gio\giomm\filemonitor.cc" />
-+    <ClCompile Include="..\gio\giomm\filenamecompleter.cc" />
-+    <ClCompile Include="..\gio\giomm\fileoutputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\filterinputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\filteroutputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\icon.cc" />
-+    <ClCompile Include="..\gio\giomm\inetaddress.cc" />
-+    <ClCompile Include="..\gio\giomm\inetsocketaddress.cc" />
-+    <ClCompile Include="..\gio\giomm\init.cc" />
-+    <ClCompile Include="..\gio\giomm\initable.cc" />
-+    <ClCompile Include="..\gio\giomm\inputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\iostream.cc" />
-+    <ClCompile Include="..\gio\giomm\listmodel.cc" />
-+    <ClCompile Include="..\gio\giomm\liststore.cc" />
-+    <ClCompile Include="..\gio\giomm\loadableicon.cc" />
-+    <ClCompile Include="..\gio\giomm\memoryinputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\memoryoutputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\menu.cc" />
-+    <ClCompile Include="..\gio\giomm\menuattributeiter.cc" />
-+    <ClCompile Include="..\gio\giomm\menuitem.cc" />
-+    <ClCompile Include="..\gio\giomm\menulinkiter.cc" />
-+    <ClCompile Include="..\gio\giomm\menumodel.cc" />
-+    <ClCompile Include="..\gio\giomm\mount.cc" />
-+    <ClCompile Include="..\gio\giomm\mountoperation.cc" />
-+    <ClCompile Include="..\gio\giomm\networkaddress.cc" />
-+    <ClCompile Include="..\gio\giomm\networkmonitor.cc" />
-+    <ClCompile Include="..\gio\giomm\networkservice.cc" />
-+    <ClCompile Include="..\gio\giomm\notification.cc" />
-+    <ClCompile Include="..\gio\giomm\outputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\permission.cc" />
-+    <ClCompile Include="..\gio\giomm\pollableinputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\pollableoutputstream.cc" />
-+    <ClCompile Include="..\gio\giomm\proxy.cc" />
-+    <ClCompile Include="..\gio\giomm\proxyaddress.cc" />
-+    <ClCompile Include="..\gio\giomm\proxyresolver.cc" />
-+    <ClCompile Include="..\gio\giomm\remoteactiongroup.cc" />
-+    <ClCompile Include="..\gio\giomm\resolver.cc" />
-+    <ClCompile Include="..\gio\giomm\resource.cc" />
-+    <ClCompile Include="..\gio\giomm\seekable.cc" />
-+    <ClCompile Include="..\gio\giomm\settings.cc" />
-+    <ClCompile Include="..\gio\giomm\settingsschema.cc" />
-+    <ClCompile Include="..\gio\giomm\settingsschemakey.cc" />
-+    <ClCompile Include="..\gio\giomm\settingsschemasource.cc" />
-+    <ClCompile Include="..\gio\giomm\simpleaction.cc" />
-+    <ClCompile Include="..\gio\giomm\simpleactiongroup.cc" />
-+    <ClCompile Include="..\gio\giomm\simpleiostream.cc" />
-+    <ClCompile Include="..\gio\giomm\simplepermission.cc" />
-+    <ClCompile Include="..\gio\giomm\slot_async.cc" />
-+    <ClCompile Include="..\gio\giomm\socket.cc" />
-+    <ClCompile Include="..\gio\giomm\socketaddress.cc" />
-+    <ClCompile Include="..\gio\giomm\socketaddressenumerator.cc" />
-+    <ClCompile Include="..\gio\giomm\socketclient.cc" />
-+    <ClCompile Include="..\gio\giomm\socketconnectable.cc" />
-+    <ClCompile Include="..\gio\giomm\socketconnection.cc" />
-+    <ClCompile Include="..\gio\giomm\socketcontrolmessage.cc" />
-+    <ClCompile Include="..\gio\giomm\socketlistener.cc" />
-+    <ClCompile Include="..\gio\giomm\socketservice.cc" />
-+    <ClCompile Include="..\gio\giomm\socketsource.cc" />
-+    <ClCompile Include="..\gio\giomm\srvtarget.cc" />
-+    <ClCompile Include="..\gio\giomm\tcpconnection.cc" />
-+    <ClCompile Include="..\gio\giomm\tcpwrapperconnection.cc" />
-+    <ClCompile Include="..\gio\giomm\themedicon.cc" />
-+    <ClCompile Include="..\gio\giomm\threadedsocketservice.cc" />
-+    <ClCompile Include="..\gio\giomm\tlscertificate.cc" />
-+    <ClCompile Include="..\gio\giomm\tlsclientconnection.cc" />
-+    <ClCompile Include="..\gio\giomm\tlsconnection.cc" />
-+    <ClCompile Include="..\gio\giomm\tlsdatabase.cc" />
-+    <ClCompile Include="..\gio\giomm\tlsinteraction.cc" />
-+    <ClCompile Include="..\gio\giomm\tlspassword.cc" />
-+    <ClCompile Include="..\gio\giomm\tlsserverconnection.cc" />
-+    <ClCompile Include="..\gio\giomm\volume.cc" />
-+    <ClCompile Include="..\gio\giomm\volumemonitor.cc" />
-+    <ClCompile Include="..\gio\giomm\wrap_init.cc" />
-+    <ClCompile Include="..\gio\giomm\zlibcompressor.cc" />
-+    <ClCompile Include="..\gio\giomm\zlibdecompressor.cc" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ClInclude Include="..\gio\giomm\action.h" />
-+    <ClInclude Include="..\gio\giomm\actiongroup.h" />
-+    <ClInclude Include="..\gio\giomm\actionmap.h" />
-+    <ClInclude Include="..\gio\giomm\appinfo.h" />
-+    <ClInclude Include="..\gio\giomm\applaunchcontext.h" />
-+    <ClInclude Include="..\gio\giomm\application.h" />
-+    <ClInclude Include="..\gio\giomm\applicationcommandline.h" />
-+    <ClInclude Include="..\gio\giomm\asyncinitable.h" />
-+    <ClInclude Include="..\gio\giomm\asyncresult.h" />
-+    <ClInclude Include="..\gio\giomm\bufferedinputstream.h" />
-+    <ClInclude Include="..\gio\giomm\bufferedoutputstream.h" />
-+    <ClInclude Include="..\gio\giomm\cancellable.h" />
-+    <ClInclude Include="..\gio\giomm\charsetconverter.h" />
-+    <ClInclude Include="..\gio\giomm\contenttype.h" />
-+    <ClInclude Include="..\gio\giomm\converter.h" />
-+    <ClInclude Include="..\gio\giomm\converterinputstream.h" />
-+    <ClInclude Include="..\gio\giomm\converteroutputstream.h" />
-+    <ClInclude Include="..\gio\giomm\credentials.h" />
-+    <ClInclude Include="..\gio\giomm\datainputstream.h" />
-+    <ClInclude Include="..\gio\giomm\dataoutputstream.h" />
-+    <ClInclude Include="..\gio\giomm\dbusactiongroup.h" />
-+    <ClInclude Include="..\gio\giomm\dbusaddress.h" />
-+    <ClInclude Include="..\gio\giomm\dbusauthobserver.h" />
-+    <ClInclude Include="..\gio\giomm\dbusconnection.h" />
-+    <ClInclude Include="..\gio\giomm\dbuserror.h" />
-+    <ClInclude Include="..\gio\giomm\dbuserrorutils.h" />
-+    <ClInclude Include="..\gio\giomm\dbusinterface.h" />
-+    <ClInclude Include="..\gio\giomm\dbusinterfaceskeleton.h" />
-+    <ClInclude Include="..\gio\giomm\dbusinterfacevtable.h" />
-+    <ClInclude Include="..\gio\giomm\dbusintrospection.h" />
-+    <ClInclude Include="..\gio\giomm\dbusmenumodel.h" />
-+    <ClInclude Include="..\gio\giomm\dbusmessage.h" />
-+    <ClInclude Include="..\gio\giomm\dbusmethodinvocation.h" />
-+    <ClInclude Include="..\gio\giomm\dbusobject.h" />
-+    <ClInclude Include="..\gio\giomm\dbusownname.h" />
-+    <ClInclude Include="..\gio\giomm\dbusproxy.h" />
-+    <ClInclude Include="..\gio\giomm\dbusserver.h" />
-+    <ClInclude Include="..\gio\giomm\dbussubtreevtable.h" />
-+    <ClInclude Include="..\gio\giomm\dbusutils.h" />
-+    <ClInclude Include="..\gio\giomm\dbuswatchname.h" />
-+    <ClInclude Include="..\gio\giomm\drive.h" />
-+    <ClInclude Include="..\gio\giomm\emblem.h" />
-+    <ClInclude Include="..\gio\giomm\emblemedicon.h" />
-+    <ClInclude Include="..\gio\giomm\enums.h" />
-+    <ClInclude Include="..\gio\giomm\error.h" />
-+    <ClInclude Include="..\gio\giomm\file.h" />
-+    <ClInclude Include="..\gio\giomm\fileattributeinfo.h" />
-+    <ClInclude Include="..\gio\giomm\fileattributeinfolist.h" />
-+    <ClInclude Include="..\gio\giomm\fileenumerator.h" />
-+    <ClInclude Include="..\gio\giomm\fileicon.h" />
-+    <ClInclude Include="..\gio\giomm\fileinfo.h" />
-+    <ClInclude Include="..\gio\giomm\fileinputstream.h" />
-+    <ClInclude Include="..\gio\giomm\fileiostream.h" />
-+    <ClInclude Include="..\gio\giomm\filemonitor.h" />
-+    <ClInclude Include="..\gio\giomm\filenamecompleter.h" />
-+    <ClInclude Include="..\gio\giomm\fileoutputstream.h" />
-+    <ClInclude Include="..\gio\giomm\filterinputstream.h" />
-+    <ClInclude Include="..\gio\giomm\filteroutputstream.h" />
-+    <ClInclude Include="..\gio\giomm\icon.h" />
-+    <ClInclude Include="..\gio\giomm\inetaddress.h" />
-+    <ClInclude Include="..\gio\giomm\inetsocketaddress.h" />
-+    <ClInclude Include="..\gio\giomm\init.h" />
-+    <ClInclude Include="..\gio\giomm\initable.h" />
-+    <ClInclude Include="..\gio\giomm\inputstream.h" />
-+    <ClInclude Include="..\gio\giomm\iostream.h" />
-+    <ClInclude Include="..\gio\giomm\listmodel.h" />
-+    <ClInclude Include="..\gio\giomm\liststore.h" />
-+    <ClInclude Include="..\gio\giomm\loadableicon.h" />
-+    <ClInclude Include="..\gio\giomm\memoryinputstream.h" />
-+    <ClInclude Include="..\gio\giomm\memoryoutputstream.h" />
-+    <ClInclude Include="..\gio\giomm\menu.h" />
-+    <ClInclude Include="..\gio\giomm\menuattributeiter.h" />
-+    <ClInclude Include="..\gio\giomm\menuitem.h" />
-+    <ClInclude Include="..\gio\giomm\menulinkiter.h" />
-+    <ClInclude Include="..\gio\giomm\menumodel.h" />
-+    <ClInclude Include="..\gio\giomm\mount.h" />
-+    <ClInclude Include="..\gio\giomm\mountoperation.h" />
-+    <ClInclude Include="..\gio\giomm\networkaddress.h" />
-+    <ClInclude Include="..\gio\giomm\networkmonitor.h" />
-+    <ClInclude Include="..\gio\giomm\networkservice.h" />
-+    <ClInclude Include="..\gio\giomm\notification.h" />
-+    <ClInclude Include="..\gio\giomm\outputstream.h" />
-+    <ClInclude Include="..\gio\giomm\permission.h" />
-+    <ClInclude Include="..\gio\giomm\pollableinputstream.h" />
-+    <ClInclude Include="..\gio\giomm\pollableoutputstream.h" />
-+    <ClInclude Include="..\gio\giomm\proxy.h" />
-+    <ClInclude Include="..\gio\giomm\proxyaddress.h" />
-+    <ClInclude Include="..\gio\giomm\proxyresolver.h" />
-+    <ClInclude Include="..\gio\giomm\remoteactiongroup.h" />
-+    <ClInclude Include="..\gio\giomm\resolver.h" />
-+    <ClInclude Include="..\gio\giomm\resource.h" />
-+    <ClInclude Include="..\gio\giomm\seekable.h" />
-+    <ClInclude Include="..\gio\giomm\settings.h" />
-+    <ClInclude Include="..\gio\giomm\settingsschema.h" />
-+    <ClInclude Include="..\gio\giomm\settingsschemakey.h" />
-+    <ClInclude Include="..\gio\giomm\settingsschemasource.h" />
-+    <ClInclude Include="..\gio\giomm\simpleaction.h" />
-+    <ClInclude Include="..\gio\giomm\simpleactiongroup.h" />
-+    <ClInclude Include="..\gio\giomm\simpleiostream.h" />
-+    <ClInclude Include="..\gio\giomm\simplepermission.h" />
-+    <ClInclude Include="..\gio\giomm\slot_async.h" />
-+    <ClInclude Include="..\gio\giomm\socket.h" />
-+    <ClInclude Include="..\gio\giomm\socketaddress.h" />
-+    <ClInclude Include="..\gio\giomm\socketaddressenumerator.h" />
-+    <ClInclude Include="..\gio\giomm\socketclient.h" />
-+    <ClInclude Include="..\gio\giomm\socketconnectable.h" />
-+    <ClInclude Include="..\gio\giomm\socketconnection.h" />
-+    <ClInclude Include="..\gio\giomm\socketcontrolmessage.h" />
-+    <ClInclude Include="..\gio\giomm\socketlistener.h" />
-+    <ClInclude Include="..\gio\giomm\socketservice.h" />
-+    <ClInclude Include="..\gio\giomm\socketsource.h" />
-+    <ClInclude Include="..\gio\giomm\srvtarget.h" />
-+    <ClInclude Include="..\gio\giomm\tcpconnection.h" />
-+    <ClInclude Include="..\gio\giomm\tcpwrapperconnection.h" />
-+    <ClInclude Include="..\gio\giomm\themedicon.h" />
-+    <ClInclude Include="..\gio\giomm\threadedsocketservice.h" />
-+    <ClInclude Include="..\gio\giomm\tlscertificate.h" />
-+    <ClInclude Include="..\gio\giomm\tlsclientconnection.h" />
-+    <ClInclude Include="..\gio\giomm\tlsconnection.h" />
-+    <ClInclude Include="..\gio\giomm\tlsdatabase.h" />
-+    <ClInclude Include="..\gio\giomm\tlsinteraction.h" />
-+    <ClInclude Include="..\gio\giomm\tlspassword.h" />
-+    <ClInclude Include="..\gio\giomm\tlsserverconnection.h" />
-+    <ClInclude Include="..\gio\giomm\volume.h" />
-+    <ClInclude Include="..\gio\giomm\volumemonitor.h" />
-+    <ClInclude Include="..\gio\giomm\wrap_init.h" />
-+    <ClInclude Include="..\gio\giomm\zlibcompressor.h" />
-+    <ClInclude Include="..\gio\giomm\zlibdecompressor.h" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ResourceCompile Include=".\giomm\giomm.rc" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ProjectReference Include="glibmm.vcxproj">
-+      <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
-+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-+    </ProjectReference>
-+  </ItemGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+  <ImportGroup Label="ExtensionTargets">
-+  </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/giomm_simple.vcxproj b/MSVC_Net2013/giomm_simple.vcxproj
-index 1eb6124..2db412e 100644
---- a/MSVC_Net2013/giomm_simple.vcxproj
-+++ b/MSVC_Net2013/giomm_simple.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}</ProjectGuid>
-     <RootNamespace>tests_giomm_simple</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -189,4 +190,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/glibmm.vcxproj b/MSVC_Net2013/glibmm.vcxproj
-index cf86400..e3df6a8 100644
---- a/MSVC_Net2013/glibmm.vcxproj
-+++ b/MSVC_Net2013/glibmm.vcxproj
-@@ -1,362 +1,363 @@
--???<?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
--  <ItemGroup Label="ProjectConfigurations">
--    <ProjectConfiguration Include="Debug|Win32">
--      <Configuration>Debug</Configuration>
--      <Platform>Win32</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Debug|x64">
--      <Configuration>Debug</Configuration>
--      <Platform>x64</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Release|Win32">
--      <Configuration>Release</Configuration>
--      <Platform>Win32</Platform>
--    </ProjectConfiguration>
--    <ProjectConfiguration Include="Release|x64">
--      <Configuration>Release</Configuration>
--      <Platform>x64</Platform>
--    </ProjectConfiguration>
--  </ItemGroup>
--  <PropertyGroup Label="Globals">
--    <ProjectName>glibmm</ProjectName>
--    <ProjectGuid>{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}</ProjectGuid>
--    <RootNamespace>glibmm</RootNamespace>
--    <Keyword>Win32Proj</Keyword>
--  </PropertyGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
--    <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
--    <PlatformToolset>v120</PlatformToolset>
--  </PropertyGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--  <ImportGroup Label="ExtensionSettings">
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
--    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--    <Import Project=".\glibmm-build-defines.props" />
--  </ImportGroup>
--  <PropertyGroup Label="UserMacros" />
--  <PropertyGroup>
--    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreLinkEventUseInBuild>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
--    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreLinkEventUseInBuild>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
--    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</PreLinkEventUseInBuild>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
--    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreLinkEventUseInBuild>
--    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
--  </PropertyGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <MinimalRebuild>true</MinimalRebuild>
--      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
--      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
--      <RuntimeTypeInfo>true</RuntimeTypeInfo>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate glibmm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+???<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+  <ItemGroup Label="ProjectConfigurations">
-+    <ProjectConfiguration Include="Debug|Win32">
-+      <Configuration>Debug</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|Win32">
-+      <Configuration>Release</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+  </ItemGroup>
-+  <PropertyGroup Label="Globals">
-+    <ProjectName>glibmm</ProjectName>
-+    <ProjectGuid>{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}</ProjectGuid>
-+    <RootNamespace>glibmm</RootNamespace>
-+    <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+  <ImportGroup Label="ExtensionSettings">
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project=".\glibmm-build-defines.props" />
-+  </ImportGroup>
-+  <PropertyGroup Label="UserMacros" />
-+  <PropertyGroup>
-+    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreLinkEventUseInBuild>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-+    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreLinkEventUseInBuild>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-+    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</PreLinkEventUseInBuild>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-+    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreLinkEventUseInBuild>
-+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-+  </PropertyGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <Optimization>Disabled</Optimization>
-+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>_DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <MinimalRebuild>true</MinimalRebuild>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate glibmm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
--    <Midl>
--      <TargetEnvironment>X64</TargetEnvironment>
--    </Midl>
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <MinimalRebuild>true</MinimalRebuild>
--      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
--      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
--      <RuntimeTypeInfo>true</RuntimeTypeInfo>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate glibmm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+    <Midl>
-+      <TargetEnvironment>X64</TargetEnvironment>
-+    </Midl>
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <Optimization>Disabled</Optimization>
-+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>_DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <MinimalRebuild>true</MinimalRebuild>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate glibmm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX64</TargetMachine>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
--      <RuntimeTypeInfo>true</RuntimeTypeInfo>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate glibmm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX64</TargetMachine>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate glibmm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <OptimizeReferences>true</OptimizeReferences>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
--    <Midl>
--      <TargetEnvironment>X64</TargetEnvironment>
--    </Midl>
--    <ClCompile>
--      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
--      <RuntimeTypeInfo>true</RuntimeTypeInfo>
--      <WarningLevel>Level3</WarningLevel>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--    </ClCompile>
--    <PreLinkEvent>
--      <Message>Generate glibmm def file</Message>
--      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
--    </PreLinkEvent>
--    <Link>
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+    <Midl>
-+      <TargetEnvironment>X64</TargetEnvironment>
-+    </Midl>
-+    <ClCompile>
-+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <PreLinkEvent>
-+      <Message>Generate glibmm def file</Message>
-+      <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-+    </PreLinkEvent>
-+    <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
--      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
--      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
--      <GenerateDebugInformation>true</GenerateDebugInformation>
--      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--      <OptimizeReferences>true</OptimizeReferences>
--      <DataExecutionPrevention>
--      </DataExecutionPrevention>
--      <TargetMachine>MachineX64</TargetMachine>
--    </Link>
--  </ItemDefinitionGroup>
--  <ItemGroup>
--    <ClCompile Include="..\glib\glibmm\arrayhandle.cc" />
--    <ClCompile Include="..\glib\glibmm\balancedtree.cc" />
--    <ClCompile Include="..\glib\glibmm\base64.cc" />
--    <ClCompile Include="..\glib\glibmm\binding.cc" />
--    <ClCompile Include="..\glib\glibmm\bytes.cc" />
--    <ClCompile Include="..\glib\glibmm\bytearray.cc" />
--    <ClCompile Include="..\glib\glibmm\checksum.cc" />
--    <ClCompile Include="..\glib\glibmm\class.cc" />
--    <ClCompile Include="..\glib\glibmm\containers.cc" />
--    <ClCompile Include="..\glib\glibmm\convert.cc" />
--    <ClCompile Include="..\glib\glibmm\date.cc" />
--    <ClCompile Include="..\glib\glibmm\datetime.cc" />
--    <ClCompile Include="..\glib\glibmm\debug.cc" />
--    <ClCompile Include="..\glib\glibmm\dispatcher.cc" />
--    <ClCompile Include="..\glib\glibmm\enums.cc" />
--    <ClCompile Include="..\glib\glibmm\error.cc" />
--    <ClCompile Include="..\glib\glibmm\exception.cc" />
--    <ClCompile Include="..\glib\glibmm\exceptionhandler.cc" />
--    <ClCompile Include="..\glib\glibmm\fileutils.cc" />
--    <ClCompile Include="..\glib\glibmm\init.cc" />
--    <ClCompile Include="..\glib\glibmm\interface.cc" />
--    <ClCompile Include="..\glib\glibmm\iochannel.cc" />
--    <ClCompile Include="..\glib\glibmm\keyfile.cc" />
--    <ClCompile Include="..\glib\glibmm\main.cc" />
--    <ClCompile Include="..\glib\glibmm\markup.cc" />
--    <ClCompile Include="..\glib\glibmm\miscutils.cc" />
--    <ClCompile Include="..\glib\glibmm\module.cc" />
--    <ClCompile Include="..\glib\glibmm\nodetree.cc" />
--    <ClCompile Include="..\glib\glibmm\object.cc" />
--    <ClCompile Include="..\glib\glibmm\objectbase.cc" />
--    <ClCompile Include="..\glib\glibmm\optioncontext.cc" />
--    <ClCompile Include="..\glib\glibmm\optionentry.cc" />
--    <ClCompile Include="..\glib\glibmm\optiongroup.cc" />
--    <ClCompile Include="..\glib\glibmm\pattern.cc" />
--    <ClCompile Include="..\glib\glibmm\property.cc" />
--    <ClCompile Include="..\glib\glibmm\propertyproxy.cc" />
--    <ClCompile Include="..\glib\glibmm\propertyproxy_base.cc" />
--    <ClCompile Include="..\glib\glibmm\quark.cc" />
--    <ClCompile Include="..\glib\glibmm\random.cc" />
--    <ClCompile Include="..\glib\glibmm\regex.cc" />
--    <ClCompile Include="..\glib\glibmm\sarray.cc" />
--    <ClCompile Include="..\glib\glibmm\shell.cc" />
--    <ClCompile Include="..\glib\glibmm\signalproxy.cc" />
--    <ClCompile Include="..\glib\glibmm\signalproxy_connectionnode.cc" />
--    <ClCompile Include="..\glib\glibmm\spawn.cc" />
--    <ClCompile Include="..\glib\glibmm\streamiochannel.cc" />
--    <ClCompile Include="..\glib\glibmm\stringutils.cc" />
--    <ClCompile Include="..\glib\glibmm\thread.cc" />
--    <ClCompile Include="..\glib\glibmm\threadpool.cc" />
--    <ClCompile Include="..\glib\glibmm\threads.cc" />
--    <ClCompile Include="..\glib\glibmm\timer.cc" />
--    <ClCompile Include="..\glib\glibmm\timeval.cc" />
--    <ClCompile Include="..\glib\glibmm\timezone.cc" />
--    <ClCompile Include="..\glib\glibmm\unicode.cc" />
--    <ClCompile Include="..\glib\glibmm\uriutils.cc" />
--    <ClCompile Include="..\glib\glibmm\ustring.cc" />
--    <ClCompile Include="..\glib\glibmm\utility.cc" />
--    <ClCompile Include="..\glib\glibmm\value.cc" />
--    <ClCompile Include="..\glib\glibmm\value_basictypes.cc" />
--    <ClCompile Include="..\glib\glibmm\value_custom.cc" />
--    <ClCompile Include="..\glib\glibmm\valuearray.cc" />
--    <ClCompile Include="..\glib\glibmm\variant.cc" />
--    <ClCompile Include="..\glib\glibmm\variantdict.cc" />
--    <ClCompile Include="..\glib\glibmm\variantiter.cc" />
--    <ClCompile Include="..\glib\glibmm\varianttype.cc" />
--    <ClCompile Include="..\glib\glibmm\variant_basictypes.cc" />
--    <ClCompile Include="..\glib\glibmm\vectorutils.cc" />
--    <ClCompile Include="..\glib\glibmm\wrap.cc" />
--    <ClCompile Include="..\glib\glibmm\wrap_init.cc" />
--  </ItemGroup>
--  <ItemGroup>
--    <ClInclude Include="..\glib\glibmm\arrayhandle.h" />
--    <ClInclude Include="..\glib\glibmm\balancedtree.h" />
--    <ClInclude Include="..\glib\glibmm\base64.h" />
--    <ClInclude Include="..\glib\glibmm\binding.h" />
--    <ClInclude Include="..\glib\glibmm\bytes.h" />
--    <ClInclude Include="..\glib\glibmm\bytearray.h" />
--    <ClInclude Include="..\glib\glibmm\checksum.h" />
--    <ClInclude Include="..\glib\glibmm\class.h" />
--    <ClInclude Include="..\glib\glibmm\containerhandle_shared.h" />
--    <ClInclude Include="..\glib\glibmm\containers.h" />
--    <ClInclude Include="..\glib\glibmm\convert.h" />
--    <ClInclude Include="..\glib\glibmm\date.h" />
--    <ClInclude Include="..\glib\glibmm\datetime.h" />
--    <ClInclude Include="..\glib\glibmm\debug.h" />
--    <ClInclude Include="..\glib\glibmm\dispatcher.h" />
--    <ClInclude Include="..\glib\glibmm\enums.h" />
--    <ClInclude Include="..\glib\glibmm\error.h" />
--    <ClInclude Include="..\glib\glibmm\exception.h" />
--    <ClInclude Include="..\glib\glibmm\exceptionhandler.h" />
--    <ClInclude Include="..\glib\glibmm\fileutils.h" />
--    <ClInclude Include="..\glib\glibmm\helperlist.h" />
--    <ClInclude Include="..\glib\glibmm\i18n-lib.h" />
--    <ClInclude Include="..\glib\glibmm\i18n.h" />
--    <ClInclude Include="..\glib\glibmm\init.h" />
--    <ClInclude Include="..\glib\glibmm\interface.h" />
--    <ClInclude Include="..\glib\glibmm\iochannel.h" />
--    <ClInclude Include="..\glib\glibmm\keyfile.h" />
--    <ClInclude Include="..\glib\glibmm\listhandle.h" />
--    <ClInclude Include="..\glib\glibmm\main.h" />
--    <ClInclude Include="..\glib\glibmm\markup.h" />
--    <ClInclude Include="..\glib\glibmm\miscutils.h" />
--    <ClInclude Include="..\glib\glibmm\module.h" />
--    <ClInclude Include="..\glib\glibmm\nodetree.h" />
--    <ClInclude Include="..\glib\glibmm\object.h" />
--    <ClInclude Include="..\glib\glibmm\objectbase.h" />
--    <ClInclude Include="..\glib\glibmm\optioncontext.h" />
--    <ClInclude Include="..\glib\glibmm\optionentry.h" />
--    <ClInclude Include="..\glib\glibmm\optiongroup.h" />
--    <ClInclude Include="..\glib\glibmm\pattern.h" />
--    <ClInclude Include="..\glib\glibmm\property.h" />
--    <ClInclude Include="..\glib\glibmm\propertyproxy.h" />
--    <ClInclude Include="..\glib\glibmm\propertyproxy_base.h" />
--    <ClInclude Include="..\glib\glibmm\quark.h" />
--    <ClInclude Include="..\glib\glibmm\random.h" />
--    <ClInclude Include="..\glib\glibmm\refptr.h" />
--    <ClInclude Include="..\glib\glibmm\regex.h" />
--    <ClInclude Include="..\glib\glibmm\sarray.h" />
--    <ClInclude Include="..\glib\glibmm\shell.h" />
--    <ClInclude Include="..\glib\glibmm\signalproxy.h" />
--    <ClInclude Include="..\glib\glibmm\signalproxy_connectionnode.h" />
--    <ClInclude Include="..\glib\glibmm\slisthandle.h" />
--    <ClInclude Include="..\glib\glibmm\spawn.h" />
--    <ClInclude Include="..\glib\glibmm\streamiochannel.h" />
--    <ClInclude Include="..\glib\glibmm\stringutils.h" />
--    <ClInclude Include="..\glib\glibmm\thread.h" />
--    <ClInclude Include="..\glib\glibmm\threadpool.h" />
--    <ClInclude Include="..\glib\glibmm\threads.h" />
--    <ClInclude Include="..\glib\glibmm\timer.h" />
--    <ClInclude Include="..\glib\glibmm\timeval.h" />
--    <ClInclude Include="..\glib\glibmm\timezone.h" />
--    <ClInclude Include="..\glib\glibmm\unicode.h" />
--    <ClInclude Include="..\glib\glibmm\uriutils.h" />
--    <ClInclude Include="..\glib\glibmm\ustring.h" />
--    <ClInclude Include="..\glib\glibmm\utility.h" />
--    <ClInclude Include="..\glib\glibmm\value.h" />
--    <ClInclude Include="..\glib\glibmm\value_basictypes.h" />
--    <ClInclude Include="..\glib\glibmm\value_custom.h" />
--    <ClInclude Include="..\glib\glibmm\valuearray.h" />
--    <ClInclude Include="..\glib\glibmm\variant.h" />
--    <ClInclude Include="..\glib\glibmm\variantdict.h" />
--    <ClInclude Include="..\glib\glibmm\variantiter.h" />
--    <ClInclude Include="..\glib\glibmm\varianttype.h" />
--    <ClInclude Include="..\glib\glibmm\variant_basictypes.h" />
--    <ClInclude Include="..\glib\glibmm\vectorutils.h" />
--    <ClInclude Include="..\glib\glibmm\weakref.h" />
--    <ClInclude Include="..\glib\glibmm\wrap.h" />
--    <ClInclude Include="..\glib\glibmm\wrap_init.h" />
--  </ItemGroup>
--  <ItemGroup>
--    <ResourceCompile Include=".\glibmm\glibmm.rc" />
--  </ItemGroup>
--  <ItemGroup>
--    <ProjectReference Include="gendef.vcxproj">
--      <Project>{07324745-c9be-4d65-b08a-9c88188c0c28}</Project>
--      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--    </ProjectReference>
--  </ItemGroup>
--  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--  <ImportGroup Label="ExtensionTargets">
--  </ImportGroup>
--</Project>
-\ No newline at end of file
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-+      <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-+      <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <ProgramDatabaseFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).pdb</ProgramDatabaseFile>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <DataExecutionPrevention>
-+      </DataExecutionPrevention>
-+      <TargetMachine>MachineX64</TargetMachine>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemGroup>
-+    <ClCompile Include="..\glib\glibmm\arrayhandle.cc" />
-+    <ClCompile Include="..\glib\glibmm\balancedtree.cc" />
-+    <ClCompile Include="..\glib\glibmm\base64.cc" />
-+    <ClCompile Include="..\glib\glibmm\binding.cc" />
-+    <ClCompile Include="..\glib\glibmm\bytes.cc" />
-+    <ClCompile Include="..\glib\glibmm\bytearray.cc" />
-+    <ClCompile Include="..\glib\glibmm\checksum.cc" />
-+    <ClCompile Include="..\glib\glibmm\class.cc" />
-+    <ClCompile Include="..\glib\glibmm\containers.cc" />
-+    <ClCompile Include="..\glib\glibmm\convert.cc" />
-+    <ClCompile Include="..\glib\glibmm\date.cc" />
-+    <ClCompile Include="..\glib\glibmm\datetime.cc" />
-+    <ClCompile Include="..\glib\glibmm\debug.cc" />
-+    <ClCompile Include="..\glib\glibmm\dispatcher.cc" />
-+    <ClCompile Include="..\glib\glibmm\enums.cc" />
-+    <ClCompile Include="..\glib\glibmm\error.cc" />
-+    <ClCompile Include="..\glib\glibmm\exception.cc" />
-+    <ClCompile Include="..\glib\glibmm\exceptionhandler.cc" />
-+    <ClCompile Include="..\glib\glibmm\fileutils.cc" />
-+    <ClCompile Include="..\glib\glibmm\init.cc" />
-+    <ClCompile Include="..\glib\glibmm\interface.cc" />
-+    <ClCompile Include="..\glib\glibmm\iochannel.cc" />
-+    <ClCompile Include="..\glib\glibmm\keyfile.cc" />
-+    <ClCompile Include="..\glib\glibmm\main.cc" />
-+    <ClCompile Include="..\glib\glibmm\markup.cc" />
-+    <ClCompile Include="..\glib\glibmm\miscutils.cc" />
-+    <ClCompile Include="..\glib\glibmm\module.cc" />
-+    <ClCompile Include="..\glib\glibmm\nodetree.cc" />
-+    <ClCompile Include="..\glib\glibmm\object.cc" />
-+    <ClCompile Include="..\glib\glibmm\objectbase.cc" />
-+    <ClCompile Include="..\glib\glibmm\optioncontext.cc" />
-+    <ClCompile Include="..\glib\glibmm\optionentry.cc" />
-+    <ClCompile Include="..\glib\glibmm\optiongroup.cc" />
-+    <ClCompile Include="..\glib\glibmm\pattern.cc" />
-+    <ClCompile Include="..\glib\glibmm\property.cc" />
-+    <ClCompile Include="..\glib\glibmm\propertyproxy.cc" />
-+    <ClCompile Include="..\glib\glibmm\propertyproxy_base.cc" />
-+    <ClCompile Include="..\glib\glibmm\quark.cc" />
-+    <ClCompile Include="..\glib\glibmm\random.cc" />
-+    <ClCompile Include="..\glib\glibmm\regex.cc" />
-+    <ClCompile Include="..\glib\glibmm\sarray.cc" />
-+    <ClCompile Include="..\glib\glibmm\shell.cc" />
-+    <ClCompile Include="..\glib\glibmm\signalproxy.cc" />
-+    <ClCompile Include="..\glib\glibmm\signalproxy_connectionnode.cc" />
-+    <ClCompile Include="..\glib\glibmm\spawn.cc" />
-+    <ClCompile Include="..\glib\glibmm\streamiochannel.cc" />
-+    <ClCompile Include="..\glib\glibmm\stringutils.cc" />
-+    <ClCompile Include="..\glib\glibmm\thread.cc" />
-+    <ClCompile Include="..\glib\glibmm\threadpool.cc" />
-+    <ClCompile Include="..\glib\glibmm\threads.cc" />
-+    <ClCompile Include="..\glib\glibmm\timer.cc" />
-+    <ClCompile Include="..\glib\glibmm\timeval.cc" />
-+    <ClCompile Include="..\glib\glibmm\timezone.cc" />
-+    <ClCompile Include="..\glib\glibmm\unicode.cc" />
-+    <ClCompile Include="..\glib\glibmm\uriutils.cc" />
-+    <ClCompile Include="..\glib\glibmm\ustring.cc" />
-+    <ClCompile Include="..\glib\glibmm\utility.cc" />
-+    <ClCompile Include="..\glib\glibmm\value.cc" />
-+    <ClCompile Include="..\glib\glibmm\value_basictypes.cc" />
-+    <ClCompile Include="..\glib\glibmm\value_custom.cc" />
-+    <ClCompile Include="..\glib\glibmm\valuearray.cc" />
-+    <ClCompile Include="..\glib\glibmm\variant.cc" />
-+    <ClCompile Include="..\glib\glibmm\variantdict.cc" />
-+    <ClCompile Include="..\glib\glibmm\variantiter.cc" />
-+    <ClCompile Include="..\glib\glibmm\varianttype.cc" />
-+    <ClCompile Include="..\glib\glibmm\variant_basictypes.cc" />
-+    <ClCompile Include="..\glib\glibmm\vectorutils.cc" />
-+    <ClCompile Include="..\glib\glibmm\wrap.cc" />
-+    <ClCompile Include="..\glib\glibmm\wrap_init.cc" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ClInclude Include="..\glib\glibmm\arrayhandle.h" />
-+    <ClInclude Include="..\glib\glibmm\balancedtree.h" />
-+    <ClInclude Include="..\glib\glibmm\base64.h" />
-+    <ClInclude Include="..\glib\glibmm\binding.h" />
-+    <ClInclude Include="..\glib\glibmm\bytes.h" />
-+    <ClInclude Include="..\glib\glibmm\bytearray.h" />
-+    <ClInclude Include="..\glib\glibmm\checksum.h" />
-+    <ClInclude Include="..\glib\glibmm\class.h" />
-+    <ClInclude Include="..\glib\glibmm\containerhandle_shared.h" />
-+    <ClInclude Include="..\glib\glibmm\containers.h" />
-+    <ClInclude Include="..\glib\glibmm\convert.h" />
-+    <ClInclude Include="..\glib\glibmm\date.h" />
-+    <ClInclude Include="..\glib\glibmm\datetime.h" />
-+    <ClInclude Include="..\glib\glibmm\debug.h" />
-+    <ClInclude Include="..\glib\glibmm\dispatcher.h" />
-+    <ClInclude Include="..\glib\glibmm\enums.h" />
-+    <ClInclude Include="..\glib\glibmm\error.h" />
-+    <ClInclude Include="..\glib\glibmm\exception.h" />
-+    <ClInclude Include="..\glib\glibmm\exceptionhandler.h" />
-+    <ClInclude Include="..\glib\glibmm\fileutils.h" />
-+    <ClInclude Include="..\glib\glibmm\helperlist.h" />
-+    <ClInclude Include="..\glib\glibmm\i18n-lib.h" />
-+    <ClInclude Include="..\glib\glibmm\i18n.h" />
-+    <ClInclude Include="..\glib\glibmm\init.h" />
-+    <ClInclude Include="..\glib\glibmm\interface.h" />
-+    <ClInclude Include="..\glib\glibmm\iochannel.h" />
-+    <ClInclude Include="..\glib\glibmm\keyfile.h" />
-+    <ClInclude Include="..\glib\glibmm\listhandle.h" />
-+    <ClInclude Include="..\glib\glibmm\main.h" />
-+    <ClInclude Include="..\glib\glibmm\markup.h" />
-+    <ClInclude Include="..\glib\glibmm\miscutils.h" />
-+    <ClInclude Include="..\glib\glibmm\module.h" />
-+    <ClInclude Include="..\glib\glibmm\nodetree.h" />
-+    <ClInclude Include="..\glib\glibmm\object.h" />
-+    <ClInclude Include="..\glib\glibmm\objectbase.h" />
-+    <ClInclude Include="..\glib\glibmm\optioncontext.h" />
-+    <ClInclude Include="..\glib\glibmm\optionentry.h" />
-+    <ClInclude Include="..\glib\glibmm\optiongroup.h" />
-+    <ClInclude Include="..\glib\glibmm\pattern.h" />
-+    <ClInclude Include="..\glib\glibmm\property.h" />
-+    <ClInclude Include="..\glib\glibmm\propertyproxy.h" />
-+    <ClInclude Include="..\glib\glibmm\propertyproxy_base.h" />
-+    <ClInclude Include="..\glib\glibmm\quark.h" />
-+    <ClInclude Include="..\glib\glibmm\random.h" />
-+    <ClInclude Include="..\glib\glibmm\refptr.h" />
-+    <ClInclude Include="..\glib\glibmm\regex.h" />
-+    <ClInclude Include="..\glib\glibmm\sarray.h" />
-+    <ClInclude Include="..\glib\glibmm\shell.h" />
-+    <ClInclude Include="..\glib\glibmm\signalproxy.h" />
-+    <ClInclude Include="..\glib\glibmm\signalproxy_connectionnode.h" />
-+    <ClInclude Include="..\glib\glibmm\slisthandle.h" />
-+    <ClInclude Include="..\glib\glibmm\spawn.h" />
-+    <ClInclude Include="..\glib\glibmm\streamiochannel.h" />
-+    <ClInclude Include="..\glib\glibmm\stringutils.h" />
-+    <ClInclude Include="..\glib\glibmm\thread.h" />
-+    <ClInclude Include="..\glib\glibmm\threadpool.h" />
-+    <ClInclude Include="..\glib\glibmm\threads.h" />
-+    <ClInclude Include="..\glib\glibmm\timer.h" />
-+    <ClInclude Include="..\glib\glibmm\timeval.h" />
-+    <ClInclude Include="..\glib\glibmm\timezone.h" />
-+    <ClInclude Include="..\glib\glibmm\unicode.h" />
-+    <ClInclude Include="..\glib\glibmm\uriutils.h" />
-+    <ClInclude Include="..\glib\glibmm\ustring.h" />
-+    <ClInclude Include="..\glib\glibmm\utility.h" />
-+    <ClInclude Include="..\glib\glibmm\value.h" />
-+    <ClInclude Include="..\glib\glibmm\value_basictypes.h" />
-+    <ClInclude Include="..\glib\glibmm\value_custom.h" />
-+    <ClInclude Include="..\glib\glibmm\valuearray.h" />
-+    <ClInclude Include="..\glib\glibmm\variant.h" />
-+    <ClInclude Include="..\glib\glibmm\variantdict.h" />
-+    <ClInclude Include="..\glib\glibmm\variantiter.h" />
-+    <ClInclude Include="..\glib\glibmm\varianttype.h" />
-+    <ClInclude Include="..\glib\glibmm\variant_basictypes.h" />
-+    <ClInclude Include="..\glib\glibmm\vectorutils.h" />
-+    <ClInclude Include="..\glib\glibmm\weakref.h" />
-+    <ClInclude Include="..\glib\glibmm\wrap.h" />
-+    <ClInclude Include="..\glib\glibmm\wrap_init.h" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ResourceCompile Include=".\glibmm\glibmm.rc" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ProjectReference Include="gendef.vcxproj">
-+      <Project>{07324745-c9be-4d65-b08a-9c88188c0c28}</Project>
-+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-+    </ProjectReference>
-+  </ItemGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+  <ImportGroup Label="ExtensionTargets">
-+  </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/glibmm_value.vcxproj b/MSVC_Net2013/glibmm_value.vcxproj
-index 9639003..7e12415 100644
---- a/MSVC_Net2013/glibmm_value.vcxproj
-+++ b/MSVC_Net2013/glibmm_value.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{22277003-3228-486E-A6A8-994B8B13AF30}</ProjectGuid>
-     <RootNamespace>tests_glibmm_value</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -186,4 +187,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj
-index 059ceec..b6f2843 100644
---- a/MSVC_Net2013/install.vcxproj
-+++ b/MSVC_Net2013/install.vcxproj
-@@ -22,28 +22,29 @@
-     <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-     <RootNamespace>install</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -113,4 +114,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/keyfile.vcxproj b/MSVC_Net2013/keyfile.vcxproj
-index 0993e6a..ee23bae 100644
---- a/MSVC_Net2013/keyfile.vcxproj
-+++ b/MSVC_Net2013/keyfile.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{569A24AB-8D81-4427-B40D-85485AA7F3CD}</ProjectGuid>
-     <RootNamespace>dispatcher</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -189,4 +190,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/markup.vcxproj b/MSVC_Net2013/markup.vcxproj
-index 03b3295..db2dfab 100644
---- a/MSVC_Net2013/markup.vcxproj
-+++ b/MSVC_Net2013/markup.vcxproj
-@@ -22,26 +22,27 @@
-     <ProjectName>markup</ProjectName>
-     <ProjectGuid>{6300FCFA-97F1-4967-802E-E354D95DB0EB}</ProjectGuid>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -188,4 +189,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/options.vcxproj b/MSVC_Net2013/options.vcxproj
-index f627c4e..dda25b9 100644
---- a/MSVC_Net2013/options.vcxproj
-+++ b/MSVC_Net2013/options.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{46962B9A-C5E9-4863-9408-97514D63F420}</ProjectGuid>
-     <RootNamespace>dispatcher</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -189,4 +190,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/properties.vcxproj b/MSVC_Net2013/properties.vcxproj
-index 6858140..d8a95c2 100644
---- a/MSVC_Net2013/properties.vcxproj
-+++ b/MSVC_Net2013/properties.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{206CC821-8BE3-4455-B09E-63F93E30F20C}</ProjectGuid>
-     <RootNamespace>dispatcher</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -189,4 +190,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/regex.vcxproj b/MSVC_Net2013/regex.vcxproj
-index 84418df..c4c0cf0 100644
---- a/MSVC_Net2013/regex.vcxproj
-+++ b/MSVC_Net2013/regex.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{7374A5A1-4E74-44BD-918C-FDF80B97FA3F}</ProjectGuid>
-     <RootNamespace>dispatcher</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -189,4 +190,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/resolver.vcxproj b/MSVC_Net2013/resolver.vcxproj
-index 113d86a..9fa59a4 100644
---- a/MSVC_Net2013/resolver.vcxproj
-+++ b/MSVC_Net2013/resolver.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{E4D320F1-7D2D-43AF-874F-14524220EF92}</ProjectGuid>
-     <RootNamespace>resolver</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -193,4 +194,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/socket-client.vcxproj b/MSVC_Net2013/socket-client.vcxproj
-index 3743708..bfb8330 100644
---- a/MSVC_Net2013/socket-client.vcxproj
-+++ b/MSVC_Net2013/socket-client.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{1E38D900-90AC-4E18-B34C-7B08E3383087}</ProjectGuid>
-     <RootNamespace>socket-client</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -193,4 +194,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/socket-client.vcxproj.filters b/MSVC_Net2013/socket-client.vcxproj.filters
-index edb14c1..8d41b33 100644
---- a/MSVC_Net2013/socket-client.vcxproj.filters
-+++ b/MSVC_Net2013/socket-client.vcxproj.filters
-@@ -15,6 +15,6 @@
-     </Filter>
-   </ItemGroup>
-   <ItemGroup>
--    <ClCompile Include="..\examples\network\socket-client.cc"><Filter>Source Files</Filter></ClCompile>
-+    <ClCompile Include="..\examples\network\resolver.cc" />
-   </ItemGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/socket-server.vcxproj b/MSVC_Net2013/socket-server.vcxproj
-index 4116263..e6744af 100644
---- a/MSVC_Net2013/socket-server.vcxproj
-+++ b/MSVC_Net2013/socket-server.vcxproj
-@@ -23,26 +23,27 @@
-     <ProjectGuid>{7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}</ProjectGuid>
-     <RootNamespace>socket-server</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -193,4 +194,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/socket-server.vcxproj.filters b/MSVC_Net2013/socket-server.vcxproj.filters
-index 66a88d3..8d41b33 100644
---- a/MSVC_Net2013/socket-server.vcxproj.filters
-+++ b/MSVC_Net2013/socket-server.vcxproj.filters
-@@ -15,6 +15,6 @@
-     </Filter>
-   </ItemGroup>
-   <ItemGroup>
--    <ClCompile Include="..\examples\network\socket-server.cc"><Filter>Source Files</Filter></ClCompile>
-+    <ClCompile Include="..\examples\network\resolver.cc" />
-   </ItemGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/thread.vcxproj b/MSVC_Net2013/thread.vcxproj
-index 9950bbb..d1824e8 100644
---- a/MSVC_Net2013/thread.vcxproj
-+++ b/MSVC_Net2013/thread.vcxproj
-@@ -22,26 +22,27 @@
-     <ProjectName>thread</ProjectName>
-     <ProjectGuid>{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}</ProjectGuid>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -184,4 +185,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/threadpool.vcxproj b/MSVC_Net2013/threadpool.vcxproj
-index 9ab9748..d0a0d15 100644
---- a/MSVC_Net2013/threadpool.vcxproj
-+++ b/MSVC_Net2013/threadpool.vcxproj
-@@ -22,26 +22,27 @@
-     <ProjectName>threadpool</ProjectName>
-     <ProjectGuid>{962484DB-2111-48A4-BEF0-194433719D0D}</ProjectGuid>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -192,4 +193,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
diff --git a/ports/glibmm/fix_properties.patch b/ports/glibmm/fix_properties.patch
deleted file mode 100644
index 51044a27f..000000000
--- a/ports/glibmm/fix_properties.patch
+++ /dev/null
@@ -1,1721 +0,0 @@
-diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj
-index 62dbcc8..7da2fbd 100644
---- a/MSVC_Net2013/gendef.vcxproj
-+++ b/MSVC_Net2013/gendef.vcxproj
-@@ -91,6 +91,7 @@
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
-       <TargetMachine>MachineX86</TargetMachine>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-@@ -109,6 +110,7 @@
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
-       <TargetMachine>MachineX86</TargetMachine>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -132,6 +134,7 @@
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
-       <TargetMachine>MachineX64</TargetMachine>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-@@ -153,6 +156,7 @@
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
-       <TargetMachine>MachineX64</TargetMachine>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemGroup>
-@@ -161,4 +165,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/giomm.vcxproj b/MSVC_Net2013/giomm.vcxproj
-index bc4fc3d..078fcb2 100644
---- a/MSVC_Net2013/giomm.vcxproj
-+++ b/MSVC_Net2013/giomm.vcxproj
-@@ -69,7 +69,7 @@
-     <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-       <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-@@ -82,7 +82,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-@@ -100,7 +100,7 @@
-     <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-       <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>.;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-@@ -113,7 +113,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-@@ -128,7 +128,7 @@
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-     <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-       <WarningLevel>Level3</WarningLevel>
-@@ -139,7 +139,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-@@ -158,7 +158,7 @@
-     </Midl>
-     <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
--      <AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>.\giomm;..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-       <WarningLevel>Level3</WarningLevel>
-@@ -169,7 +169,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-@@ -455,4 +455,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/giomm.vcxproj.filters b/MSVC_Net2013/giomm.vcxproj.filters
-index 4f01b13..934eddc 100644
---- a/MSVC_Net2013/giomm.vcxproj.filters
-+++ b/MSVC_Net2013/giomm.vcxproj.filters
-@@ -15,266 +15,780 @@
-     </Filter>
-   </ItemGroup>
-   <ItemGroup>
--    <ClCompile Include="..\gio\giomm\action.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\actiongroup.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\actionmap.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\appinfo.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\applaunchcontext.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\application.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\applicationcommandline.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\asyncinitable.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\asyncresult.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\bufferedinputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\bufferedoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\cancellable.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\charsetconverter.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\contenttype.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\converter.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\converterinputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\converteroutputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\credentials.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\datainputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dataoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusactiongroup.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusaddress.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusauthobserver.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusconnection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbuserror.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbuserrorutils.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusinterface.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusinterfaceskeleton.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusinterfacevtable.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusintrospection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusmenumodel.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusmessage.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusmethodinvocation.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusobject.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusownname.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusproxy.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusserver.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbussubtreevtable.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbusutils.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\dbuswatchname.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\drive.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\emblem.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\emblemedicon.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\enums.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\error.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\file.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileattributeinfo.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileattributeinfolist.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileenumerator.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileicon.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileinfo.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileinputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileiostream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\filemonitor.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\filenamecompleter.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\fileoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\filterinputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\filteroutputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\icon.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\inetaddress.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\inetsocketaddress.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\init.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\initable.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\inputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\iostream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\listmodel.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\liststore.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\loadableicon.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\memoryinputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\memoryoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\menu.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\menuattributeiter.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\menuitem.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\menulinkiter.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\menumodel.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\mount.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\mountoperation.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\networkaddress.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\networkmonitor.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\networkservice.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\notification.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\outputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\permission.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\pollableinputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\pollableoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\proxy.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\proxyaddress.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\proxyresolver.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\remoteactiongroup.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\resolver.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\resource.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\seekable.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\settings.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\settingsschema.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\settingsschemakey.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\settingsschemasource.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\simpleaction.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\simpleactiongroup.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\simpleiostream.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\simplepermission.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\slot_async.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socket.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketaddress.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketaddressenumerator.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketclient.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketconnectable.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketconnection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketcontrolmessage.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketlistener.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketservice.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\socketsource.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\srvtarget.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tcpconnection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tcpwrapperconnection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\themedicon.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tlscertificate.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tlsclientconnection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tlsconnection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tlsdatabase.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tlsinteraction.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tlspassword.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\tlsserverconnection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\volume.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\volumemonitor.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\wrap_init.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\zlibcompressor.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\gio\giomm\zlibdecompressor.cc"><Filter>Source Files</Filter></ClCompile>
-+    <ClCompile Include="..\gio\giomm\action.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\actiongroup.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\actionmap.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\appinfo.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\applaunchcontext.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\application.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\applicationcommandline.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\asyncinitable.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\asyncresult.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\bufferedinputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\bufferedoutputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\cancellable.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\charsetconverter.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\contenttype.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\converter.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\converterinputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\converteroutputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\credentials.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\datainputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dataoutputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusactiongroup.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusaddress.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusauthobserver.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusconnection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbuserror.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbuserrorutils.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusinterface.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusinterfaceskeleton.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusinterfacevtable.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusintrospection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusmenumodel.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusmessage.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusmethodinvocation.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusobject.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusownname.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusproxy.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusserver.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbussubtreevtable.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbusutils.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\dbuswatchname.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\drive.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\emblem.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\emblemedicon.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\enums.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\error.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\file.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileattributeinfo.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileattributeinfolist.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileenumerator.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileicon.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileinfo.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileinputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileiostream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\filemonitor.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\filenamecompleter.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\fileoutputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\filterinputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\filteroutputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\icon.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\inetaddress.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\inetsocketaddress.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\init.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\initable.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\inputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\iostream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\listmodel.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\liststore.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\loadableicon.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\memoryinputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\memoryoutputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\menu.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\menuattributeiter.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\menuitem.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\menulinkiter.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\menumodel.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\mount.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\mountoperation.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\networkaddress.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\networkmonitor.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\networkservice.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\notification.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\outputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\permission.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\pollableinputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\pollableoutputstream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\proxy.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\proxyaddress.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\proxyresolver.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\remoteactiongroup.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\resolver.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\resource.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\seekable.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\settings.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\settingsschema.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\settingsschemakey.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\settingsschemasource.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\simpleaction.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\simpleactiongroup.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\simpleiostream.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\simplepermission.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\slot_async.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socket.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketaddress.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketaddressenumerator.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketclient.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketconnectable.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketconnection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketcontrolmessage.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketlistener.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketservice.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\socketsource.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\srvtarget.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tcpconnection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tcpwrapperconnection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\themedicon.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tlscertificate.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tlsclientconnection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tlsconnection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tlsdatabase.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tlsinteraction.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tlspassword.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\tlsserverconnection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\volume.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\volumemonitor.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\wrap_init.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\zlibcompressor.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\zlibdecompressor.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\gio\giomm\threadedsocketservice.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-   </ItemGroup>
-   <ItemGroup>
--    <ClInclude Include="..\gio\giomm\action.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\actiongroup.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\actionmap.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\appinfo.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\applaunchcontext.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\application.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\applicationcommandline.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\asyncinitable.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\asyncresult.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\bufferedinputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\bufferedoutputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\cancellable.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\charsetconverter.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\contenttype.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\converter.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\converterinputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\converteroutputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\credentials.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\datainputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dataoutputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusactiongroup.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusaddress.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusauthobserver.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusconnection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbuserror.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbuserrorutils.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusinterface.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusinterfaceskeleton.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusinterfacevtable.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusintrospection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusmenumodel.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusmessage.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusmethodinvocation.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusobject.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusownname.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusproxy.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusserver.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbussubtreevtable.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbusutils.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\dbuswatchname.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\drive.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\emblem.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\emblemedicon.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\enums.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\error.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\file.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileattributeinfo.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileattributeinfolist.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileenumerator.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileicon.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileinfo.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileinputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileiostream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\filemonitor.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\filenamecompleter.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\fileoutputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\filterinputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\filteroutputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\icon.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\inetaddress.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\inetsocketaddress.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\init.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\initable.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\inputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\iostream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\listmodel.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\liststore.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\loadableicon.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\memoryinputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\memoryoutputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\menu.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\menuattributeiter.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\menuitem.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\menulinkiter.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\menumodel.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\mount.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\mountoperation.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\networkaddress.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\networkmonitor.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\networkservice.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\notification.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\outputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\permission.h"><Filter>Source Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\pollableinputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\pollableoutputstream.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\proxy.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\proxyaddress.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\proxyresolver.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\remoteactiongroup.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\resolver.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\resource.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\seekable.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\settings.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\settingsschema.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\settingsschemakey.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\settingsschemasource.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\simpleaction.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\simpleactiongroup.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\simpleiostream.h"><Filter>Source Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\simplepermission.h"><Filter>Source Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\slot_async.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socket.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketaddress.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketaddressenumerator.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketclient.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketconnectable.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketconnection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketcontrolmessage.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketlistener.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketservice.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\socketsource.h"><Filter>Source Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\srvtarget.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tcpconnection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tcpwrapperconnection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\themedicon.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\threadedsocketservice.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tlscertificate.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tlsclientconnection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tlsconnection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tlsdatabase.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tlsinteraction.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tlspassword.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\tlsserverconnection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\volume.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\volumemonitor.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\wrap_init.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\zlibcompressor.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\gio\giomm\zlibdecompressor.h"><Filter>Header Files</Filter></ClInclude>
-+    <ClInclude Include="..\gio\giomm\action.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\actiongroup.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\actionmap.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\appinfo.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\applaunchcontext.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\application.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\applicationcommandline.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\asyncinitable.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\asyncresult.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\bufferedinputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\bufferedoutputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\cancellable.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\charsetconverter.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\contenttype.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\converter.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\converterinputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\converteroutputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\credentials.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\datainputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dataoutputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusactiongroup.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusaddress.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusauthobserver.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusconnection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbuserror.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbuserrorutils.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusinterface.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusinterfaceskeleton.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusinterfacevtable.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusintrospection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusmenumodel.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusmessage.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusmethodinvocation.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusobject.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusownname.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusproxy.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusserver.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbussubtreevtable.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbusutils.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\dbuswatchname.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\drive.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\emblem.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\emblemedicon.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\enums.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\error.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\file.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileattributeinfo.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileattributeinfolist.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileenumerator.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileicon.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileinfo.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileinputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileiostream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\filemonitor.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\filenamecompleter.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\fileoutputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\filterinputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\filteroutputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\icon.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\inetaddress.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\inetsocketaddress.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\init.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\initable.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\inputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\iostream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\listmodel.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\liststore.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\loadableicon.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\memoryinputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\memoryoutputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\menu.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\menuattributeiter.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\menuitem.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\menulinkiter.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\menumodel.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\mount.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\mountoperation.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\networkaddress.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\networkmonitor.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\networkservice.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\notification.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\outputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\permission.h">
-+      <Filter>Source Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\pollableinputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\pollableoutputstream.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\proxy.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\proxyaddress.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\proxyresolver.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\remoteactiongroup.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\resolver.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\resource.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\seekable.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\settings.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\settingsschema.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\settingsschemakey.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\settingsschemasource.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\simpleaction.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\simpleactiongroup.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\simpleiostream.h">
-+      <Filter>Source Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\simplepermission.h">
-+      <Filter>Source Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\slot_async.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socket.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketaddress.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketaddressenumerator.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketclient.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketconnectable.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketconnection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketcontrolmessage.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketlistener.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketservice.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\socketsource.h">
-+      <Filter>Source Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\srvtarget.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tcpconnection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tcpwrapperconnection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\themedicon.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\threadedsocketservice.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tlscertificate.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tlsclientconnection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tlsconnection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tlsdatabase.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tlsinteraction.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tlspassword.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\tlsserverconnection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\volume.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\volumemonitor.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\wrap_init.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\zlibcompressor.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\gio\giomm\zlibdecompressor.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-   </ItemGroup>
-   <ItemGroup>
--    <ResourceCompile Include=".\giomm\giomm.rc"><Filter>Resource Files</Filter>
-+    <ResourceCompile Include=".\giomm\giomm.rc">
-+      <Filter>Resource Files</Filter>
-     </ResourceCompile>
-   </ItemGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/glibmm-build-defines.props b/MSVC_Net2013/glibmm-build-defines.props
-index 5cbde3c..9a027c5 100644
---- a/MSVC_Net2013/glibmm-build-defines.props
-+++ b/MSVC_Net2013/glibmm-build-defines.props
-@@ -6,8 +6,8 @@
-   <PropertyGroup Label="UserMacros">
-     <GLibMMBuildDefs>SIZEOF_WCHAR_T=2;GLIBMM_BUILD</GLibMMBuildDefs>
-     <GioMMBuildDefs>GIOMM_BUILD</GioMMBuildDefs>
--    <CPPDepLibsRelease>sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease>
--    <CPPDepLibsDebug>sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug>
-+    <CPPDepLibsRelease>sigc-2_0.lib</CPPDepLibsRelease>
-+    <CPPDepLibsDebug>sigc-2_0.lib</CPPDepLibsDebug>
-   </PropertyGroup>
-   <PropertyGroup>
-     <_PropertySheetDisplayName>glibmmbuilddefinesprops</_PropertySheetDisplayName>
-@@ -16,28 +16,10 @@
-   </PropertyGroup>
-   <ItemDefinitionGroup>
-     <ClCompile>
--      <AdditionalIncludeDirectories>.\glibmm;..;..\glib;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>.\glibmm;..;.;..\glib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
--    <Link>
--      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--    </Link>
-   </ItemDefinitionGroup>
--  <ItemGroup>
--    <BuildMacro Include="GLibMMBuildDefs">
--      <Value>$(GLibMMBuildDefs)</Value>
--    </BuildMacro>
--    <BuildMacro Include="GioMMBuildDefs">
--      <Value>$(GioMMBuildDefs)</Value>
--    </BuildMacro>
--    <BuildMacro Include="CPPDepLibsRelease">
--      <Value>$(CPPDepLibsRelease)</Value>
--    </BuildMacro>
--    <BuildMacro Include="CPPDepLibsDebug">
--      <Value>$(CPPDepLibsDebug)</Value>
--    </BuildMacro>
--  </ItemGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/glibmm-install.props b/MSVC_Net2013/glibmm-install.props
-index f28a0c8..9283a7b 100644
---- a/MSVC_Net2013/glibmm-install.props
-+++ b/MSVC_Net2013/glibmm-install.props
-@@ -3,410 +3,4 @@
-   <ImportGroup Label="PropertySheets">
-     <Import Project="glibmm-build-defines.props" />
-   </ImportGroup>
--  <PropertyGroup Label="UserMacros">
--    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
--    <InstalledReleaseDlls>$(BinDir)\glibmm$(ReleaseDllSuffix).dll;$(BinDir)\giomm$(ReleaseDllSuffix).dll</InstalledReleaseDlls>
--    <InstalledDebugDlls>$(BinDir)\glibmm$(DebugDllSuffix).dll;$(BinDir)\giomm$(DebugDllSuffix).dll</InstalledDebugDlls>
--    <GLibmmDoInstall>
--mkdir $(CopyDir)
--mkdir $(CopyDir)\bin
--copy $(BinDir)\glibmm-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion).dll $(CopyDir)\bin
--copy $(BinDir)\glibmm-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion).pdb $(CopyDir)\bin
--copy $(BinDir)\giomm-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion).dll $(CopyDir)\bin
--copy $(BinDir)\giomm-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion).pdb $(CopyDir)\bin
--
--mkdir $(CopyDir)\lib\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\include
--mkdir $(CopyDir)\lib\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\include
--copy $(BinDir)\glibmm-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion).lib $(CopyDir)\lib
--copy $(BinDir)\giomm-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion).lib $(CopyDir)\lib
--
--mkdir $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--mkdir $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\glib\glibmm.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)
--copy ..\gio\giomm.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)
--
--copy ..\glib\glibmm\arrayhandle.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\balancedtree.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\base64.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\binding.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\bytes.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\bytearray.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\checksum.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\class.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\containerhandle_shared.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\containers.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\convert.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\date.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\datetime.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\debug.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\enums.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\dispatcher.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\error.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\exception.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\exceptionhandler.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\fileutils.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\helperlist.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\i18n-lib.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\i18n.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\init.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\interface.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\iochannel.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\keyfile.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\listhandle.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\main.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\markup.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\miscutils.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\module.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\nodetree.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\object.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\objectbase.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\optioncontext.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\optionentry.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\optiongroup.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\pattern.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\priorities.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\property.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\propertyproxy.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\propertyproxy_base.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\quark.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\random.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\refptr.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\regex.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\sarray.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\shell.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\signalproxy.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\signalproxy_connectionnode.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\slisthandle.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\spawn.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\streamiochannel.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\stringutils.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\threadpool.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\threads.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\timer.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\timeval.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\timezone.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\unicode.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\uriutils.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\ustring.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\utility.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\variant.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\variantdict.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\variantiter.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\varianttype.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\variant_basictypes.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\thread.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\value.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\valuearray.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\value_basictypes.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\value_custom.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\vectorutils.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\weakref.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\wrap.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--copy ..\glib\glibmm\wrap_init.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
--
--copy ..\glib\glibmm\private\balancedtree_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\binding_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\bytes_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\bytearray_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\checksum_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\convert_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\date_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\datetime_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\enums_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\fileutils_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\interface_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\iochannel_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\keyfile_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\markup_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\miscutils_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\module_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\nodetree_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\object_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\optioncontext_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\optionentry_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\optiongroup_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\regex_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\shell_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\spawn_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\threads_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\timezone_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\unicode_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\uriutils_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\variant_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\variantdict_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\variantiter_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\varianttype_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\thread_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--copy ..\glib\glibmm\private\valuearray_p.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
--
--copy ..\gio\giomm\action.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\actiongroup.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\actionmap.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\applaunchcontext.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\appinfo.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\application.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\applicationcommandline.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\asyncinitable.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\asyncresult.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\bufferedinputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\bufferedoutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\cancellable.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\charsetconverter.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\contenttype.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\converter.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\converterinputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\converteroutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\credentials.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\datainputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dataoutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusactiongroup.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusaddress.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusauthobserver.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusconnection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbuserror.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbuserrorutils.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusinterface.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusinterfaceskeleton.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusinterfacevtable.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusintrospection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusmenumodel.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusmessage.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusmethodinvocation.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusobject.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusownname.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusproxy.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusserver.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbussubtreevtable.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbusutils.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\dbuswatchname.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\drive.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\emblem.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\emblemedicon.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\enums.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\error.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\file.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileattributeinfo.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileattributeinfolist.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileenumerator.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileicon.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileinfo.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileinputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileiostream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\filemonitor.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\filenamecompleter.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\fileoutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\filterinputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\filteroutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\icon.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\inetaddress.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\inetsocketaddress.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\init.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\initable.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\inputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\iostream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\listmodel.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\liststore.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\loadableicon.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\memoryinputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\memoryoutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\menuattributeiter.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\menulinkiter.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\menu.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\menuitem.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\menumodel.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\mount.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\mountoperation.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\networkaddress.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\networkmonitor.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\networkservice.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\notification.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\outputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\permission.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\pollableinputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\pollableoutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\proxy.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\proxyaddress.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\proxyresolver.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\remoteactiongroup.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\resolver.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\resource.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\seekable.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\settings.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\settingsschema.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\settingsschemakey.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\settingsschemasource.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\simpleaction.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\simpleactiongroup.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\simpleiostream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\simplepermission.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socket.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketaddress.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketaddressenumerator.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketclient.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketconnectable.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketconnection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketcontrolmessage.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketlistener.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketservice.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\socketsource.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\srvtarget.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tcpconnection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tcpwrapperconnection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\threadedsocketservice.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\themedicon.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tlscertificate.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tlsclientconnection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tlsconnection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tlsdatabase.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tlsinteraction.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tlspassword.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\tlsserverconnection.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\volume.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\volumemonitor.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\wrap_init.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\zlibdecompressor.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--copy ..\gio\giomm\zlibcompressor.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
--
--copy ..\gio\giomm\private\action_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\actiongroup_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\actionmap_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\appinfo_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\applaunchcontext_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\application_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\applicationcommandline_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\asyncinitable_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\asyncresult_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\bufferedinputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\bufferedoutputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\cancellable_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\charsetconverter_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\converter_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\converterinputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\converteroutputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\credentials_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\datainputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dataoutputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusactiongroup_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusaddress_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusauthobserver_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusconnection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbuserror_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbuserrorutils_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusinterface_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusinterfaceskeleton_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusinterfacevtable_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusintrospection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusmenumodel_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusmessage_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusmethodinvocation_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusobject_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusownname_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusproxy_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusserver_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbussubtreevtable_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbusutils_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\dbuswatchname_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\drive_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\emblem_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\emblemedicon_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\enums_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\error_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\file_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileattributeinfo_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileattributeinfolist_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileenumerator_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileicon_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileinfo_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileinputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileiostream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\filemonitor_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\filenamecompleter_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\fileoutputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\filterinputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\filteroutputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\icon_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\inetaddress_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\inetsocketaddress_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\initable_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\inputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\iostream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\listmodel_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\liststore_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\loadableicon_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\memoryinputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\memoryoutputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\menu_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\menuattributeiter_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\menuitem_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\menulinkiter_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\menumodel_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\mount_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\mountoperation_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\networkaddress_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\networkmonitor_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\networkservice_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\notification_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\outputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\pollableinputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\pollableoutputstream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\proxy_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\proxyaddress_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\proxyresolver_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\remoteactiongroup_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\resolver_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\resource_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\seekable_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\settings_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\settingsschema_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\settingsschemakey_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\settingsschemasource_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\simpleaction_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\simpleactiongroup_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\simpleiostream_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socket_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketaddress_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketaddressenumerator_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketclient_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketconnectable_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketconnection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketcontrolmessage_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketlistener_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\socketservice_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\srvtarget_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tcpconnection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tcpwrapperconnection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\themedicon_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\threadedsocketservice_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tlscertificate_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tlsclientconnection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tlsconnection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tlsdatabase_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tlsinteraction_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tlspassword_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\tlsserverconnection_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\volume_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\volumemonitor_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\zlibcompressor_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy ..\gio\giomm\private\zlibdecompressor_p.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
--copy .\glibmm\glibmmconfig.h $(CopyDir)\lib\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\include
--copy .\giomm\giommconfig.h $(CopyDir)\lib\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\include
--</GLibmmDoInstall>
--  </PropertyGroup>
--  <PropertyGroup>
--    <_PropertySheetDisplayName>glibmminstallprops</_PropertySheetDisplayName>
--  </PropertyGroup>
--  <ItemGroup>
--    <BuildMacro Include="BinDir">
--      <Value>$(BinDir)</Value>
--    </BuildMacro>
--    <BuildMacro Include="InstalledReleaseDlls">
--      <Value>$(InstalledReleaseDlls)</Value>
--    </BuildMacro>
--    <BuildMacro Include="InstalledDebugDlls">
--      <Value>$(InstalledDebugDlls)</Value>
--    </BuildMacro>
--    <BuildMacro Include="GLibmmDoInstall">
--      <Value>$(GLibmmDoInstall)</Value>
--    </BuildMacro>
--  </ItemGroup>
- </Project>
-diff --git a/MSVC_Net2013/glibmm-version-paths.props b/MSVC_Net2013/glibmm-version-paths.props
-index 216731b..e5f0f6a 100644
---- a/MSVC_Net2013/glibmm-version-paths.props
-+++ b/MSVC_Net2013/glibmm-version-paths.props
-@@ -2,13 +2,9 @@
- <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <PropertyGroup Label="UserMacros">
-     <VSVer>12</VSVer>
--    <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
--    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
-     <ApiMajorVersion>2</ApiMajorVersion>
-     <ApiMinorVersion>4</ApiMinorVersion>
--    <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix>
--    <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix>
-   </PropertyGroup>
-   <PropertyGroup>
-     <_PropertySheetDisplayName>glibmmversionpathsprops</_PropertySheetDisplayName>
-@@ -17,12 +13,6 @@
-     <BuildMacro Include="VSVer">
-       <Value>$(VSVer)</Value>
-     </BuildMacro>
--    <BuildMacro Include="GlibEtcInstallRoot">
--      <Value>$(GlibEtcInstallRoot)</Value>
--    </BuildMacro>
--    <BuildMacro Include="CopyDir">
--      <Value>$(CopyDir)</Value>
--    </BuildMacro>
-     <BuildMacro Include="DefDir">
-       <Value>$(DefDir)</Value>
-     </BuildMacro>
-@@ -32,11 +22,5 @@
-     <BuildMacro Include="ApiMinorVersion">
-       <Value>$(ApiMinorVersion)</Value>
-     </BuildMacro>
--    <BuildMacro Include="ReleaseDllSuffix">
--      <Value>$(ReleaseDllSuffix)</Value>
--    </BuildMacro>
--    <BuildMacro Include="DebugDllSuffix">
--      <Value>$(DebugDllSuffix)</Value>
--    </BuildMacro>
-   </ItemGroup>
- </Project>
-diff --git a/MSVC_Net2013/glibmm.vcxproj b/MSVC_Net2013/glibmm.vcxproj
-index 6594edc..c611561 100644
---- a/MSVC_Net2013/glibmm.vcxproj
-+++ b/MSVC_Net2013/glibmm.vcxproj
-@@ -93,7 +93,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-@@ -125,7 +125,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
-@@ -152,7 +152,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-@@ -183,7 +183,7 @@
-       <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll $(IntDir)*.obj</Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
-       <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
-@@ -359,4 +359,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
diff --git a/ports/glibmm/glibmm-api-variant.patch b/ports/glibmm/glibmm-api-variant.patch
new file mode 100644
index 000000000..bb00ac3f5
--- /dev/null
+++ b/ports/glibmm/glibmm-api-variant.patch
@@ -0,0 +1,84 @@
+diff --git a/glib/glibmm/varianttype.h b/glib/glibmm/varianttype.h

+index a232e70..64eb4a1 100644

+--- a/glib/glibmm/varianttype.h

++++ b/glib/glibmm/varianttype.h

+@@ -500,54 +500,79 @@ public:

+ 

+ };

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_BOOL;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_BYTE;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_INT16;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_UINT16;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_INT32;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_UINT32;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_INT64;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_UINT64;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_DOUBLE;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_STRING;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_OBJECT_PATH;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_SIGNATURE;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_VARIANT;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_HANDLE;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_UNIT;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_ANY;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_BASIC;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_MAYBE;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_ARRAY;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_TUPLE;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_DICT_ENTRY;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_DICTIONARY;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_STRING_ARRAY;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_BYTESTRING;

+ 

++GLIBMM_API

+ extern const VariantType VARIANT_TYPE_BYTESTRING_ARRAY;

+ 

+ 

diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake
index 7586c40a3..792bf3dde 100644
--- a/ports/glibmm/portfile.cmake
+++ b/ports/glibmm/portfile.cmake
@@ -1,15 +1,8 @@
-# Glib uses winapi functions not available in WindowsStore, so glibmm
-# also
+# Glib uses winapi functions not available in WindowsStore, so glibmm also
 if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")
 endif()
 
-# Glib relies on DllMain, so glibmm also
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glibmm-2.52.1)
 vcpkg_download_distfile(ARCHIVE
@@ -21,81 +14,21 @@ vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/glibmm-api-variant.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)
-
-set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE})
-if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
-    set(VS_PLATFORM "Win32")
-endif(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/glibmm.sln
-    TARGET giomm
-    PLATFORM ${VS_PLATFORM}
-    USE_VCPKG_INTEGRATION
-)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-# Handle headers
-file(COPY ${SOURCE_PATH}/MSVC_Net2013/giomm/giommconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/gio/giomm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(
-    COPY
-    ${SOURCE_PATH}/gio/giomm
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-    FILES_MATCHING PATTERN *.h
-)
-file(COPY ${SOURCE_PATH}/MSVC_Net2013/glibmm/glibmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/glib/glibmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(
-    COPY
-    ${SOURCE_PATH}/glib/glibmm
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-    FILES_MATCHING PATTERN *.h
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DWARNINGS_HEADER=${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
 )
 
-# Handle libraries
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/giomm.dll
-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-)
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/giomm.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/glibmm.dll
-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-)
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/glibmm.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/giomm.dll
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-)
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/giomm.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/glibmm.dll
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-)
-file(
-    COPY
-    ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/glibmm.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
+vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()