ae55d2d526
Support linking against an external tinyxml if EXTERNAL_TINYXML is set
...
As best as I can tell, the copy of tinyxml dfhack uses is unmodified
from whenever it was first bundled. This commit adds an option to CMake,
EXTERNAL_TINYXML, that if set to ON, will attempt to link against a system
tinyxml instead of using the dfhack-bundled one. It defaults to OFF,
so there is no change in default behavior.
The DFHACK_TINYXML variable is then set to either "tinyxml" or "dfhack-tinyxml"
so the library (and any plugins that need updating) can link against one
or the other.
The FindTinyXML.cmake script was taken from https://github.com/ros/cmake_modules
(licensed under the 3-clause BSD license).
Add license text to new CMake file.
2016-06-29 17:53:16 -04:00
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
a47a1c83ba
Update xml, clsocket
2016-06-07 08:17:40 -04:00
bfe7a90ec0
add NOMINMAX to Windows.h includes
2016-05-21 19:54:20 -05:00
700392ba55
Fix tinythread memory leak in two ways:
...
1. update to tinythread version 1.1, which provides a detach method
2. move the thread disassociation to the join function, which allows
attached threads to be joined even after they finish (this was the main
leak)
Also update RemoteServer.cpp to detach threads and delete the thread
objects instead of leaking them (although they are much smaller than the
actual threads).
2016-05-21 19:17:08 -05:00
71ff6f875a
Also exclude libprotoc when cross-compiling (unused)
2016-01-18 09:22:08 -05:00
e8ea5c93ca
Build testHashMap.cpp in the build directory
...
This allows switching between build directories without having to re-run CMake
2016-01-09 08:37:01 -05:00
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
80556449a1
Improve Json::get() slightly
2015-11-27 16:45:26 -05:00
485eddc54e
JsonEx -> Json
2015-11-26 20:24:14 -05:00
e15dcfd72a
protobuf: Disable unused-result warnings in release mode
2015-11-05 21:52:04 -05:00
867b733a04
Fix a few GCC warnings on Linux (GCC 4.6)
2015-11-05 21:48:13 -05:00
f4a2188e42
Travis: Build DFHack
2015-10-03 15:58:41 -04:00
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
d71969fef9
Update clsocket
2015-10-03 13:55:16 -04:00
45d095cbab
Replace translate_socket_error() implementations with DescribeError()
2015-10-03 10:37:48 -04:00
071f67f2aa
Add some JSON helper functions
2015-07-29 20:09:55 -04:00
d02e67267a
Replace jsonxx with jsoncpp
2015-07-29 15:50:33 -04:00
527b17d964
Update submodules
2015-07-04 20:45:37 -04:00
7c943179c7
Update clsocket
2015-04-30 19:22:53 -04:00
f3508f82c1
Add jsonxx to depends/
2015-03-20 15:45:38 -04:00
7abe70feb8
Update clsocket
2015-03-05 17:22:21 -05:00
100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
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
d2039386b0
Add <algorithm> includes and use min/max to get them into global scope
2014-11-09 11:20:09 +01:00
b74d0da872
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-04-26 09:23:21 +05:30
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
a70fbf41d4
Reapply dfhack-specific lua build configuration.
2014-03-31 14:15:50 +04:00
1132bea917
Update to Lua 5.2.3
2014-03-31 14:15:09 +04:00
24d8a1f1c1
Added headers to tinythread cmake so that ide would show them.
2013-06-29 12:23:21 +03:00
7224c8746a
Print the new md5 hash after modification in binpatch.
2012-10-08 16:47:52 +04:00
634c281f00
Track clsocket
2012-09-28 22:44:14 +02:00
1325b70e41
Cleanup autolabor+cleanowned, fix depends/clsocket
2012-09-13 14:42:17 -05:00
96abc903ab
Merge branch 'master' of http://github.com/peterix/dfhack
2012-09-10 11:54:56 -04:00
274d6038ad
Merge further changes (???)
2012-09-10 09:19:21 -04:00
270351f510
Merge branch 'master' of https://github.com/danaris/dfhack
2012-09-10 09:18:24 -04:00
509d957090
Make protobuf behave with multiple build folders involved.
2012-08-17 13:02:31 +02:00
81ea0345ad
Fix cage-related bug in the sort plugin.
2012-08-03 16:09:51 +02:00
b2623e68a3
Track submodules
2012-07-11 14:38:04 -05:00
068542d58a
Submodule changes
2012-07-05 11:39:08 -04:00
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
9b941bcd4d
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Trying out angavrilov's changes
2012-06-18 09:29:20 -04:00
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
eeaae916ed
Reapply dfhack-specific lua build configuration.
2012-06-17 16:01:46 +04:00
534367546d
Update to Lua 5.2.1
2012-06-17 16:01:46 +04:00
12543d6a5b
Make offsets with "darwin" os-type recognized as Apple, rather than ignored
2012-06-14 13:42:06 -04:00
8f67139a75
fix clsocket?
2012-06-03 14:33:44 -04:00
1e0ff32ad4
fix clsocket?
2012-06-03 11:01:13 -04:00
08c302f3d1
Merge branch 'master' of https://github.com/peterix/dfhack
2012-05-30 07:52:56 -05:00
0749233ed1
And again...
2012-05-30 01:12:29 +02:00
Ben Rosser
lethosor
Ben Lubar
Japa
Alexander "Ace" Olofsson
Alexander Gavrilov
Warmist
Petr Mrázek
Quietust
Timothy Collett
Kelly Martin
Timothy Collett