lethosor
8cec8af3b1
CMake: Support cross-compiling
...
This relies on a working cross-compiler, of course, as well as a separate build
directory for cross-compiled builds, with DFHACK_NATIVE_BUILD_DIR pointing
to an already-successful native build directory (this is needed for protoc).
2016-01-08 21:08:26 -05:00
lethosor
80556449a1
Improve Json::get() slightly
2015-11-27 16:45:26 -05:00
lethosor
485eddc54e
JsonEx -> Json
2015-11-26 20:24:14 -05:00
lethosor
e15dcfd72a
protobuf: Disable unused-result warnings in release mode
2015-11-05 21:52:04 -05:00
lethosor
867b733a04
Fix a few GCC warnings on Linux (GCC 4.6)
2015-11-05 21:48:13 -05:00
lethosor
f4a2188e42
Travis: Build DFHack
2015-10-03 15:58:41 -04:00
lethosor
0337df94de
GCC: Specify C++11 when building protobuf
...
This is necessary to build with GCC 4.6 on Linux (Travis)
2015-10-03 15:40:28 -04:00
lethosor
d71969fef9
Update clsocket
2015-10-03 13:55:16 -04:00
lethosor
45d095cbab
Replace translate_socket_error() implementations with DescribeError()
2015-10-03 10:37:48 -04:00
lethosor
071f67f2aa
Add some JSON helper functions
2015-07-29 20:09:55 -04:00
lethosor
d02e67267a
Replace jsonxx with jsoncpp
2015-07-29 15:50:33 -04:00
lethosor
527b17d964
Update submodules
2015-07-04 20:45:37 -04:00
lethosor
7c943179c7
Update clsocket
2015-04-30 19:22:53 -04:00
lethosor
f3508f82c1
Add jsonxx to depends/
2015-03-20 15:45:38 -04:00
lethosor
7abe70feb8
Update clsocket
2015-03-05 17:22:21 -05:00
lethosor
100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
Japa
22edb5a033
Merge branch 'master' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
plugins/isoworld
plugins/rendermax/CMakeLists.txt
plugins/rendermax/renderer_light.cpp
plugins/rendermax/renderer_light.hpp
plugins/rendermax/renderer_opengl.hpp
plugins/rendermax/rendermax.cpp
plugins/rendermax/rendermax.lua
2014-12-11 17:53:19 +05:30
Alexander "Ace" Olofsson
d2039386b0
Add <algorithm> includes and use min/max to get them into global scope
2014-11-09 11:20:09 +01:00
Japa
b74d0da872
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-04-26 09:23:21 +05:30
Alexander Gavrilov
7ea8e25cd3
Rename the LUA_PATH/LUA_CPATH environment variables to avoid conflicts.
...
If a user has a standalone lua installation with these variables
configured, it should not confuse dfhack into looking for things
in wrong places.
2014-03-31 14:15:57 +04:00
Alexander Gavrilov
a70fbf41d4
Reapply dfhack-specific lua build configuration.
2014-03-31 14:15:50 +04:00
Alexander Gavrilov
1132bea917
Update to Lua 5.2.3
2014-03-31 14:15:09 +04:00
Warmist
24d8a1f1c1
Added headers to tinythread cmake so that ide would show them.
2013-06-29 12:23:21 +03:00
Alexander Gavrilov
7224c8746a
Print the new md5 hash after modification in binpatch.
2012-10-08 16:47:52 +04:00
Petr Mrázek
634c281f00
Track clsocket
2012-09-28 22:44:14 +02:00
Quietust
1325b70e41
Cleanup autolabor+cleanowned, fix depends/clsocket
2012-09-13 14:42:17 -05:00
Timothy Collett
96abc903ab
Merge branch 'master' of http://github.com/peterix/dfhack
2012-09-10 11:54:56 -04:00
Timothy Collett
274d6038ad
Merge further changes (???)
2012-09-10 09:19:21 -04:00
Timothy Collett
270351f510
Merge branch 'master' of https://github.com/danaris/dfhack
2012-09-10 09:18:24 -04:00
Petr Mrázek
509d957090
Make protobuf behave with multiple build folders involved.
2012-08-17 13:02:31 +02:00
Petr Mrázek
81ea0345ad
Fix cage-related bug in the sort plugin.
2012-08-03 16:09:51 +02:00
Kelly Martin
b2623e68a3
Track submodules
2012-07-11 14:38:04 -05:00
Timothy Collett
068542d58a
Submodule changes
2012-07-05 11:39:08 -04:00
Timothy G Collett
d5ae1fc4f2
Merge branch 'master' of https://github.com/danaris/dfhack
...
Conflicts:
depends/clsocket
package/darwin/dfhack
package/darwin/dfhack-run
Fixed.
2012-06-24 18:41:24 -04:00
Timothy Collett
9b941bcd4d
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Trying out angavrilov's changes
2012-06-18 09:29:20 -04:00
Alexander Gavrilov
16ae6cb1fb
Fix lua bug: 'peaceful' unwind of yielded pcall doesn't restore errfunc.
...
I.e. if the pcall results in no error, but a yield happens inside it,
the active errfunc is not restored to its previous value.
2012-06-17 16:14:14 +04:00
Alexander Gavrilov
eeaae916ed
Reapply dfhack-specific lua build configuration.
2012-06-17 16:01:46 +04:00
Alexander Gavrilov
534367546d
Update to Lua 5.2.1
2012-06-17 16:01:46 +04:00
Timothy Collett
12543d6a5b
Make offsets with "darwin" os-type recognized as Apple, rather than ignored
2012-06-14 13:42:06 -04:00
Timothy G Collett
8f67139a75
fix clsocket?
2012-06-03 14:33:44 -04:00
Timothy G Collett
1e0ff32ad4
fix clsocket?
2012-06-03 11:01:13 -04:00
Quietust
08c302f3d1
Merge branch 'master' of https://github.com/peterix/dfhack
2012-05-30 07:52:56 -05:00
Petr Mrázek
0749233ed1
And again...
2012-05-30 01:12:29 +02:00
Petr Mrázek
246df43511
Track clsocket
2012-05-30 01:08:07 +02:00
Timothy Collett
44c3afc306
Merge git://github.com/quietust/dfhack
...
Gotta get the changes that prevent DFHack from crashing.
2012-05-24 15:39:11 -04:00
Timothy Collett
24d221052b
Initial changes to get dfhack building on the Mac
2012-05-24 11:31:20 -04:00
Quietust
985533460c
-Wno-sign-compare only works with GCC
2012-05-23 13:10:57 -05:00
Alexander Gavrilov
9c94b7c1e7
Make the hash map implementation error more useful.
...
It instructs to update GCC, but actually the most common
reason for the error is missing 32-bit development libs.
2012-04-28 11:53:26 +04:00
Alexander Gavrilov
0a6982f404
Enable warnings correctly on linux and fix a lot of them.
2012-04-20 13:30:37 +04:00
Alexander Gavrilov
ee7100216e
Fix lua interpreter bug: the C call counter is already unwound by yield.
...
Decrementing it causes underflow and subsequent spurious stack overflow.
2012-04-16 18:32:12 +04:00