Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GNOME/grilo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: GNOME/grilo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master.msvc
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 28 files changed
  • 1 contributor

Commits on Apr 22, 2020

  1. meson: Find libxml2 manually on MSVC builds 

    The libxml2 build files for Visual Studio do not generate pkg-config files for
us, so this update makes Meson search for it manually using cc.find_library()
and also check we have libxml/parser.h.

Also fix the pkg-config file that is being generated in this case, since we
can't pass a manually-found library object to 'requires:'.

This will require Meson 0.50.0 or later.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    1e6dbdd View commit details
    Browse the repository at this point in the history

  2. meson: Add some MSVC-specific items 

    This makes use of GLib's msvc_recommended_pragmas.h and the compiler's -utf-8
flag, which will help us during the build.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    40ca043 View commit details
    Browse the repository at this point in the history

  3. src/meson.build: Pass in GRL_NAME 

    We need that for Windows builds...
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    3f07a12 View commit details
    Browse the repository at this point in the history

  4. src/grl-source.c: Remove extraneous ';' 

    This is causing Visual Studio builds to break.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    6525481 View commit details
    Browse the repository at this point in the history

  5. grl-net-wc.c: Include process.h on Windows 

    unistd.h may not be available on Windows, but process.h is, and it is needed
for getpid().
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    681238f View commit details
    Browse the repository at this point in the history

  6. grl-definitions.h: Add _GRL_EXTERN 

    This macro can be used to export and import symbols where necessary, on
compilers that do not support autoexporting mechanisms.  The
__declspec(dllimport) usage is required for variables that need to be accessed
from the DLL.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    1b2e544 View commit details
    Browse the repository at this point in the history

  7. src/*.h: Mark all public symbols with _GRL_EXTERN 

    This way, we can export symbols in the main Grilo library by using compiler
directives, where needed, such as on Visual Studio.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    cc7f933 View commit details
    Browse the repository at this point in the history

  8. src/meson.build: Don't use GCC-esque linker flags on MSVC 

    Silence a warning...
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    d5c26e4 View commit details
    Browse the repository at this point in the history

  9. src: Use correct envvar separator 

    Use the G_SEARCHPATH_SEPARATOR_S macro as it assures that we are using the
correct separator between values that are passed in via an envvar.

The ":" separator is valid on *NIX, but not Windows
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    dfdc8a6 View commit details
    Browse the repository at this point in the history

  10. src/meson.build: Fix introspection on Windows 

    Python on Windows have problems escaping quotes that have been previously,
escaped, which is revealed when we are trying to build introspection files.

Fix this by just passing in the '-DG_LOG_DOMAIN=...' only when building the
Grilo library, but not when running g-ir-scanner.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    26e0a37 View commit details
    Browse the repository at this point in the history

  11. lib/net/grl-net-wc.h: Add _GRLNET_EXTERN 

    Define this as nothing initially.  If needed, we can override this so that
we can export symbols via compiler directives.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    25a58c5 View commit details
    Browse the repository at this point in the history

  12. libs/net/meson.build: Export symbols on MSVC-like builds 

    Define _GRLNET_EXTERN as __declspec(dllexport) so that we can export symbols
on Visual Studio builds without a .def file.
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    def974e View commit details
    Browse the repository at this point in the history

  13. tests: Don't build autoptr test on Visual Studio 

    g_autoptr() is not supported on Visual Studio, since it is really a GCCism
    @fanc999-1
    fanc999-1 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    90a18c0 View commit details
    Browse the repository at this point in the history
Loading