Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for compiling with a newer (system) jsoncpp #4429

Merged
merged 3 commits into from
Aug 10, 2016
Merged

Fixes for compiling with a newer (system) jsoncpp #4429

merged 3 commits into from
Aug 10, 2016

Commits on Aug 10, 2016

  1. Move included json code to jsoncpp subdirectory 

    This is needed to avoid having to specify the minetest src directory
as a system include when fixing the json includes.
    @Rogier-5
    Rogier-5 committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    617e005 View commit details
    Browse the repository at this point in the history

  2. Fix json includes 

    They used "", so that the compiler searches the project's directory
first. The result was that when compiling with a system jsoncpp,
the project's own version of json.h was still included, instead of
the system version.

The includes now use <>, so a system location, or one specified with
'-Ilocation' is searched only.
    @Rogier-5
    Rogier-5 committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    3c919f6 View commit details
    Browse the repository at this point in the history

  3. Fix for jsoncpp deprecated function warning 

    When compiling with a newer version of jsoncpp (and
ENABLE_SYSTEM_JSONCPP=true), jsoncpp emits a warning
about a deprecated function that minetest uses.
    @Rogier-5
    Rogier-5 committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    4393bd8 View commit details
    Browse the repository at this point in the history