MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,493 Commits
1 Branch
0 Tags
40 MiB
Commit Graph

193 Commits (d04beb0e4a9b903fce241f15f2f1264701fc99a2)

Author SHA1 Message Date
DFHack-Urist via GitHub Actions d846a1c93f Auto-update submodules 
scripts: master
depends/xlsxio: dfhack
 2022-06-10 22:48:30 +00:00
DFHack-Urist via GitHub Actions 9d2bb01caf Auto-update submodules 
scripts: master
depends/libexpat: dfhack
 2022-05-28 07:17:45 +00:00
DFHack-Urist via GitHub Actions add8aa2386 Auto-update submodules 
depends/libexpat: dfhack
 2022-05-27 07:18:24 +00:00
myk002 ac8ac96080 fix warning on windows about possible loss of data 2022-05-13 14:37:13 -07:00
myk002 1b426efdb9 reduce spurious warnings from libzip 2022-05-13 14:36:22 -07:00
Myk 8f6522899b
Upgrade jsoncpp to 1.9.5 (#2144) 
* test jsoncpp upgrade

* use new json library target name

* don't remap the output dirs

* undo warnings at the source

* set new defaults for jsoncpp

* fix typo in new options

* fix signed comparison mismatch warning

* address random(?) compile failures

saying our std::atomic is not initialized in Debug.cpp
 2022-05-13 13:52:43 -07:00
DFHack-Urist via GitHub Actions 08a39400de Auto-update submodules 
depends/jsoncpp-sub: dfhack
 2022-05-12 05:33:14 +00:00
DFHack-Urist via GitHub Actions bf8eaef6bc Auto-update submodules 
library/xml: master
plugins/isoworld: master
depends/libexpat: dfhack
depends/jsoncpp-sub: dfhack
 2022-05-12 05:21:01 +00:00
DFHack-Urist via GitHub Actions baab258774 Auto-update submodules 
scripts: master
depends/libzip: dfhack
depends/libexpat: dfhack
depends/xlsxio: dfhack
 2022-05-11 07:23:49 +00:00
DFHack-Urist via GitHub Actions e95d8c7296 Auto-update submodules 
scripts: master
depends/luacov: dfhack
 2022-05-09 16:39:47 +00:00
DFHack-Urist via GitHub Actions c44a2cfa6a Auto-update submodules 
depends/luacov: dfhack
 2022-05-09 07:18:27 +00:00
myk002 11f88b2d0e
update clsocket submodule 2022-03-10 14:17:25 -08:00
myk002 858d459232
update changelog for clsocket PR#20 2022-03-10 14:07:48 -08:00
myk002 1dd567a169 only ignore the specific warning being generated 
instead of -Wno-error
 2022-02-05 16:07:47 -08:00
myk002 7cf055fcd0 avoid treating libexpat build warnings as errors 
this effectively overrides the CMAKE EXPAT_WARNINGS_AS_ERRORS to be
treated as always OFF. since we currently add -Werror at the top-level
CMakeLists.txt file, that variable was previously effectively always ON.
Unless we want to be on the hook for solving libexpat build warnings, I
believe this way will avoid unnecessary build breakages for users.
 2022-02-05 16:07:47 -08:00
lethosor 1f8392fa0b
Upgrade to Lua 5.3.6 2021-10-08 17:55:55 -04:00
lethosor 8d551c7a7c
GCC: enable -Wall and -Werror for all build types 
Also make protobuf flags consistent across build types so that release builds
pass
 2021-09-06 22:56:55 -04:00
DFHack-Urist via GitHub Actions ef0ddb729e Auto-update submodules 
library/xml: master
depends/luacov: dfhack
 2021-08-12 02:10:05 +00:00
lethosor 1db4a6d1d8
Replace lua/README with version from 5.3.3 
Also replaced doc/readme.html reference with external link
 2021-06-18 18:07:30 -04:00
myk002 d6cefcb00a
fix luacov to v0.15.0 release 2021-03-07 08:15:05 -08:00
myk002 c07c0eec10
add luacov link to license list, install luacov 2021-03-07 08:15:05 -08:00
myk002 a68c73e140
add the luacov repository itself 2021-03-07 08:15:05 -08:00
Ben Lubar 577eadf5cb
prefix with dfhack- like other dependency projects 2021-02-24 18:03:39 -06:00
Ben Lubar 67084de44b
add depends/lodepng 2021-02-24 17:58:31 -06:00
lethosor a7232499ac
Silence some warnings from GCC 10 
Specifically `gcc (Ubuntu 10.2.0-13ubuntu1) 10.2.0`
 2020-12-30 00:04:49 -05:00
lethosor 17432072f2
Also apply to xlsxio_write 2020-11-09 23:48:57 -05:00
lethosor aca2be7182
Disable MSVC warnings in dependencies 2020-11-09 23:41:43 -05:00
lethosor d43bf0ce44
Update dependencies 2020-09-21 12:27:27 -04:00
lethosor 64b1202119
Fix some CMake warnings and extraneous output 2020-09-19 01:17:25 -04:00
lethosor 89210eaf29
Update libzip (static lib) 2020-09-18 17:01:30 -04:00
lethosor 650ab3a87a
Update libzip for older CMake (on Buildmaster) 2020-09-18 15:43:03 -04:00
lethosor 7efadc85a6
Remove some unused config 2020-09-18 00:36:50 -04:00
lethosor b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation 2020-09-18 00:33:41 -04:00
lethosor f354f7800f
Switch to DFHack forks of lipzip and xlsxio, and update 
libzip: upgraded to 1.7.3 (was between 1.7.1 and 1.7.2)
xlsxio: downgraded to latest release (0.2.29), which should be inconsequential: https://github.com/brechtsanders/xlsxio/compare/0.2.29...2d12a88
 2020-09-17 21:00:16 -04:00
lethosor b47710ae6f
Upgrade libexpat 
Needed for a consistent target name: da7cda3a85
This commit is likely close to 2.2.10 anyway
 2020-09-17 20:09:13 -04:00
lethosor 1efa09582a
Change libexpat to be included with add_subdirectory() 
- Confirmed that libexpat is built statically and linked with xlsxreader
- May need da7cda3a85 for Windows
- Although libexpat's CMake options are all prefixed with LIBEXPAT_, it also adds some cache entries like SIZE_T (from expat/ConfigureChecks.cmake). Unsure if these affect other libs.
- xlsxio may need additional reconfiguration after moving to add_subdirectory() to find libexpat/libzip on non-Linux platforms.
 2020-09-17 00:25:50 -04:00
lethosor 94798a3620
Pass CMAKE_GENERATOR_TOOLSET to ExternalProject_Add instead 2020-08-22 10:38:29 -04:00
lethosor 5a77c9037e
Pass CMAKE_GENERATOR_TOOLSET (cmake -T argument) to external projects 
The dependencies introduced in #1620 cause an error when building natively on Windows, according to @ragundo. CMake is looking for build tools `v100`, which are part of VS2010 and won't work with DF/DFHack, even if they were installed.

Some of the Windows build scripts pass in `-T v140_xp` (from VS2015), so passing this option through to subprojects may help: https://cmake.org/cmake/help/latest/variable/CMAKE_GENERATOR_TOOLSET.html
 2020-08-21 19:49:33 -04:00
Myk Taylor 702228bf12 use standard CMAKE vars for prefixes and suffixes 2020-08-10 01:01:13 -07:00
Myk Taylor 6da364a60b ensure libexpat is used as a static lib 2020-08-10 00:01:47 -07:00
Myk Taylor 679ca41da8 make sure xlsxio knows to link statically 2020-08-09 21:22:17 -07:00
Myk Taylor a41f7c0998 convert XlsxReader module to xlsxreader plugin 2020-08-09 08:54:42 -07:00
Myk Taylor 5fc627a16f no lib prefix for libzip on windows too 2020-08-09 04:03:04 -07:00
Myk Taylor 7a0853025a use non-standard xlsxio lib name on windows 2020-08-09 03:30:59 -07:00
Myk Taylor 8913d43d6f ensure xlsxio_project gets built before dfhack 2020-08-09 02:59:22 -07:00
Myk Taylor f04a9c3180 clean up logging; use xlsxio's misspelling of "DIRS" 2020-08-09 02:32:31 -07:00
Myk Taylor 79415cf097 clean up dep lib vars 2020-08-09 02:24:05 -07:00
Myk Taylor 204240f3e3 specify expat include dir for xlsxio 2020-08-09 02:14:37 -07:00
Myk Taylor c7cf7fdd30 define EXPAT_LIBRARIES for xlsxio 2020-08-09 02:00:06 -07:00
Myk Taylor 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