[glibmm: 5/5] Merge branch 'master.nmake' into 'master'



commit 0decf6b5b71b7bcd4768f1ccb2e353ce5b646eb6
Merge: af768ca0 6597ed98
Author: Chun-wei Fan <fanc999 yahoo com tw>
Date:   Fri Sep 7 07:18:40 2018 +0000

    Merge branch 'master.nmake' into 'master'
    
    Use NMake Makefiles to build glibmm
    
    See merge request GNOME/glibmm!2

 MSVC_NMake/Makefile.vc                           |  62 +++
 MSVC_NMake/build-rules-msvc.mak                  | 205 ++++++++++
 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_Net2017 => MSVC_NMake}/gendef/gendef.cc    |   0
 MSVC_NMake/generate-msvc.mak                     |  25 ++
 {MSVC_Net2017 => MSVC_NMake}/giomm/giomm.rc.in   |   0
 {MSVC_Net2017 => MSVC_NMake}/glibmm/glibmm.rc.in |   0
 MSVC_NMake/info-msvc.mak                         |  43 +++
 MSVC_NMake/install.mak                           |  24 ++
 MSVC_Net2017/compose.vcxproj                     | 192 ----------
 MSVC_Net2017/compose.vcxproj.filters             |  20 -
 MSVC_Net2017/dispatcher.vcxproj                  | 192 ----------
 MSVC_Net2017/dispatcher.vcxproj.filters          |  20 -
 MSVC_Net2017/dispatcher2.vcxproj                 | 191 ----------
 MSVC_Net2017/dispatcher2.vcxproj.filters         |  20 -
 MSVC_Net2017/filelist.am                         |  49 ---
 MSVC_Net2017/gendef.vcxproj                      | 164 --------
 MSVC_Net2017/gendef.vcxproj.filters              |  20 -
 MSVC_Net2017/giomm.vcxproj                       | 460 -----------------------
 MSVC_Net2017/giomm.vcxproj.filters               | 282 --------------
 MSVC_Net2017/giomm_simple.vcxproj                | 192 ----------
 MSVC_Net2017/giomm_simple.vcxproj.filters        |  20 -
 MSVC_Net2017/glibmm-build-defines.props          |  43 ---
 MSVC_Net2017/glibmm-install.props                | 401 --------------------
 MSVC_Net2017/glibmm-version-paths.props          |  46 ---
 MSVC_Net2017/glibmm.sln                          | 185 ---------
 MSVC_Net2017/glibmm.vcxproj                      | 345 -----------------
 MSVC_Net2017/glibmm.vcxproj.filters              | 154 --------
 MSVC_Net2017/glibmm_value.vcxproj                | 189 ----------
 MSVC_Net2017/glibmm_value.vcxproj.filters        |  21 --
 MSVC_Net2017/install.vcxproj                     | 116 ------
 MSVC_Net2017/keyfile.vcxproj                     | 192 ----------
 MSVC_Net2017/keyfile.vcxproj.filters             |  20 -
 MSVC_Net2017/markup.vcxproj                      | 191 ----------
 MSVC_Net2017/markup.vcxproj.filters              |  20 -
 MSVC_Net2017/options.vcxproj                     | 192 ----------
 MSVC_Net2017/options.vcxproj.filters             |  20 -
 MSVC_Net2017/properties.vcxproj                  | 192 ----------
 MSVC_Net2017/properties.vcxproj.filters          |  20 -
 MSVC_Net2017/regex.vcxproj                       | 192 ----------
 MSVC_Net2017/regex.vcxproj.filters               |  20 -
 MSVC_Net2017/resolver.vcxproj                    | 196 ----------
 MSVC_Net2017/resolver.vcxproj.filters            |  20 -
 MSVC_Net2017/socket-client.vcxproj               | 196 ----------
 MSVC_Net2017/socket-client.vcxproj.filters       |  20 -
 MSVC_Net2017/socket-server.vcxproj               | 196 ----------
 MSVC_Net2017/socket-server.vcxproj.filters       |  20 -
 MSVC_Net2017/thread.vcxproj                      | 187 ---------
 MSVC_Net2017/thread.vcxproj.filters              |  20 -
 MSVC_Net2017/threadpool.vcxproj                  | 195 ----------
 MSVC_Net2017/threadpool.vcxproj.filters          |  20 -
 Makefile.am                                      |   4 +-
 README.win32                                     |  32 +-
 configure.ac                                     |  12 +-
 gio/giomm/Makefile.am                            |   4 +-
 gio/giomm/filelist.am                            |   1 -
 gio/giomm/filelist.gmake.am                      |   5 +
 gio/src/Makefile.am                              |   2 +-
 gio/src/filelist.am                              |  17 -
 gio/src/filelist.gmake.am                        |  20 +
 glib/glibmm/Makefile.am                          |   2 +-
 glib/glibmm/filelist.am                          |   1 -
 glib/glibmm/filelist.gmake.am                    |   5 +
 67 files changed, 836 insertions(+), 5494 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]