[glibmm/glibmm-2-56: 7/7] Merge branch 'glibmm-2-56.nmake' into 'glibmm-2-56'
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/glibmm-2-56: 7/7] Merge branch 'glibmm-2-56.nmake' into 'glibmm-2-56'
- Date: Tue, 30 Oct 2018 16:04:44 +0000 (UTC)
commit 39c4735fbf7902b4d6f612a577539083f9d980f1
Merge: 6cd55492 95b9ae63
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Tue Oct 30 16:04:29 2018 +0000
Merge branch 'glibmm-2-56.nmake' into 'glibmm-2-56'
Glibmm 2 56.nmake
See merge request GNOME/glibmm!5
.gitignore | 6 +-
MSVC_NMake/Makefile.vc | 58 +++
MSVC_NMake/build-rules-msvc.mak | 213 +++++++++++
MSVC_NMake/config-msvc.mak | 70 ++++
MSVC_NMake/create-lists-msvc.mak | 132 +++++++
MSVC_NMake/create-lists.bat | 42 +++
MSVC_NMake/detectenv-msvc.mak | 154 ++++++++
MSVC_NMake/filelist.am | 17 +
{MSVC_Net2015 => MSVC_NMake}/gendef/gendef.cc | 0
MSVC_NMake/generate-msvc.mak | 25 ++
{MSVC_Net2015 => MSVC_NMake}/giomm/giomm.rc.in | 0
{MSVC_Net2015 => MSVC_NMake}/glibmm/glibmm.rc.in | 0
MSVC_NMake/info-msvc.mak | 42 +++
MSVC_NMake/install.mak | 24 ++
MSVC_Net2015/compose.vcxproj | 192 ----------
MSVC_Net2015/compose.vcxproj.filters | 20 -
MSVC_Net2015/dispatcher.vcxproj | 192 ----------
MSVC_Net2015/dispatcher.vcxproj.filters | 20 -
MSVC_Net2015/dispatcher2.vcxproj | 191 ----------
MSVC_Net2015/dispatcher2.vcxproj.filters | 20 -
MSVC_Net2015/filelist.am | 49 ---
MSVC_Net2015/gendef.vcxproj | 164 --------
MSVC_Net2015/gendef.vcxproj.filters | 20 -
MSVC_Net2015/giomm.vcxproj | 458 -----------------------
MSVC_Net2015/giomm.vcxproj.filters | 280 --------------
MSVC_Net2015/giomm_simple.vcxproj | 192 ----------
MSVC_Net2015/giomm_simple.vcxproj.filters | 20 -
MSVC_Net2015/glibmm-build-defines.props | 43 ---
MSVC_Net2015/glibmm-install.props | 413 --------------------
MSVC_Net2015/glibmm-version-paths.props | 42 ---
MSVC_Net2015/glibmm.sln | 205 ----------
MSVC_Net2015/glibmm.vcxproj | 364 ------------------
MSVC_Net2015/glibmm.vcxproj.filters | 173 ---------
MSVC_Net2015/glibmm_value.vcxproj | 189 ----------
MSVC_Net2015/glibmm_value.vcxproj.filters | 21 --
MSVC_Net2015/install.vcxproj | 116 ------
MSVC_Net2015/keyfile.vcxproj | 192 ----------
MSVC_Net2015/keyfile.vcxproj.filters | 20 -
MSVC_Net2015/markup.vcxproj | 191 ----------
MSVC_Net2015/markup.vcxproj.filters | 20 -
MSVC_Net2015/options.vcxproj | 192 ----------
MSVC_Net2015/options.vcxproj.filters | 20 -
MSVC_Net2015/properties.vcxproj | 192 ----------
MSVC_Net2015/properties.vcxproj.filters | 20 -
MSVC_Net2015/regex.vcxproj | 192 ----------
MSVC_Net2015/regex.vcxproj.filters | 20 -
MSVC_Net2015/resolver.vcxproj | 196 ----------
MSVC_Net2015/resolver.vcxproj.filters | 20 -
MSVC_Net2015/socket-client.vcxproj | 196 ----------
MSVC_Net2015/socket-client.vcxproj.filters | 20 -
MSVC_Net2015/socket-server.vcxproj | 196 ----------
MSVC_Net2015/socket-server.vcxproj.filters | 20 -
MSVC_Net2015/thread.vcxproj | 187 ---------
MSVC_Net2015/thread.vcxproj.filters | 20 -
MSVC_Net2015/threadpool.vcxproj | 195 ----------
MSVC_Net2015/threadpool.vcxproj.filters | 20 -
Makefile.am | 4 +-
README.win32 | 39 +-
configure.ac | 12 +-
docs/Makefile.am | 6 +-
gio/giomm/Makefile.am | 4 +-
gio/giomm/filelist.am | 1 -
gio/giomm/filelist.gmake.am | 6 +
gio/src/Makefile.am | 2 +-
gio/src/filelist.am | 11 -
gio/src/filelist.gmake.am | 21 ++
glib/glibmm/Makefile.am | 2 +-
glib/glibmm/filelist.am | 1 -
glib/glibmm/filelist.gmake.am | 6 +
69 files changed, 853 insertions(+), 5558 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]