14 Commits

Author SHA1 Message Date
proller
7e3a34a0ff Update jsoncpp 2020-11-07 18:29:43 +03:00
proller
7f8e82dc7d move submodules -> src/external 2016-09-22 16:25:25 +03:00
proller
3a7e31a11f Merge commit '4503b50' 2016-08-10 19:26:12 +03:00
Rogier-5
4503b5097f Fixes for compiling with a newer (system) jsoncpp (#4429)
* 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.

* 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.

* 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.
2016-08-10 12:10:00 +02:00
proller
41d909eae8 auto.pl --make_verbose=1 2016-03-24 13:15:32 +03:00
proller
6251198957 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/mg_decoration.cpp
2015-09-28 00:25:27 +03:00
Igor Gnatenko
88a44122ab FindJson: use PATH_SUFFIXES jsoncpp to find incdir
For example, on Fedora systems jsoncpp headers is installed in `/usr/include/jsoncpp`.
2015-09-26 21:43:01 +02:00
proller
e2ec8e05ba fix jsoncpp link 2015-06-18 14:14:41 +03:00
proller
d21ce08bd2 fix travis 2015-06-17 22:26:13 +03:00
proller
9715672350 fix json cmake 2015-06-17 21:38:23 +03:00
proller
1b3ef34e21 jsoncpp as submodule 2015-06-17 20:47:45 +03:00
ShadowNinja
93fcab952b Clean up and tweak build system
* Combine client and server man pages.
  * Update unit test options and available databases in man page.
  * Add `--worldname` to man page.
  * Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`.
  * Disable server build by default on all operating systems.
  * Make `ENABLE_FREETYPE` not fail if FreeType isn't found.
  * Enable LevelDB, Redis, and FreeType detection by default.
  * Remove the `VERSION_PATCH_ORIG` hack.
  * Add option to search for and use system JSONCPP.
  * Remove broken LuaJIT version detection.
  * Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`.
  * Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`.
  * Clean up style of CMake files.
2015-03-27 15:00:48 -04:00
proller
dd8593f2d6 fix link if system json lib exists 2013-03-05 23:54:07 -05:00
proller
ee07c3f7cf new auto masterserver 2013-02-22 02:04:53 +04:00