1
0
Fork 0
Commit Graph

170 Commits

Author SHA1 Message Date
Mattes D 4950cd6a19 Updated LibEvent.
Includes a fix to Unicode error messages for Windows builds.
2015-12-23 16:27:27 +01:00
tycho 91d0abae4c Working coverage build 2015-12-18 11:19:21 +01:00
Mattes D 7fdfbebe05 Ignore MSVC build artefacts in submodularised libraries. 2015-11-05 11:32:00 +01:00
Julian Laubstein 9a7dd0a077 Outsourced all libraries into submodules 2015-11-04 23:25:00 +01:00
Mattes D 5b196efd5c Updated the SQLiteCpp library.
The Windows builds started failing because the library was asking for a submodule that seems to have moved. The submodule wasn't needed anyway.
2015-10-01 13:28:32 +02:00
Mattes D 76d2f85b9a Fixed Lua output folders for Windows builds.
Fixes #2468.
2015-09-08 09:12:02 +02:00
Mattes D db09c733ea Fixed SQLiteCpp MSVC2015 compilation.
SQLiteCpp had a "noexcept" keyword that MSVC2015 didn't like, upgrading it makes it compile.
2015-08-10 13:23:28 +02:00
Tiger Wang 788cdebd72 Updated submodules 2015-07-14 23:13:52 +01:00
Tiger Wang ccfe04a0a2 Updated and submodularised JsonCPP
Conflicts:
	lib/jsoncpp
2015-07-09 23:10:51 +01:00
Tiger Wang 51a118f1ef Updated luaexpat 2015-07-09 23:06:24 +01:00
Tiger Wang abd5708e5c Updated expat 2015-07-09 23:06:23 +01:00
Tiger Wang 5a3c3447b7 Updated zlib 2015-07-09 23:06:23 +01:00
tycho 8dcb5105c9 Update SQLite 2015-05-28 12:57:39 +01:00
linnemannr 5049fd0fbf Support building on FreeBSD
SetFlags.cmake

	Add -lexecinfo to linker flags for FreeBSD to resolve backtrace()

lib/sqlite/CMakeLists.txt

	Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for
	POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define
	controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined
	to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE
	and __POSIX_VISIBLE to the 199506 for POSIX.1c

lib/tolua++/CMakeLists.txt
src/CMakeLists.txt

	Add /usr/local/lib to the library search path for FreeBSD builds

src/OSSupport/Errors.cpp

	Correct the strerror_r() implementation determination to check whether
	_GNU_SOURCE is defined, not what it evaluates to
2015-05-24 20:07:31 -06:00
tycho da58620d45 Added TCLAP 2015-05-16 10:46:51 +01:00
Mattes D 3ddd2f567c ToLua: Fixed LuaJit compatibility. 2015-05-11 16:19:01 +02:00
Mattes D 2f369d09b6 Fixed multiple mbedtls inclusion.
Ref.: #1880.
2015-05-03 10:01:19 +02:00
Tiger Wang 2919d08883 Update submodules 2015-05-02 15:57:49 +01:00
Matyas Dolak c329bd28ec Updated PolarSSL. 2015-01-29 15:10:20 +01:00
Mattes D 32dd102988 Updated PolarSSL. 2015-01-27 17:40:16 +01:00
Mattes D 1d69cad676 Updated LibEvent. 2015-01-27 16:26:35 +01:00
Mattes D a8a7488b54 Added the libevent library. 2015-01-22 20:12:39 +01:00
Mattes D 449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Alexander Harkness ad42adb5fa Removed polarSSL makefile. Fixes #591.
Also normalises polarssl submodule URL.
2014-09-27 12:04:54 +01:00
Tycho a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Mattes D 690867c89e Fixed submodules' downgrade from the previous PR merge. 2014-09-07 09:09:10 +02:00
Masy98 9cdb9b6262 Merge branch 'master' into blocks
Conflicts:
	MCServer/crafting.txt
2014-09-06 22:06:40 +02:00
madmaxoft fac89d0c43 Added cIniFile::HasValue() function. 2014-09-03 23:00:16 +02:00
madmaxoft b4c6ad0036 Updated SQLiteCpp.
This should fix #1374.
2014-09-03 22:37:50 +02:00
archshift 62d5ab15a5 Quick fix for a preprocessor error with clang on OS X 2014-09-02 23:21:34 -07:00
Mattes D 8b8ccac0b8 ToLua++ lib: Assert when usertype is not known. 2014-08-22 10:32:32 +02:00
madmaxoft 36d1972336 ToLua driver: disabled output buffering. 2014-08-03 22:04:49 +02:00
madmaxoft 6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft 036a8ff98e Added SQLiteCpp library.
This provides C++ wrappers for SQLite, making it safer to use in the C++ environment.
2014-07-28 19:59:53 +02:00
Tiger Wang 8050a5b98a Suggestions 2014-07-21 22:49:06 +01:00
Tiger Wang 37140ae578 Merge branch 'master' into portals
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
2014-07-18 20:10:51 +01:00
Tiger Wang f1be1eb674 Monster fixes
* Fixes #1203
* Fixes #627
2014-07-18 10:47:00 +01:00
madmaxoft 8bb0baa842 Tolua driver: Fixed wrong indentation. 2014-07-13 17:07:55 +02:00
Tycho 2a0c041ad8 Adjusted calls to CreateProjectile that passed Items 2014-07-13 15:25:52 +01:00
tycho c3bd588826 Fixed OpenSSL programs and tests being generated when testing disabled. 2014-07-06 16:27:50 +01:00
Mattes D decdbab2e6 LuaProxy compilation under MinGW. 2014-07-01 15:23:29 +02:00
Mattes D 9d843405b2 Merge branch 'master' into LuaProxy 2014-07-01 15:07:12 +02:00
Mattes D eb8244f1c2 Proper sqlite dependency fix. 2014-07-01 08:01:39 +02:00
Mattes D 4f60f5aef4 Fixed linking order under MinGW.
Ref.: #1044
2014-07-01 06:40:38 +02:00
worktycho 0fb236bfe4 typo 2014-06-30 22:21:22 +01:00
worktycho 84272fb155 Added dependecy of tolualib on lua 2014-06-30 22:21:07 +01:00
Mattes D ac01a8e483 Fixed lua compilation under MinGW. 2014-06-30 21:42:20 +02:00
Mattes D 6b8529544e Fixed tolua linking order.
Ref.: #1044.
2014-06-30 21:00:52 +02:00
Mattes D 563f706422 Removed the md5 library, obsoleted by PolarSSL.
Fixes #1130.
2014-06-27 19:34:53 +02:00
madmaxoft dc284783f0 Added a missing endline. 2014-06-24 14:49:35 +02:00