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
2956e654d4
Add dependency from codegen.pl to df/*.h
2018-07-13 15:15:42 +03:00
5154370402
Add full paths to codegen.pl error messages
...
I noticed that relative paths were not correctly guessed by vim. I
decided to fix the paths to allow me quickly to jump to error line in
xml.
2018-07-13 15:15:42 +03:00
b3b23e8278
Add dependency from git-describe.h to DFHackVersion.cpp
...
Using add_custom_command allows cmake to track dependency from command
to git-describe.h that is implicit dependency of DFHackVersion.cpp.
The change also fixes issues if there is multiple build directories and
git-describe.h missing but git-dsecribe.h.tmp is present.
2018-07-13 15:15:39 +03:00
c82532fd4b
Merge remote-tracking branch 'suokko/ruby_memory_return_calling_convention' into develop
2018-07-12 14:53:20 -04:00
242dabfdb0
Update scripts/rejuvenate.lua
2018-07-12 14:44:29 -04:00
61890c5a60
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-07-12 10:34:23 -04:00
7f523f4be2
Mention the need to initialize new submodules after `git pull` too
...
See #1361
2018-07-12 10:33:04 -04:00
2e34a480e5
Update Compile.rst note about Visual Studio.
2018-07-11 20:29:11 -05:00
7486423e6d
Add CMakeSettings.json for MSVC 2017.
...
MSVC 2017 is binary-compatible with MSVC 2015, so it's safe to allow CMake to be used from within Visual Studio 2017.
2018-07-11 16:57:52 -05:00
350ead2651
Add digv and related anchors
2018-07-11 12:02:30 -04:00
9ee368d456
Merge remote-tracking branch 'suokko/MapCache_reduce_latency_from_designation_to_jobs' into develop
2018-07-11 11:51:24 -04:00
7afa3690bf
Add support for DFHACK_BUILD_ID
...
Used for BuildMaster builds, for example
2018-07-11 11:47:55 -04:00
e1d1182406
Add embark-assistant changes to changelog
2018-07-10 13:04:42 -04:00
2d8be8f4ad
Update xml (dlsym vtables, dfhack/df-structures#282 )
2018-07-10 13:01:54 -04:00
fa8c6724f6
Merge remote-tracking branch 'suokko/dlsym_libgraphics' into develop
2018-07-10 12:25:11 -04:00
dd3c04eb26
Merge remote-tracking branch 'suokko/windows_crash_after_die' into develop
2018-07-10 11:57:10 -04:00
lethosor
Stoyan Gaydarov
Ben Lubar
PatrikLundell
Pauli
Lethosor
Ben Lubar