Commit Graph

11215 Commits (ac864204c2258151b05bbe019c006c26e2c14e6b)
 

Author SHA1 Message Date
Myk Taylor c6f9eb519a remove outdated example code in xlsxreader.cpp
there is already good example code in Lua API.rst and in xlsxreader.lua,
so just remove this one
2020-08-11 13:44:07 -07:00
Myk Taylor 1e9562bd76 add target label for xlsxreader 2020-08-10 23:35:38 -07:00
Myk Taylor 438d264b31 use separate identity classes for each handle type 2020-08-10 23:09:03 -07:00
Myk Taylor 0d9614154f don't turn a rst list into code 2020-08-10 23:04:05 -07:00
Myk Taylor a2279cc9a7 update docs in Lua API.rst too 2020-08-10 14:37:59 -07:00
Myk Taylor 17c509a596 update sample code for xlsxreader to use finalize 2020-08-10 09:18:49 -07:00
Myk Taylor 69322ec429 use proper USERDATA instead of LIGHTUSERDATA 2020-08-10 01:13:16 -07: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 06e3f77e39 fix windows zlib path, hopefully for the last time 2020-08-09 10:47:15 -07:00
Myk Taylor e2129673c1 fix zlib path on windows 2020-08-09 10:11:24 -07:00
Myk Taylor 5294360908 more windows library naming shenanigans 2020-08-09 09:46:54 -07:00
Myk Taylor 4a04273fae document xlsxreader functions 2020-08-09 09:28:19 -07:00
Myk Taylor a6c0d8f196 Merge remote-tracking branch 'upstream/develop' into quickfort_userguide 2020-08-09 08:56:30 -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
Myk Taylor bb988d25e6 try to get the library suffix right for windows 2020-08-09 00:24:25 -07:00
Myk Taylor 51794d91ed really get the env vars 2020-08-08 23:55:24 -07:00
Myk Taylor b0cb40c5ea pass the cmake environment to deps 2020-08-08 22:42:50 -07:00
Myk Taylor 8d157012d0 build dfhack with verbosity on too 2020-08-08 22:04:49 -07:00
Myk Taylor 1cfe2735d3 build deps in verbose mode for debugging 2020-08-08 22:03:42 -07:00
Myk Taylor d65504eb82 ensure CFLAGS and CXXFLAGS get propagated to deps 2020-08-08 21:19:38 -07:00
Myk Taylor 8753f9feaf use correct lib dir on 32-bit 2020-08-08 20:42:03 -07:00
Myk Taylor 8a05f09cd6 add libexpat to the build 2020-08-08 20:18:43 -07:00
Myk Taylor e7afc4cfeb fix libexpat at v2.2.9 2020-08-08 20:10:13 -07:00
Myk Taylor 8de39c2d7d add libexpat as a submodule 2020-08-08 20:09:29 -07:00
Myk Taylor cffac8ed93 fix line endings in XlsxReader.cpp 2020-08-08 20:07:54 -07:00
Myk Taylor 28eaf0ae8b add libzip to the build 2020-08-08 20:04:46 -07:00
Myk Taylor eeeb638c1c fix libzip at v1.7.3 2020-08-08 19:48:11 -07:00
Myk Taylor 4f0eb4bca6 add libzip dep 2020-08-08 19:47:02 -07:00
Myk Taylor 8c7fb808e1 get xlsxio Lua API working 2020-08-08 17:55:49 -07:00
Myk Taylor 18f4786458 Merge remote-tracking branch 'upstream/develop' into quickfort_xlsxio 2020-08-08 17:17:45 -07:00
Myk Taylor 89a6309788 build xlsxio and link it into dfhack, add lua api 2020-08-08 15:24:12 -07:00
lethosor f2b0f012c9
Bump to 0.47.04-r2 2020-08-08 14:53:24 -04:00
lethosor 504b0c1ec7
Update changelog (#1596) 2020-08-08 14:47:59 -04:00
lethosor 73ba692f15
Fix road building (#1596)
Paved roads need architecture before road building
2020-08-08 14:46:42 -04:00
lethosor b2368b3c34
Merge remote-tracking branch 'ab9rf/labormanager-custom-furnaces' into develop 2020-08-08 14:35:44 -04:00
lethosor 8c5b21b7ee
Fix a couple warnings in the Units module (#1615) 2020-08-08 14:35:12 -04:00
lethosor 7ee58ada7b
Update scripts 2020-08-08 14:29:24 -04:00
lethosor 8f047530c4
Make Units::getRaceNameById and other ID-related functions available to Lua 2020-08-08 14:28:17 -04:00
lethosor 13380008c4
Update scripts, authors, changelog 2020-08-08 13:28:31 -04:00
lethosor 3b3b0be8c5
Update submodules, tweak changelog order 2020-08-08 02:00:12 -04:00