9c6611dfc3
Clean up CMakeLists.txt
2015-09-26 13:16:05 -04:00
f2696cfd3d
Show all missing submodule errors
2015-09-26 10:51:29 -04:00
2bcf74d74c
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-09-26 10:46:45 -04:00
ec17685041
CMake: Add compiler checks and GCC version checks
2015-09-26 10:46:29 -04:00
5352d37967
BUILD_DOCS should be a visible CMake option.
2015-09-25 19:43:40 -04:00
9b07ebbf97
Install documentation.
2015-09-25 18:53:46 -04:00
cc752a582e
Initial CMake version of Sphinx stuff.
2015-09-24 02:09:23 -04:00
418d2831ef
Add a framework for including 3rd-party script repos
...
Repos need to include a CMakeLists.txt file with calls to the
DFHACK_SCRIPTS macro, which functions similarly to DFHACK_PLUGIN.
The `open-legends` script from lethosor/dfhack-scripts is included
as an example.
2015-08-06 21:50:01 -04:00
d02e67267a
Replace jsonxx with jsoncpp
2015-07-29 15:50:33 -04:00
524593a3d3
Locate git with find_package
2015-06-25 11:43:54 -04:00
5bb5d87ad8
Install default dfhack-config files
...
Files from the "dfhack-config" source directory are now installed to
"dfhack-config/default" and copied to "dfhack-config" on startup if
they don't already exist. Previously, config files weren't available
at all unless they were manually installed (93c9a41
2015-06-18 08:59:01 -04:00
93c9a41a3a
Reimplement dwarfmonitor widgets in Lua (and improve customizability)
...
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.
Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
no longer copied into the DF directory when building DFHack. This
keeps developers' personal settings intact, but will require
copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
9b8b95e145
Check for jsonxx submodule in CMakeLists.txt
...
Addresses #603
2015-05-09 19:44:26 -04:00
6eb929b306
Move JSON files out of hack/ folder
2015-05-09 16:04:15 -04:00
6c72a0850d
Set MACOSX_RPATH to 1
...
This allows plugins with vmethod hooks to be reloaded on OS X by making paths
embedded in shared libraries use @rpath instead of embedding the build
directory, which avoids the need to change them them later. Modifying paths in
libdfhack.dylib caused it to be reloaded, which prevented hooks from working.
2015-04-18 11:40:20 -04:00
3ca00f85d0
Merge remote-tracking branch 'lethosor/json' into develop
2015-04-08 20:18:13 -04:00
f9b431b54d
Version bump and update NEWS.
2015-03-30 12:38:56 -04:00
f3508f82c1
Add jsonxx to depends/
2015-03-20 15:45:38 -04:00
0f77a1a578
Move DFHack version to a separate (static) library
...
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
e006eb21e8
Bump version and update NEWS.
2015-01-31 23:22:42 -05:00
08110312ff
No more caching DFHACK_RELEASE in CMake stuff.
2015-01-25 14:21:00 -05:00
4d194da530
Merge remote-tracking branch 'origin/develop' into 0.40.24-dev
2015-01-17 08:53:49 -05:00
43d7f59e0b
Bump version to 0.40.24-r0 and update xml
2015-01-14 15:09:23 -05:00
4999086846
Use "OSX" in package names on OS X instead of "Darwin"
2015-01-07 16:03:24 -05:00
dd9cb70ad3
Update CMakeLists to 0.40.23-r1
2015-01-05 15:56:22 -05:00
10fa55570e
Update release version.
2014-12-05 00:10:59 -05:00
760acf017b
Update version to v0.40.19
2014-12-02 13:51:44 +03:00
56fb63ae6d
Update version to 0.40.16-r1.
2014-11-20 00:04:12 -05:00
0f5efb47ae
Update to 0.40.15.
2014-11-09 01:30:43 -05:00
d35e422511
Update NEWS and CMakeLists for release.
2014-11-05 21:30:31 -05:00
04ec2c9932
Update version to v0.40.14 and hack things so they compile.
...
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
e6901a87d3
Update to 0.40.13 structures and fix compilation.
2014-09-19 00:05:15 +04:00
1983a05fb5
Merge remote-tracking branch 'lethosor/update-news'
2014-09-16 18:04:42 -04:00
d223655dc7
Bump version to 0.40.12-r1.
2014-09-16 16:53:19 -04:00
20df0511a1
Update NEWS
...
Add unlisted changes in 0.40.11-r1
Also include NEWS in installation directory
2014-09-09 22:51:44 -04:00
36a6e26e2f
Merge pull request #319 from eswald/releasing
...
Linux Release Improvements: package format.
2014-09-08 13:13:45 -04:00
cf06dc3503
Update to 0.40.11, fix a few devel plugins to build again
2014-09-04 08:26:45 -05:00
6a2d65c6d7
Switching to bzip2 for Linux packages.
...
The resulting packages tend to be about 10% smaller than gzip.
2014-08-29 18:55:17 -06:00
1de9405ef3
Update some stuff to 0.40.10
2014-08-28 14:07:03 -05:00
4da333fca1
Fix Buildings module to work with ui.tax_collection.rooms change
2014-08-18 16:33:12 -05:00
b6be4fa236
Update to r2.
2014-08-15 09:25:45 -04:00
9887d4a2e8
Bump version.
2014-08-15 02:30:04 -04:00
b0e1b51d2a
Change version to v0.40.08
2014-08-11 23:49:24 +04:00
002bd5240b
Bump version to v0.40.07 and update find-offsets to new pressure plate UI.
2014-08-11 14:14:42 +04:00
1c409975de
Update the version to v0.40.05
2014-07-28 08:15:03 +04:00
97de21357c
First pass for 0.40 compatibility; still lots left to do, but this will at least build
2014-07-21 13:18:29 -05:00
f68279f87d
Bump version to r5, update documents, include more documentation.
2014-06-20 02:48:12 -04:00
c7e34c1e5a
Update CMakeLists to r4.
2013-10-19 20:40:31 -04:00
599af0a4d9
Fix linux and windows build issues.
...
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
b961cb6a09
Merge branch 'master' of https://github.com/peterix/dfhack
2013-03-16 12:51:31 +13:00
e7c102646c
Change cmakelists to r3
2013-03-14 06:59:31 +01:00
62ee18ad06
Disable optimization in MSVC RelWithDebugInfo to make debugging easier.
2013-01-19 12:21:57 +13:00
35f4984b5f
Enable multi-processor compilation on MSVC
2013-01-19 11:05:41 +13:00
7c1fb39ec0
No need for these to be separate variables
2013-01-09 10:19:43 -06:00
fb8532ad84
Add some screenshots to the readme document.
...
Using the standard 800x600 tileset as the common
denominator (and it results in smaller images too).
2012-11-20 13:07:27 +04:00
e2b9b703a0
Get rid of tabs
2012-11-16 15:33:36 -06:00
2d83b4fa39
We don't need docutils
2012-10-24 14:07:46 -05:00
bb39b2e45b
Lua API, not LUA Api.
2012-09-30 06:55:52 +02:00
e2d810ddc2
Put HTML back.
2012-09-30 06:44:00 +02:00
dd9be6cc7c
The usual derp with files not added: Contributors.rst
2012-09-30 04:16:54 +02:00
8812238bf6
Update license, add contributors file, bump release number
2012-09-30 04:03:37 +02:00
38f2ae399a
Generate html documentation as part of the normal build.
2012-09-29 03:30:38 +02:00
09ddccea6c
Purge html files, add docutils cmake module
2012-09-29 03:06:39 +02:00
236ffd578b
Add experimental support for interposing vmethods of known classes.
...
The hairiest bit is the abuse of compiler-specific pointer-to-member
internals in order to provide more or less transparent API.
2012-08-17 22:40:53 +04:00
f2a30c1a92
Remove build-time dependency on SDL
2012-06-14 13:42:40 -04:00
eaac32c765
Version bump and text updates.
2012-06-14 00:29:01 +02:00
6d65683b02
Adjust packaging for Mac
2012-05-29 16:12:35 -04:00
7e88631698
Trying a different method now (with install_name_tool)
2012-05-24 15:02:53 -04:00
24d221052b
Initial changes to get dfhack building on the Mac
2012-05-24 11:31:20 -04:00
20794ebf19
Bump version to 0.34.10-r1
2012-05-21 21:40:51 +02:00
0a6982f404
Enable warnings correctly on linux and fix a lot of them.
2012-04-20 13:30:37 +04:00
b1c5621123
Bump release to r2
2012-04-17 23:24:43 +02:00
a19d25f532
Merge https://github.com/warmist/dfhack
2012-04-15 01:27:09 +02:00
f235d8f371
Orbital nuking was bit excessive...
2012-04-15 01:27:02 +03:00
e686b1c8e2
Orbital nuking of C4819 (code-page warning)
2012-04-15 01:20:59 +03:00
c6c6c51766
The 'r' in release string is now also tweakable.
2012-04-14 23:38:29 +02:00
610a23252e
Make release string tweakable.
2012-04-14 23:36:45 +02:00
7fa4ffeb9e
Add a html version of the LUA API doc, package it.
2012-04-05 02:39:38 +02:00
0f41608ed4
Pull console output support and REPL out of dfusion into core lib.
2012-03-31 15:40:54 +04:00
543f3970db
Tweak readme, bump version to 0.34.07
2012-03-31 01:13:21 +02:00
dd33c80324
Another revision number...
2012-03-29 22:01:37 +02:00
b847a026e3
Increment revision due to DERP.
2012-03-29 19:17:48 +02:00
6ea0d810bb
Merge https://github.com/mikestewart/dfhack
2012-03-28 19:52:36 +02:00
4b2837dc39
Bump version to 0.34.06-1
2012-03-28 11:56:46 +02:00
b57ab1493c
Look for df-structures instead of protobuf in the submodule check.
2012-03-27 08:42:49 -07:00
92bae9d652
Removed dead check...
2012-03-26 16:39:16 -07:00
4ed6953bb6
Added a test for submodules that prints out a helpful error message.
2012-03-26 16:37:37 -07:00
f549f4e545
Merge https://github.com/warmist/dfhack
2012-03-23 22:59:28 +01:00
1311f4fbf9
bump version
2012-03-21 17:55:49 +01:00
dbbd9acfad
Export the type tree with enum keys to lua.
2012-03-19 20:12:27 +04:00
e7851f5abd
Improve support for void RPC functions, dfhack-run, etc.
2012-03-15 11:07:43 +04:00
560e977f05
Implement trivial RPC interface for dfhack via TCP & protobufs.
...
Use it to make an executable capable of calling commands remotely.
2012-03-14 19:57:29 +04:00
2725fe5568
More tweaking.
2012-03-13 15:36:44 -05:00
36e3aada8e
More tweaks to MSVC solution folders.
2012-03-13 15:36:44 -05:00
778a1cd6bb
Fix problem with solution folders being generated for MSVC Express
...
Uses MFC header availability to detect Express versions.
2012-03-13 15:36:43 -05:00
9079ffa4ff
Add clsocket as a dependency for dfhack lib.
2012-03-13 17:10:46 +01:00
eb4757043b
Move depends out of main library, make them (static) libraries.
2012-03-13 14:46:48 +01:00
b3f6bccdf6
Merge branch 'cleanups' of https://github.com/plaes/dfhack
2012-03-12 15:05:44 +01:00
003a0f9eb8
Merge https://github.com/angavrilov/dfhack
2012-03-10 15:51:45 +01:00
50b7db982f
Fix zlib, protobuf.
...
Zlib is now found using CMake on linux and set to harcoded paths
on windows, yet uniform in use throughout the build system.
protobuf-lite now compiles under MSVC properly.
2012-03-10 15:31:46 +01:00
8cc82d5876
Make plugins accept explicit output stream references.
...
This is an incompatible change to the plugin ABI.
The Console is not thread-safe unless used indirectly
via color_ostream_proxy, so everything should use their
per-thread stream.
2012-03-10 15:55:42 +04:00
c260aca3f1
Merge https://github.com/angavrilov/dfhack
2012-03-10 02:15:34 +01:00
edf77cf270
Link protobuf to dfhack core as a shared library.
...
- Change protobuf libraries to build as DLLs.
- Move some stream features to the lite library.
- Install the lite library and use it from dfhack.
Note that:
- A couple of protobuf headers had to be tweaked.
- The lite library is used because the full one is
absolutely incompatible with reloading plugins.
- Shutting down protobuf also can't be allowed.
2012-03-09 19:46:21 +04:00
c64919a1bb
Bump version to 0.34.05
2012-03-08 00:07:35 +01:00
c0164c02bd
Bump version to 0.34.04-r1
2012-02-29 17:46:05 +01:00
26c15a1d51
Nuke wagons, move regrass to devel, bump to a dev version.
2012-02-28 23:33:02 +01:00
f0fc0d4428
Bump version to 0.34.03-r1, update docs to list new plugins.
2012-02-28 22:30:55 +01:00
731472a478
Add eggy hooks (linux only for now)
2012-02-28 03:37:56 +01:00
f8721c88b5
dev version. update structures, stonesense
2012-02-27 20:10:31 +01:00
1299b0d4c6
Don't compile Lua on UNIX
2012-02-23 13:49:07 +02:00
2cd2ee9b0c
New plugin interface
2012-02-21 18:19:17 +01:00
0d5c85ac04
Properly remove Debug (and MinSizeRel) build configurations
2012-02-16 08:07:10 -06:00
f600928ec1
Move catsplosion, tweak for build targets under MSVC.
2012-02-13 17:43:41 +01:00
1ae1549513
Tag 31.25-r9b
2012-02-06 10:30:09 +01:00
8f1a2ebf7f
Added missing keybinding mention to 'ls', DFusion hotfix.
2012-02-06 04:47:13 +01:00
e751f9a3eb
Update stonesense, safe-ish CXXFLAGS for linux.
2012-02-02 05:43:43 +01:00
57b5ed8fa7
Made invalid tile types really invalid, license and unused depends cleanup.
2011-11-25 18:54:50 +01:00
2c27119d85
Set CXXFLAGS properly to ensure compatibility with i686 systems.
2011-11-06 21:16:16 +01:00
f4ebd77c47
Bump revision to 8
2011-11-06 01:31:23 +01:00
af46b262b5
More init hardening.
2011-11-04 09:08:29 +01:00
550cde83f3
Bump revision number.
2011-11-03 02:42:05 +01:00
4df380eb91
Bump revision to 7c.
2011-11-02 01:16:17 +01:00
f0417e12dd
Hardening.
2011-11-01 13:06:27 +01:00
13ca2e608f
Added df2mc (TroZ) and drybuckets (Quietust) plugins
2011-10-30 02:50:29 +01:00
e9a04dfa65
Circle designator uses diameter instead of radius, has no overdraw.
2011-08-27 05:50:14 +02:00
4922be0a75
Circle dig designation tool.
2011-08-22 15:18:35 +02:00
0808c9c0ab
Add support for stonesense distributed with allegro libs as .so
2011-08-20 13:37:14 +02:00
09cb6a6828
Added exporatory mining patterns tool.
2011-08-17 13:26:03 +02:00
03e3e9002b
Linux debug...
2011-08-16 23:39:18 +02:00
292074116e
Fix crash bugs in liquids and tiletypes.
2011-08-15 01:30:15 +02:00
a0f99ef707
Many tweaks to plugins, reorganized the build system and removed more cruft.
2011-08-14 08:42:21 +02:00
d860d3b3c6
Add static lua lib
2011-08-08 23:19:44 +02:00
b75072f89e
Reworked readme file.
2011-08-08 05:45:35 +02:00
2470e564a9
Linux-side of threading function rewrite. Windows=broken.
2011-07-27 05:59:09 +02:00
bd9643c8cc
Merge branch 'dfapi'
...
Conflicts:
CMakeLists.txt
library/DFProcess-linux.cpp
library/include/dfhack-c/modules/Creatures_C.h
library/include/dfhack/modules/Maps.h
library/modules/Creatures_C.cpp
2011-07-23 17:29:05 +02:00
792d272fbf
Windows side of the Console rewrite
2011-07-14 04:05:27 +02:00
aeeece5c5f
Made kittens plugin optional, and disabled by default.
2011-07-12 00:07:59 +02:00
fa4d2d9b2e
Removed some silly data races from using cerr...
2011-07-11 23:07:42 +02:00
cecbf60375
Added option BUILD_NO_CURSES
...
You can now do "cmake .. -DBUILD_NO_CURSES=ON" to prevent curses tools
from being compiled, since there's a problem using mvwaddwstr() on some
Linux distributions.
2011-07-07 00:16:48 -07:00
857decbcce
Plugins go into a folder, disabled console close button on windows because of bugs.
2011-06-22 18:04:22 +02:00
c6dc4900d2
Very basic plugin system.
2011-06-20 04:29:38 +02:00
f2b91d3269
Making ready for adding plugins. Fixes all over the place, more removal of obsolete parts.
2011-06-20 01:12:07 +02:00
93be1eb1fb
Yay, kittens! Also some license cleanup, IO thread usage, more SDL wrapping and ability to run reveal from DFHack console.
2011-06-16 23:53:39 +02:00
6e00dc4c8e
Update version numbers, readme file. Adding a lot of batch scripts for the windows versions of new tools.
2011-05-27 08:20:52 +02:00
07bb0408c1
Fix memory.xml and pdcurses.dll copy problems for good.
2011-05-26 12:33:38 +02:00
bb99924b24
Curses support across platforms!
2011-05-21 20:32:53 +02:00
fe6eb4b70a
Fix for MSVC build, added prototype cmd.exe detection on windows.
2011-05-15 05:19:51 +02:00
7829e12e85
Added a bunch of batch scripts for running tools, updated readme, bumped version number.
2011-05-08 10:45:37 +02:00
7ad83c80b8
added modified getopt (c++-ized) with BSD license, vegetation flags clarified, prospector lists trees and plants separately,
...
prospector pretty-prints
2011-05-02 05:03:48 +02:00
cb1dee3f46
Give unreveal tool a sensible name, bump version to 0.5.13, README updated.
2011-04-10 22:14:35 +02:00
b54b8d510b
Tagging 0.5.12
2011-04-04 12:36:18 +02:00
42366c238f
Simple packaging scripts
2011-04-02 02:34:21 +02:00
6abd2d76bb
Increment the version number
2011-04-01 06:23:43 +02:00
bf0bd7c2dd
Tagging 0.5.10, updated the readme
2011-03-27 16:47:09 +02:00
ad76fd1511
Set version to 0.5.9
2011-03-27 00:04:18 +01:00
0a35afb16a
Use proper paths in build system.
2011-03-20 17:17:33 +01:00
1481b07b6b
Ubuntu packaging magic, forgotten header files, an icon.
2011-03-19 23:26:32 +01:00
2bc7aacb79
Remove precompiled garbage, fix dfcleanmap for real
2011-03-19 20:17:04 +01:00
1cc74b395e
Use RPATH tweaks on linux to make portable packages work
2011-03-18 20:10:22 +01:00
7809ed6cd5
Small fixes to documentation and build scripts.
2011-03-18 16:47:55 +01:00
8c62221699
Doxygen integration, better defaults for the generated build system.
2011-03-18 06:07:13 +01:00
2911b203ce
DFHack. Now with more packaging fun.
2011-03-18 00:07:40 +01:00
557d6733e2
Make the build system sane, pt. 1 - no install or packages yet
2011-03-16 07:35:08 +01:00
cb86f52993
minor liquids bugfix, added typedef for planecoord so that stonesense builds. Build system bits. Doxygen bits.
2011-03-13 19:38:32 +01:00
fd1bd34752
Increment version
2011-03-11 03:42:49 +01:00
c223bb858f
Added MapExtras, ported dfliquids to MapCache. Fixed vein non-ident bug in dfvdig.
2011-03-11 03:09:45 +01:00
d0418836ba
31.20 Windows SDL OK
2011-03-06 22:20:08 +01:00
54a580ac68
Hide depend headers better, upgraded tinyxml
2011-03-01 07:50:56 +01:00
a4e844ec96
fixed misspelling of BUILD_DFHACK_C_BINDINGS
2010-08-30 12:48:58 -05:00
2dd8aed7a0
Merge branch 'master' of git://genodeen.net/adeon_dfhack
...
Conflicts:
CMakeLists.txt
library/modules/Position.cpp
2010-08-28 22:47:38 +02:00
4d4e895878
Modify root CMakeLists.txt some more to behave as submodule.
2010-08-27 18:34:12 +03:00
b87752a954
Some changes to make CMake behave when dfhack is used as a submodule.
...
Doesn't still quite make it behave but at least a bit.
2010-08-27 18:34:12 +03:00
3b29fddf7b
unify build system, start on the new offset file format
2010-08-16 00:45:02 +02:00
891c454256
Fix build of offset editor skeleton, make it optional and disabled by default.
2010-08-14 20:22:59 +02:00
21f7f8e703
Moved memory defs to /data. Memory.xml is copied into the right folder at build time (works even with MSVC).
2010-08-13 02:23:38 +02:00
1dc4aea04f
Offset editor skeleton app (just dead UI, no data yet)
2010-08-11 06:41:39 +02:00
411bb5ed97
Added CMake options to build examples and playground tools, disabled by default.
2010-07-08 22:58:01 +02:00
ec35663b62
Common base for all modules
2010-06-25 07:11:26 +02:00
3c458f4701
doxygen (default off), add creature entity printing to creaturedump
2010-06-24 00:34:35 +02:00
7885eb8e74
0.31.06-SDL, needs testing
2010-06-10 10:30:56 +02:00
04b71f154c
Fun and games. Also turning old DFWindow class into a module tracked by Context.
2010-05-26 12:24:45 +02:00
b710ed687a
Moving stuff around, part 2
2010-05-26 06:48:23 +02:00
b2acc50c90
Moving stuff around, part 1
2010-05-26 03:22:17 +02:00
863eb2546f
Added playground folder for quick hacks
2010-05-25 23:52:04 +02:00
5e65f5568b
Revived the SHM. Seems to be working, but needs a fair bit of changes.
2010-05-24 03:07:13 +02:00
8dd594dd93
Multi-process rework
2010-05-23 23:06:10 +02:00
61c5e36537
Pythn module fixes for 64bit, it gets built now, but doesn't work AFAIK
2010-04-28 23:11:24 +02:00
d080e73ac2
Son't build shm
2010-04-04 15:24:50 +02:00
7d48ea49ae
Reveal and prospector tools work. Basic inorganic matgloss works. Basic map reading works.
2010-04-03 03:52:46 +02:00
2a61cec4a7
Move depends, build them as libs
2010-04-02 17:56:38 +02:00
bcbc540283
More moving of things
2010-04-02 17:27:35 +02:00
c26da9b84c
More DF 2010 reorganization
2010-04-02 16:46:33 +02:00
1ad9dfea11
Auto-find ncurses libs and include files for veinlook
2010-03-23 21:35:14 +01:00
7c73c7abe6
CMake swig integration
2010-02-28 04:11:06 +01:00
bb141fe8f6
Linux d18 ncurses support for shm lib
...
Some boost preparations
2010-02-23 19:26:15 +01:00
054fec0afc
Updated README and COMPILE, split tools into tools and examples.
...
Tools are now useful, and with a working user interaction where applicable.
Examples are a collection of benchmarks, tests and simple unfinished ideas.
2010-02-16 07:21:38 +01:00
242bf47143
some rearrangement of the shm server part, preparing for the windows port
2010-01-04 05:20:28 +00:00
fac88478bd
code moved from khazad
2009-09-14 00:02:46 +00:00
lethosor
expwnent
Lethosor
Alexander Gavrilov
expwnent
expwnent
Quietust
Eric Wald
expwnent
Anuradha Dissanayake
Petr Mrázek
Timothy Collett
Timothy Collett
Warmist
Mike Stewart
Priit Laes
Matthew Cline
doomchild
Mikko Juola