[gjs: 13/13] Merge branch 'master.windows' into 'master'



commit 173741d010669dfc596ede31503fe28642fb6e54
Merge: 64a88b75 169e21fc
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Mar 5 03:26:25 2019 +0000

    Merge branch 'master.windows' into 'master'
    
    Fix Windows builds on GIT master
    
    Closes #228
    
    See merge request GNOME/gjs!270

 configure.ac                     |   1 +
 gi/arg.cpp                       |   2 +-
 gi/boxed.cpp                     |   1 +
 gi/boxed.h                       |  11 ++--
 gi/fundamental.cpp               |   3 +-
 gi/fundamental.h                 |  15 ++++--
 gi/gerror.h                      |  12 +++--
 gi/interface.h                   |  15 ++++--
 gi/object.cpp                    |   7 ++-
 gi/object.h                      |  12 +++--
 gi/union.h                       |  11 ++--
 gjs/context.cpp                  |  19 ++++++-
 gjs/debugger.cpp                 |  13 +++--
 gjs/importer.cpp                 |   2 +-
 gjs/jsapi-util-args.h            |   4 +-
 gjs/jsapi-util.cpp               |  28 ++++++++++
 gjs/jsapi-util.h                 |   4 ++
 gjs/macros.h                     |   1 +
 gjs/module.cpp                   |   7 +++
 gjs/profiler.cpp                 |  16 ++++--
 libgjs-private/gjs-util.c        |   9 +++-
 test/test-ci.sh                  |   8 ++-
 win32/Makefile.vc                |   6 +--
 win32/README.txt                 |  78 ++++++++++++++++++++++------
 win32/build-rules-msvc.mak       | 107 +++++++++++++++++++++------------------
 win32/config-msvc.mak            |  30 ++++++-----
 win32/create-lists-msvc.mak      |  16 +++---
 win32/detectenv-msvc.mak         |  14 ++++-
 win32/generate-msvc.mak          |  18 +++----
 win32/gjs-introspection-msvc.mak |  20 +++-----
 win32/info-msvc.mak              |   2 -
 win32/install.mak                |  12 ++---
 32 files changed, 335 insertions(+), 169 deletions(-)
---


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