1
0
Fork 0
Commit Graph

210 Commits

Author SHA1 Message Date
narroo e8e76a6058 Fixed bug #385. UnloadUnusedChunks now has the same interface as
SaveAllChunks.  Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added.  Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
2014-02-10 20:00:07 -05:00
Tiger Wang 7d151d5494 Updated Core & PolarSSL 2014-02-04 23:53:10 +00:00
madmaxoft 34f13d589a Removed CryptoPP files. 2014-01-22 22:26:40 +01:00
madmaxoft 37e820d16e Added PolarSSL as a submodule. 2014-01-22 22:17:20 +01:00
Mattes D 4385ab008f CMake: Fixed Lua output folder for MSVC2010+. 2014-01-17 08:09:03 +01:00
madmaxoft dab37db562 CMake: Fixed output paths for all MSVC versions. 2014-01-16 18:33:28 +01:00
madmaxoft ba49a32c3a Another VarArgs fix.
This time using va_copy() on platforms that have it and simple assignment on platforms that don't.
2014-01-16 08:34:10 +01:00
madmaxoft dd6c5779ec Using a 2nd argument instead of va_copy().
This seems to be the only reasonable C++03-only solution.
2014-01-15 18:28:51 +01:00
madmaxoft d23e743303 CMake: Removed SCL warnings from Lua and ZLib. 2014-01-15 12:01:03 +01:00
madmaxoft bc24cd8c70 Renamed unused source files from zlib.
These files are included in zlib, but they should not be compiled into the actual library. Since they contain example code on how to use the lib, I decided to keep them, renamed to .txt.
2014-01-13 21:28:27 +01:00
madmaxoft caea934d37 CMake: Lua DLL is built in the correct folder.
Also removed SCL warnings from MSVC builds.
2014-01-13 10:59:37 +01:00
Mattes D 1ec9eb564c Merge pull request #526 from mc-server/IniFileFix
Fixed cIniFile's SetValue().
2014-01-11 23:32:54 -08:00
madmaxoft 7fa5217aad Fixed the warning in CryptoPP.
It was getting on my nerves too much, decided to actually fix their code.
2014-01-11 20:27:07 +01:00
madmaxoft 7739238d3d Fixed reading the files.
Duplicate values were ignored.
2014-01-11 20:10:50 +01:00
madmaxoft a332a5dc73 IniFile: Split SetValue() into AddValue() and SetValue().
Each function does what one would assume - AddValue adds a new value, SetValue overwrites existing value (creates a new one if not exists, if instructed to do so).
2014-01-11 16:44:28 +01:00
madmaxoft 4c360b54e3 Fixed cIniFile's SetValue().
How did we not see this earlier? Each call to SetValue would actually ADD a value!
2014-01-10 16:23:22 +01:00
madmaxoft 1704d0fd6b Using dlopen() on all platforms except WIN32. 2014-01-10 10:03:39 +01:00
madmaxoft 53e2ed8473 Specified the dynamic loader Lua should use. 2014-01-09 08:05:08 +01:00
Tycho 623146996a Fixed FreeBSD compilition 2014-01-07 05:08:58 -08:00
Tycho 83c7ba2bae removed tolua++ makefile which is overwritten by cmake 2014-01-03 08:10:57 -08:00
Tycho Bickerstaff d2ed9d9fc4 removed lua makefile 2013-12-22 15:57:56 +00:00
Tycho Bickerstaff a71299c46b fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not 2013-12-22 15:41:01 +00:00
madmaxoft 66f9fcbb69 Fixed unix Lua dependencies. 2013-12-27 11:56:39 +01:00
madmaxoft 1cf6502be2 Made cmake compilation possible on Windows. 2013-12-27 11:51:08 +01:00
Tycho Bickerstaff 650a1483b8 fixed lua dynamic library 2013-12-21 13:50:32 +00:00
tycho f6d5a788aa fixed include of math on windows 2013-12-20 15:37:35 +00:00
Tycho Bickerstaff 18b99c7eff made LUA shared unless STATIC_LUA is set 2013-12-20 15:29:34 +00:00
Tycho Bickerstaff be77ecf19d fixed lua dependency on libm 2013-12-20 15:24:55 +00:00
Tycho Bickerstaff fda983fcb4 possable fix of typo 2013-12-20 14:03:40 +00:00
Tycho Bickerstaff bc2d23550c Revert "fixed bad reference to math library"
This reverts commit 0836e5e660.
2013-12-20 13:51:33 +00:00
Tycho Bickerstaff efaabb16df Revert "fixed bad reference to math library"
This reverts commit c2167d7ed7.
2013-12-20 13:50:41 +00:00
Tycho Bickerstaff c2167d7ed7 fixed bad reference to math library 2013-12-20 13:27:38 +00:00
Tycho Bickerstaff 0836e5e660 fixed bad reference to math library 2013-12-20 13:21:58 +00:00
tycho c7d766bbcc fixed compile errors with headers and math library 2013-12-20 00:22:06 +00:00
Tycho Bickerstaff 95c7407dd3 added md5 as a dependency for bindings 2013-12-19 00:55:01 +00:00
Tycho Bickerstaff e2549dfcb2 added expat as lua bindings dependincy 2013-12-19 00:52:52 +00:00
Tycho Bickerstaff aa53fe6761 compiling sqlite 2013-12-19 00:28:48 +00:00
Tycho Bickerstaff 7dd1561a88 fixed bindings generation 2013-12-18 23:59:07 +00:00
Tycho Bickerstaff 1149ab216c Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linux
This reverts commit 906fd50343.
2013-12-18 23:14:31 +00:00
Tycho Bickerstaff 0dbd55614b bindings regenration logic 2013-12-18 23:14:11 +00:00
Tycho Bickerstaff 95ebc37faa added zlib and UI 2013-12-18 19:10:47 +00:00
Tycho Bickerstaff 5155aa4096 added zlib 2013-12-10 23:27:35 +00:00
Tycho Bickerstaff daccfd9c6e more cmake changes 2013-12-10 22:43:21 +00:00
Tycho Bickerstaff 6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Tycho Bickerstaff b91cfb8765 started work on cmake 2013-12-10 18:41:43 +00:00
madmaxoft 4608beb3c6 Fixed tolua++ compilation.
Duplicate files, wrong includes, const-incorrect code...
2013-12-08 18:24:56 +01:00
madmaxoft 906fd50343 Removed unused ToLua files.
Those were used to compile the tolua executable and were getting in the way - Unix makefile tried to compile them into MCS.
2013-12-08 18:05:49 +01:00
madmaxoft 557ebc88d7 Removed faulty .gitattributes.
They cause git to think that files have been modified although they have not, and makes it impossible to revert the files to un-changed form.
See http://stackoverflow.com/questions/5009096/files-showing-as-modified-directly-after-git-clone 's first answer.
2013-11-27 09:32:53 +01:00
madmaxoft 2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Tiger Wang 3466d2cad9 Fixed all outstanding VS compilation issues
Also updated VS2008 files.
2013-11-25 21:32:09 +00:00
Tiger Wang 32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Tiger Wang 16435995a5 Moved SQLite, LuaExpat, and MD5 to /lib 2013-11-24 17:33:47 +00:00
Alexander Harkness 998fb17fdc Moved tolua++ 2013-11-24 14:29:35 +00:00
Alexander Harkness 1de69f5b54 Moved zlib 2013-11-24 14:28:29 +00:00
Alexander Harkness d7ca8ea57b Moved Lua 2013-11-24 14:27:32 +00:00
Alexander Harkness 4c67f49c87 Moved JSONCPP 2013-11-24 14:24:26 +00:00
Alexander Harkness 9c10729f00 Moved iniFile 2013-11-24 14:22:15 +00:00
Alexander Harkness 28b56cf474 Moved expat 2013-11-24 14:21:35 +00:00
Alexander Harkness 3438e5d3dd move cryptopp into lib 2013-11-24 14:21:13 +00:00