09ec8910ca
Avoid clearing CMAKE_CXX_FLAGS for plugins
2018-07-19 15:32:08 -04:00
af53fe6740
embark-assistant: fix x=16, y=16 dimensions
2018-07-19 14:48:28 -04:00
46a28c5f52
Merge branch 'tests' into develop
2018-07-19 14:39:32 -04:00
163c9b4059
Add utils.OrderedTable, make test order consistent
...
Also added OrderedTable tests and comment support to expect.*()
2018-07-19 12:40:25 -04:00
0128bc39db
Don't include stdout.log in build output
...
This has ncurses output in it
2018-07-19 11:43:43 -04:00
5d3126403b
Switch back to coroutines for tests
2018-07-19 11:26:38 -04:00
1a2694fa2c
Merge remote-tracking branch 'BenLubar/custom-plugins-cmake' into develop
2018-07-18 19:09:05 -04:00
777a9147df
Restore some important travis settings (build supported plugins again)
2018-07-18 15:20:10 -04:00
3e82bd8f35
Ignore CMakeLists.custom.txt and create it if it does not exist during cmake.
2018-07-18 14:00:40 -05:00
75793c6750
Travis: remove DFHack-built things in DF folder from cache
2018-07-18 14:32:47 -04:00
063602349c
Add a basic test library and a couple GUI module tests (squashed)
...
Also modified Core/Console a bit to get this to actually produce output on
Travis (DFHACK_DISABLE_CONSOLE now allows console output, just not input)
Squashed merge from lethosor/tests
2018-07-18 14:29:13 -04:00
a779b247d4
Travis: fix Ninja build
2018-07-17 11:53:24 -04:00
1ebac6fad9
travis: use ninja
2018-07-17 11:49:15 -04:00
4070b5235e
Merge branch 'docs' into develop
2018-07-17 11:11:31 -04:00
55d5d47776
Fix architecture note in compile docs
2018-07-17 11:10:46 -04:00
3b44c18576
Followups for #1325
...
- Fix git tag detection
- Fix changelog entry position
- Update/clean up docs some
2018-07-17 00:58:49 -04:00
1d6c3dc871
Merge remote-tracking branch 'suokko/fix_cmake_dependencies_to_generated_headers' into develop
2018-07-17 00:24:18 -04:00
44b7e8df71
Update docs for #1351
2018-07-14 21:09:36 -04:00
790d16cc1c
Merge remote-tracking branch 'sgayda2/call_once' into develop
2018-07-14 21:08:15 -04:00
99d05117ab
fix a return statement in FirstCall
2018-07-14 12:15:52 -07:00
c2a64b3573
Update changelog, xml, bump to r1
2018-07-13 21:16:35 -04:00
f85b2c2b3c
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-07-13 20:00:52 -04:00
78f2431c93
Update xml
2018-07-13 19:59:46 -04:00
210510591b
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-07-13 19:58:27 -04:00
b44789285c
Fix Windows df-structures stubs failing to compile if the option to keep symbols is specified.
2018-07-13 15:49:37 -05:00
baef5ca319
Added Finder scrolling and Frozen search
2018-07-13 20:44:11 +02:00
1af0ec4006
Added Finder scrolling and Frozen search
2018-07-13 20:43:49 +02:00
3d5cadeb8c
Merge branch 'embark-assistant' of https://github.com/PatrikLundell/dfhack into embark-assistant
2018-07-13 17:53:34 +02:00
4137a17a78
Added Finder scrolling and Frozen search
2018-07-13 17:43:46 +02:00
658fac0b93
Added Finder scrolling and Frozen search
2018-07-13 17:43:22 +02:00
cb77c91049
Update Compile.rst to prefer ninja
2018-07-13 18:38:58 +03:00
3e47de5b45
Merge branch 'develop' into embark-assistant
2018-07-13 11:33:57 -04:00
fdf52deb36
Added Finder scrolling and Frozen search
2018-07-13 17:23:34 +02:00
02dd97722c
Added Finder scrolling and Frozen search
2018-07-13 17:23:12 +02:00
4d3f9ce13d
Added Finder scrolling and Frozen search
2018-07-13 17:22:49 +02:00
539428b741
Added Finder scrolling and Frozen search
2018-07-13 17:22:26 +02:00
f41715309a
Added Finder scrolling and Frozen search
2018-07-13 17:21:42 +02:00
cfc9b759e0
Removed embark-assistant screen size restriction
2018-07-13 17:20:55 +02:00
c2dc429b7f
embark-assistant changes noted
2018-07-13 17:20:16 +02:00
14725bce59
Make DFHACK_BUILD_ARCH default to 64
2018-07-13 11:04:33 -04:00
c259a892c3
Update scripts (modtools/force fix)
2018-07-13 11:02:36 -04:00
f02466de8a
Correct codegen.pl output dependecies for VC
...
The change allows correct and optimized incremental builds with VC and
ninja but unix makefile backend will rebuild everything if anything
changes in structures.
2018-07-13 17:01:36 +03:00
eba646c43e
Merge pull request #1359 from BenLubar/msvc-cmake
...
Add CMakeSettings.json for MSVC 2017.
2018-07-13 08:32:15 -05:00
bc8b8ef256
Use configure_file to optimize incremental builds for git-describe.h
2018-07-13 16:07:46 +03:00
1226919b16
Fix the CMAKE_BUILD_TYPE help string and make it list of strings in gui
...
While testing the build dependency issues I noticed that cmake C module
overwrites our CMAKE_BUILD_TYPE help. I decided to fix the help and make
the build type a gui string which makes it easier to select build
configuration.
2018-07-13 15:23:59 +03:00
c92b52537c
Only run once codegen.pl and git-describe.cmake with make
...
ninja has a single build file which avoided issues if multiple targets
depend on same files. But Unix Makefiles generator user recursive make
which requires each ADD_CUSTOM_COMMAND to have only one target depending
on them.
Then makefile generator also has stupid rule that it touches all
secundary output files if primary file has been updated.
It was surprising hard to find a version that actually works correctly
for both issues. Solution is using BYPRODUCTS and refactoring command
and target dependencies.
As a bonus this change now allows build to work from source tarball if
the tarball includes git-describe.h.
2018-07-13 15:23:54 +03:00
fad9d58ac6
Keep git-describe.h in source tree
...
Temporary file goes to binary directory to avoid race between
simultanous builts.
2018-07-13 15:16:04 +03:00
68d1dfa0da
Keep make output short
...
Without custom comment add_custom_command would list all target files.
2018-07-13 15:15:42 +03:00
3f34ea196b
Fix build not to delete git-describe.h
...
make doesn't keep primary output file if secundary is missing.
always_rebuild must be primary output to make the phony command work
correctly.
2018-07-13 15:15:42 +03:00
e34f10f3df
Changelog entry for the generated header dependencies
2018-07-13 15:15:42 +03:00
lethosor
Ben Lubar
Stoyan Gaydarov
PatrikLundell
Pauli
Lethosor
Ben Lubar