702228bf12
use standard CMAKE vars for prefixes and suffixes
2020-08-10 01:01:13 -07:00
6da364a60b
ensure libexpat is used as a static lib
2020-08-10 00:01:47 -07:00
679ca41da8
make sure xlsxio knows to link statically
2020-08-09 21:22:17 -07:00
a41f7c0998
convert XlsxReader module to xlsxreader plugin
2020-08-09 08:54:42 -07:00
5fc627a16f
no lib prefix for libzip on windows too
2020-08-09 04:03:04 -07:00
7a0853025a
use non-standard xlsxio lib name on windows
2020-08-09 03:30:59 -07:00
8913d43d6f
ensure xlsxio_project gets built before dfhack
2020-08-09 02:59:22 -07:00
f04a9c3180
clean up logging; use xlsxio's misspelling of "DIRS"
2020-08-09 02:32:31 -07:00
79415cf097
clean up dep lib vars
2020-08-09 02:24:05 -07:00
204240f3e3
specify expat include dir for xlsxio
2020-08-09 02:14:37 -07:00
c7cf7fdd30
define EXPAT_LIBRARIES for xlsxio
2020-08-09 02:00:06 -07:00
43bcec4a57
move libzip to older version
...
although they declare that they only need cmake 3.0.2, they started
using add_compile_definitions(), which was added in cmake 3.12
git checkout 29b881d fixes this
2020-08-09 00:46:50 -07:00
bb988d25e6
try to get the library suffix right for windows
2020-08-09 00:24:25 -07:00
51794d91ed
really get the env vars
2020-08-08 23:55:24 -07:00
b0cb40c5ea
pass the cmake environment to deps
2020-08-08 22:42:50 -07:00
1cfe2735d3
build deps in verbose mode for debugging
2020-08-08 22:03:42 -07:00
d65504eb82
ensure CFLAGS and CXXFLAGS get propagated to deps
2020-08-08 21:19:38 -07:00
8753f9feaf
use correct lib dir on 32-bit
2020-08-08 20:42:03 -07:00
8a05f09cd6
add libexpat to the build
2020-08-08 20:18:43 -07:00
e7afc4cfeb
fix libexpat at v2.2.9
2020-08-08 20:10:13 -07:00
8de39c2d7d
add libexpat as a submodule
2020-08-08 20:09:29 -07:00
28eaf0ae8b
add libzip to the build
2020-08-08 20:04:46 -07:00
eeeb638c1c
fix libzip at v1.7.3
2020-08-08 19:48:11 -07:00
4f0eb4bca6
add libzip dep
2020-08-08 19:47:02 -07:00
89a6309788
build xlsxio and link it into dfhack, add lua api
2020-08-08 15:24:12 -07:00
1fc800e765
fix xlsxio lib to current commit
...
so it doesn't break us with incompatibile changes. we only need to
update this lib if/when we run into a bug with it. no need to introduce
instability by tracking HEAD
2020-08-07 13:08:06 -07:00
b033e4644f
add xlsxio as a submodule
2020-08-07 12:44:40 -07:00
f3b3cb1b33
Remove fast_mutex from CMakeLists
2020-05-04 19:26:49 -04:00
1dc2d4b6aa
Remove tthread::fast_mutex entirely
...
This can deadlock on Linux, per be517370a6
2020-05-04 18:41:59 -04:00
7bdf958518
Fix protobuf compilation with GCC 10 on Fedora
...
Fixes #1506
2020-04-24 21:18:46 -04:00
90e0c29a5c
implement posix_memalign on Windows for sizecheck
2020-03-26 17:46:00 -05:00
76dba44679
update clsocket
2020-02-24 10:40:28 -06:00
0ec12657f4
sizecheck: add MALLOC_PERTURB_ support on non-Linux
2020-02-18 00:44:07 -05:00
360e6e9afb
fix possible crash due to something modifying the 4 bytes between the sizecheck header and the actual allocated data on 64-bit
2020-02-14 17:38:18 -06:00
3c9f6f79ab
fix some warnings
2020-02-10 19:35:17 -06:00
f54c361718
Add an implementation of mifki's sizecheck library (tested on Linux)
2020-02-08 21:18:29 -05:00
815821eb93
Merge branch 'develop' into cmake-cleanup
...
Conflicts:
depends/lua/CMakeLists.txt
plugins/CMakeLists.txt
plugins/devel/CMakeLists.txt
2020-01-18 22:28:43 -05:00
8675ff660c
Windows+Ninja: Fix build error due to trying to include " dfhack_llimits.h"
...
Ref #1455
2019-10-04 13:15:58 -04:00
dcce9ae599
Add quotes around dfhack_llimits.h include for MSVC
...
Fixes #1455
2019-10-04 13:07:26 -04:00
8a07426643
Merge branch 'develop' into cmake-cleanup
2019-07-20 15:15:39 -04:00
b6678d72ae
Move custom lualimit.h to lua dir and rename to dfhack_llimits.h
2019-07-20 14:26:30 -04:00
a90a6b2a7b
Make lua data race free
...
Fixes tsan trace report between lua viewscreen and other threads running
lua without CoreSuspender lock. But I would assume similar races exists
when using lua from console thread, remote thread and vmethods same time.
2019-07-18 23:04:40 -04:00
76da2c2aaf
Clean up CMakeLists.txt style
2019-07-16 22:19:11 -04:00
a5018c9b81
Exclude jsoncpp default CMake targets.
...
Removes the lib and include directories from the DFHack package.
Removes the status message that lists the jsoncpp version number.
2018-07-08 23:16:08 -05:00
2b79b4cce7
Use jsoncpp 1.8.4 as a submodule
...
This makes jsoncpp a submodule that can be build directly from git
sources. This changes depends/jsoncpp to depends/jsoncpp-sub to avoid
filename conflict if someone tries to use git bisect.
jsoncpp library name changes to jsoncpp_lib_static.
jsoncpp version is the latest tagged release.
2018-06-14 21:20:46 +03:00
424028a0ae
jsoncpp: Fix (U)Int64 to long int on 64bit linux
...
Passing a 64bit integer to Json::Value fails to find matching. Even
tough long long int is also 64bits gcc considres long long int different
to long int. But fix can't be as simple as removing an long from type
because that would reduce 32bit builds to have only 32bit maximum int
size. But standard offers fixed width integer types that can be used to
get correct underlying type depending on platform.
2018-06-14 17:24:50 +03:00
01abcb756e
Request c++14 support from compilers
...
All platforms seems to either have compiler supporting c++14. Windows
already requires msvc2015 that supports c++14 which should make it
minimal issue to require c++14 support from all compilers because gcc
is pretty easy to upgrade.
2018-06-10 23:15:33 +03:00
9cf4cdbc1f
Simplify CMakeLists.txt for protobuf.
...
All of the compilers we support have std::unordered_map and std::unordered_set in their standard locations.
2018-05-13 16:55:38 -05:00
e2cd1fca58
Reorder dfhack-md5 GCC flags, fix another embark-assistant warning
2018-05-13 13:09:51 -04:00
016dab3990
Fix more warnings, including stonesense
2018-05-12 22:10:07 -04:00
Myk Taylor
lethosor
Ben Rosser
Ben Lubar
Pauli