125 Commits

Author SHA1 Message Date
proller
2ff8e53cbe cmake: fix msgpack find 2021-08-13 20:05:26 +03:00
proller
7e3a34a0ff Update jsoncpp 2020-11-07 18:29:43 +03:00
proller
a8e93bb6aa build fixes 2018-09-24 16:19:04 +03:00
proller
1944104681 Fix build on ubuntu bionic 2018-05-26 20:23:49 +03:00
proller
371b8c04ce fix bundled sqlite build 2016-10-01 18:47:23 +03:00
proller
95bd21cf5d allow compiling sqlite from src/external/sqlite3 (for ugly OS) 2016-09-30 17:46:50 +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
6b06bf433d Merge remote-tracking branch 'minetest/master' 2016-05-18 16:38:10 +03:00
sfan5
decbd396df Really fix ncurses lookup on Arch Linux
Commit 27ee8d8943080a5dd735c9faa47c726604bafdff forgot to add the paths
without ncursesw/ to the find_path() call
2016-05-16 12:43:50 +02:00
proller
133c73cc93 Merge remote-tracking branch 'minetest/master' 2016-04-08 18:16:42 +03:00
David Knapp
27ee8d8943 Fix ncurses lookup on Arch Linux
Arch Linux doesn't put it's ncursesw includes inside an ncursesw
directory.  This script ends up setting USE_CURSES as true, but
doesn't pick up any of the headers.

https://bugs.archlinux.org/task/13994
2016-04-08 02:11:45 -04:00
proller
e5cad2727c fix msgpack cmake 2016-04-06 21:46:33 +03:00
proller
e7e39fefa4 fixes 2016-04-04 00:10:53 +03:00
proller
183febcce9 add aarch64 to FindOpenGLES2.cmake 2016-03-30 00:34:58 +03:00
proller
d887cd9771 clean 2016-03-28 14:15:15 +03:00
proller
83ee72616b prepare for win64 build 2016-03-28 04:59:00 -07:00
proller
db217df787 fxi FindMsgPack message 2016-03-26 18:52:22 +03:00
proller
8dd7af33a7 update msgpack to 2.0 2016-03-25 19:55:55 +03:00
proller
41d909eae8 auto.pl --make_verbose=1 2016-03-24 13:15:32 +03:00
proller
26ae18d07b fix windows build 2016-03-02 00:35:46 +03:00
Ferdinand Thiessen
8b62a6e25b Improved FindLuaJit 2016-02-09 00:07:14 +01:00
Alfredo Ramos
8e88fd3289 Add support for msgpack-c v1.4.0
msgpack-c now provides libmsgpackc (note the c at the end), so build will fail if we set ENABLE_SYSTEM_MSGPACK to true.

This fixes that.
2016-01-24 17:08:57 -06:00
proller
d1028ce722 Merge remote-tracking branch 'minetest/master' 2015-12-06 14:05:15 +03:00
proller
43fa2b1ea3 merge fix 2015-12-06 14:03:14 +03:00
Ferdinand Thiessen
70ece71ee4 Improve LuaJIT detection
On openSUSE luajit is not detected correctly.
This is because openSUSE is using a lua version suffix, like other Linux distributions do it also.
So the include directory is:
include/luajit-5_1-2.0
2015-12-05 23:31:09 +01:00
proller
ac6920fb78 tweak MSGPACK cmake 2015-11-23 01:17:13 +03:00
proller
52fe7de610 Merge remote-tracking branch 'minetest/master' 2015-11-08 00:23:15 +03:00
est31
5e507c9829 Add server side ncurses terminal
This adds a chat console the server owner can use for administration
or to talk with players.
It runs in its own thread, which makes the user interface immune to
the server's lag, behaving just like a client, except timeout.
As it uses the same console code as the f10 console, things like nick
completion or a scroll buffer basically come for free.
The terminal itself is written in a general way so that adding a
client version later on is just about implementing an interface.

Fatal errors are printed after the console exists and the ncurses
terminal buffer gets cleaned up with endwin(), so that the error still
remains visible.

The server owner can chose their username their entered text will
have in chat and where players can send PMs to.
Once the username is secured with a password to prevent anybody to
take over the server, the owner can execute admin tasks over the
console.

This change includes a contribution by @kahrl who has improved ncurses
library detection.
2015-11-06 08:51:14 +01:00
proller
3a34e7d2e8 msgpack: dont build examples 2015-10-22 15:42:47 +03:00
donat-b
a2521aefad Fix FindMsgPack.cmake 2015-10-11 00:51:28 +03:00
proller
6251198957 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/mg_decoration.cpp
2015-09-28 00:25:27 +03:00
proller
f09bcde392 use static msgpack 2015-09-27 01:17:41 +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
81d6cbbaf5 fixes 2015-09-26 15:44:07 +03:00
proller
cff451c6f9 race and leak fight 2015-07-03 00:17:48 +03: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
proller
519aac5d7a try fix travis and old compilers 2015-06-07 18:16:14 +03:00
proller
ee83e4c1fd Android gettext 2015-06-05 17:16:40 +03:00
proller
4bc9457ac3 better autotest 2015-05-27 23:05:27 +03:00
proller
1822bd619e Force use bundled msgpack 1.1.0 . if you want use system lib: -DENABLE_SYSTEM_MSGPACK=1 2015-05-25 21:15:38 +03:00
proller
4de9db74a5 Merge commit '181f7ba'
Conflicts:
	README.txt
	build/android/Makefile
	build/android/jni/Android.mk
	src/CMakeLists.txt
2015-05-12 17:32:57 +03:00
est31
181f7baa45 Add LibGMP
Uses system provided libgmp if found, if not it falls back to mini-gmp.
2015-05-11 17:48:33 +02:00
proller
96af39aa27 Merge remote-tracking branch 'minetest/master'
Conflicts:
	CMakeLists.txt
	src/nodedef.cpp
	src/nodedef.h
	src/nodemetadata.cpp
	src/script/lua_api/l_env.h
2015-05-06 14:36:27 +03:00
ShadowNinja
1be2d32fd5 Make Git version detection use VERSION_STRING instead of tags
This fixes the problem where 0.4.12-dev versions were erroneously shown as
0.4.11-dev because the tag was added on a separate branch.  It also fixes a
similar issue when builders didn't fetch new tags when updating.

This also removes the number-of-commits-since-tag field, since it's
incompatible with this.  Said field doesn't seem to be useful anyway if you
have the commit hash.
2015-05-05 17:13:05 +02:00
proller
969ff9c669 Merge remote-tracking branch 'minetest/master' 2015-05-03 19:06:32 +03:00