Commit Graph
79 Commits
Author SHA1 Message Date
worktycho d8b4bf8a70 Update COMPILING
fixed acouple of issues
2013-12-21 16:00:47 +00:00
Tycho Bickerstaff c99e841e24 added FORCE_32 option 2013-12-21 14:18:22 +00:00
Tycho Bickerstaff b9516c1208 hide lua shared library 2013-12-21 14:12:50 +00:00
Tycho Bickerstaff 650a1483b8 fixed lua dynamic library 2013-12-21 13:50:32 +00:00
Tycho Bickerstaff 869104de34 finished up final build flags for linux 2013-12-21 13:45:27 +00:00
Tycho Bickerstaff b4fb8ace03 Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-21 13:33:09 +00:00
Tycho Bickerstaff 779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
Tycho Bickerstaff 66d643f407 Merge branch 'master', remote-tracking branch 'upstream/master' 2013-12-21 13:32:27 +00:00
Tycho Bickerstaff 32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +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 826e280db9 added profile builds as an option 2013-12-20 14:27:26 +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 Bickerstaff cb9f30d4ee Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-19 17:21:29 +00:00
Tycho Bickerstaff 163fe32a6d modified travis CI file for cmake 2013-12-19 17:21:06 +00:00
Tycho Bickerstaff fbb47cd2ae Merge branch 'master' into cmake 2013-12-19 17:14:52 +00:00
Tycho Bickerstaff 0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +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 afa259e530 added all cpp files to bindings 2013-12-19 00:24:47 +00:00
Tycho Bickerstaff d2f29cb866 moved HTTPServer to globs 2013-12-19 00:16:44 +00:00
Tycho Bickerstaff e02fbd37ab added pthread linking code to OSSupport 2013-12-19 00:15:30 +00:00
Tycho Bickerstaff 0a96bf1c03 moved protocol to glob 2013-12-19 00:11:04 +00:00
Tycho Bickerstaff 3585f93fc9 added blocks and blockentities 2013-12-19 00:06:24 +00:00
Tycho Bickerstaff 9515ece2bd linked in lua 2013-12-19 00:02:15 +00:00
Tycho Bickerstaff cdca5a3eac Merge branch 'master' into cmake 2013-12-19 00:00:14 +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 93d14b0af9 removed make file 2013-12-18 19:09:24 +00:00
Tycho Bickerstaff e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00:00
Tycho Bickerstaff 5155aa4096 added zlib 2013-12-10 23:27:35 +00:00
Tycho Bickerstaff d59e4e6a45 moved generating to globs 2013-12-10 23:22:34 +00:00
Tycho Bickerstaff 0925ead688 added UI folder 2013-12-10 23:20:39 +00:00
Tycho Bickerstaff d5866a0978 moved Worldstorage to globs 2013-12-10 23:18:26 +00:00
Tycho Bickerstaff 77303b77c7 Merge branch 'master' of github.com:mc-server/MCServer into cmake 2013-12-10 23:10:50 +00:00
Tycho Bickerstaff 822a92a9b6 moved entities to globs 2013-12-10 23:09:16 +00:00
Tycho Bickerstaff ec5af4cffe moved mobs to globs 2013-12-10 23:07:30 +00:00
Tycho Bickerstaff 948fb78fa1 moved simulor to globs 2013-12-10 23:06:15 +00:00
Tycho Bickerstaff 40defa9d2d removed leakfinder form build 2013-12-10 23:04:38 +00:00
Tycho Bickerstaff dd633d5a94 Merge branch 'master' into cmake 2013-12-10 23:01:35 +00:00
Tycho Bickerstaff d9a429ec64 Merge branch 'master' into quickfixs 2013-12-10 23:01:24 +00:00
Tycho Bickerstaff 712f7d5a23 added tolua++ command and removed stackwalker from build 2013-12-10 22:59:53 +00:00
Tycho Bickerstaff daccfd9c6e more cmake changes 2013-12-10 22:43:21 +00:00
Tycho Bickerstaff 572d48be52 removed more accedentailly commited object files 2013-12-10 21:47:23 +00:00
Tycho Bickerstaff 4300d0866d removed accedentailly commited object files 2013-12-10 21:44:11 +00:00
Tycho Bickerstaff 6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Tycho Bickerstaff 973999f524 fixed unused expression warnings in blockFire 2013-12-10 19:35:05 +00:00
Tycho Bickerstaff d9ecf51f5b more cmake stuff 2013-12-10 19:30:12 +00:00
Tycho Bickerstaff c217ab5168 fixed comparison of thread handle to Null point rather than null handle 2013-12-10 18:43:54 +00:00
Tycho Bickerstaff b91cfb8765 started work on cmake 2013-12-10 18:41:43 +00:00
Tycho Bickerstaff bdb17a7e65 added cmake ignores to gitignore 2013-12-10 18:40:22 +00:00
Tycho Bickerstaff 7135bdf591 added abort to DeadlockDetector to generate core dumps on failure 2013-12-10 16:59:45 +00:00
Tycho Bickerstaff 5d2311bcff Merge remote-tracking branch 'upstream/master' 2013-12-10 16:53:46 +00:00
Tycho Bickerstaff 4c2490ed17 moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 2013-12-08 00:13:31 +00:00
Tycho Bickerstaff 2942e57f93 reordered initalisation order at src/Generating/Cave.h line 73 2013-12-08 00:08:25 +00:00
Tycho Bickerstaff e32a224fe3 fixed warnings in src/Generating/BioGen.cpp
removed unused variable at src/Generating/BioGen.cpp line 379
and added default fallthrough clause to switch at
src/Generating/BioGen.cpp line 725
2013-12-07 23:56:26 +00:00
Tycho Bickerstaff c1dbe8a19e added default fallthrough clause to switch at line 178 of src/UI/Window.cpp 2013-12-07 23:51:18 +00:00
Tycho Bickerstaff ae369618ca Reordered Listed Initalisation order in src/UI/Window.cpp
Reordered the Listed Initalisation order for CWindow to the
executed initalisation order. The compiler initalises values
in the order the fields are declared not the initalisations
listed
2013-12-07 23:51:18 +00:00
Tycho Bickerstaff cd7813f0f5 Removed unused variable ResultSlot 2013-12-07 23:33:18 +00:00
worktycho 843605d59e Merge pull request #1 from worktycho/patch-1
Warning fixes
2013-12-09 09:51:12 -08:00
worktycho 604c8fd9b9 Fix Undefined behavior at Bindings/LuaWindow line 32 2013-12-09 14:17:39 +00:00
worktycho 187449824c Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176 2013-12-09 14:15:30 +00:00
worktycho c78f67dcc0 Fixed warning unchecked enum value at Chunk.cpp line 841 2013-12-09 14:05:32 +00:00
worktycho a99bece3fa Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54 2013-12-09 13:57:09 +00:00
Tycho Bickerstaff 94b62a1b07 merged makefile changes 2013-09-11 18:11:12 +01:00
Tycho Bickerstaff 63ecdaa1f2 added cryptopp asemblly desabling to clang autodetect 2013-09-11 17:27:30 +01:00
worktycho 37e0e684f4 moved reflection code to PlayerYawToMetadata 2013-09-11 17:07:54 +01:00
worktycho 3236364eee changed the subtaraction to a flip 2013-09-11 13:48:08 +01:00
Tycho Bickerstaff c7c18aa7e7 disable tautolgical compare warning in clang
disable the tautological compare warning as it is triggered by crypto++ using
unsigned ints in comparisons to zero in template code. crypto++ do not show
any indication of fixing it.

this commit does add a dependency on grep but that should not be a major
problem
2013-09-10 21:27:52 +01:00
Tycho Bickerstaff e24d731419 disable tautolgical compare warning in clang
disable the tautological compare warning as it is triggered by crypto++ using
unsigned ints in comparisons to zero in template code. crypto++ do not show
any indication of fixing it.

this commit does add a dependency on grep but that should not be a major
problem
2013-09-10 21:17:13 +01:00
Tycho Bickerstaff 4c2df0fd2a disable tautological compare in clang
disable the tautological compare warning in clang as crypto++ triggers this
warning and they are ignoring it
2013-09-10 20:59:33 +01:00
Tycho Bickerstaff ff1cdab863 Allow the user to override the compiler using the CC enviromental varible in the makefile 2013-09-10 20:38:06 +01:00