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

11158 Commits (514e5ee5bb2e228e4d4564042aab037473e487ca)
 

Author SHA1 Message Date
Ben Lubar eba646c43e
Merge pull request #1359 from BenLubar/msvc-cmake 
Add CMakeSettings.json for MSVC 2017.
 2018-07-13 08:32:15 -05:00
Pauli bc8b8ef256 Use configure_file to optimize incremental builds for git-describe.h 2018-07-13 16:07:46 +03:00
Pauli 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
Pauli 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
Pauli 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
Pauli 68d1dfa0da Keep make output short 
Without custom comment add_custom_command would list all target files.
 2018-07-13 15:15:42 +03:00
Pauli 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
Pauli e34f10f3df Changelog entry for the generated header dependencies 2018-07-13 15:15:42 +03:00
Pauli 2956e654d4 Add dependency from codegen.pl to df/*.h 2018-07-13 15:15:42 +03:00
Pauli 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
Pauli 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
lethosor c82532fd4b Merge remote-tracking branch 'suokko/ruby_memory_return_calling_convention' into develop 2018-07-12 14:53:20 -04:00
lethosor 242dabfdb0 Update scripts/rejuvenate.lua 2018-07-12 14:44:29 -04:00
lethosor 61890c5a60 Merge branch 'develop' of gh:dfhack/dfhack into develop 2018-07-12 10:34:23 -04:00
lethosor 7f523f4be2 Mention the need to initialize new submodules after `git pull` too 
See #1361
 2018-07-12 10:33:04 -04:00
Ben Lubar 2e34a480e5
Update Compile.rst note about Visual Studio. 2018-07-11 20:29:11 -05:00
Ben Lubar 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
lethosor 350ead2651 Add digv and related anchors 2018-07-11 12:02:30 -04:00
lethosor 9ee368d456 Merge remote-tracking branch 'suokko/MapCache_reduce_latency_from_designation_to_jobs' into develop 2018-07-11 11:51:24 -04:00
lethosor 7afa3690bf Add support for DFHACK_BUILD_ID 
Used for BuildMaster builds, for example
 2018-07-11 11:47:55 -04:00
lethosor e1d1182406 Add embark-assistant changes to changelog 2018-07-10 13:04:42 -04:00
lethosor 2d8be8f4ad Update xml (dlsym vtables, dfhack/df-structures#282) 2018-07-10 13:01:54 -04:00
lethosor fa8c6724f6 Merge remote-tracking branch 'suokko/dlsym_libgraphics' into develop 2018-07-10 12:25:11 -04:00
lethosor dd3c04eb26 Merge remote-tracking branch 'suokko/windows_crash_after_die' into develop 2018-07-10 11:57:10 -04:00
lethosor dd340ebfe3 Changelog updates for #1338, #1353 2018-07-10 11:38:36 -04:00
Pauli 988a5a7813 Changelog entry for the fix 2018-07-10 18:27:06 +03:00
lethosor 06511340ab Merge remote-tracking branch 'BenLubar/proto-docs' into develop 2018-07-10 11:26:31 -04:00
Pauli 7d92d3f48f Fix the class vs struct warning 2018-07-10 18:24:34 +03:00
Pauli 5eea7198a9 Make Core::~Core safe to call after die 
Fixes #1356
 2018-07-10 18:24:34 +03:00
lethosor 4a842810d5 Update xml, changelog 2018-07-10 11:24:26 -04:00
lethosor 21b9e828d3 embark-assistant: add spaces around keys 
Further spacing work is tedious without rewriting it to use DFHack::Screen or
uicommon.h as every coordinate needs to be adjusted by hand
 2018-07-10 11:22:12 -04:00
Pauli ce6af3d649 Use c++ standard std::_Exit instead of _exit 
_exit seems to run dll unloading code which calls static destructors.
Standrd requires std::_Exit not to call destructors which makes using it
attractive in case MSVC actually follows the standard.
 2018-07-10 18:21:09 +03:00
lethosor eb1f3e1d4c embark-assistant: add spaces around drawBorder titles 2018-07-10 11:01:22 -04:00
lethosor 8dec8c332f embark-assistant: use STANDARDSCROLL keys instead of CURSOR keys for scrolling 2018-07-10 10:59:52 -04:00
Pauli 96c9b8b864 Add windows emulation for RTLD_DEFAULT 
I'm not sure if calling GetModuleHandle in static construction is safe.
But I assumme it is and works correctly.

There is still potential issue that documentation can be understood
meaning that the HMODULE will resolve only symbols from exe while
RTLD_DEFAULT resolves all global symbols.
 2018-07-10 17:10:30 +03:00
Pauli 4d7008fbfa Changelog entry for dlsym vtable loading 2018-07-10 17:10:30 +03:00
Pauli ca5c11603f Support dlsym loading from libgraphics vtables 2018-07-10 17:08:23 +03:00
lethosor 2dac3c53c7 Add stress cutoffs to Units module, fix dwarfmonitor/manipulator 
Fixes #1292
 2018-07-09 15:59:12 -04:00
lethosor 46e53fc3b3 Make df2console only call df2utf if the output stream is a console 
Fixes output in command-prompt, for example
 2018-07-09 11:00:28 -04:00
lethosor 7fcc6be6f6 Update xml, changelog 2018-07-09 10:46:19 -04:00
lethosor 6a76631375 Merge remote-tracking branch 'suokko/console_math_error_fix' into develop 
Also update changelog
 2018-07-09 09:20:38 -04:00
Pauli ab179bbf42 Fix crash when editing lines that are exactly console width 
plen+cooked_cursor==cols => begin = -1 which is passed to substr. The
sign is incorrect as code should be removing a character from begin
instead of trying to add a character.
 2018-07-09 16:12:39 +03:00
Ben Lubar 1880a32800
Merge pull request #1353 from BenLubar/exclude-jsoncpp-files 
Exclude jsoncpp default CMake targets.
 2018-07-09 06:12:54 -05:00
Ben Lubar a5018c9b81
Exclude jsoncpp default CMake targets. 
Removes the lib and include directories from the DFHack package.

Removes the status message that lists the jsoncpp version number.
 2018-07-08 23:16:08 -05:00
Stoyan Gaydarov e96c6f07ce fixes from comments 2018-07-08 15:53:26 -07:00
Stoyan Gaydarov 68770ecbf2 Use std::call_once to ensure thread safety and a single call to initialize the SDL pointers 2018-07-08 12:52:06 -07:00
lethosor 5d16e5a74c Bump to 0.44.12-alpha1 2018-07-08 14:26:57 -04:00
JapaMala 4b64d2dec6 Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader 
# Conflicts:
#	docs/changelog.txt
 2018-07-08 19:23:56 +05:30
lethosor ba8367bea2 Update scripts/devel/save-version.lua for 0.44.12 2018-07-08 00:26:22 -04:00
lethosor 10abbf8ac2 Update docs for dfhack/stonesense#57 2018-07-08 00:19:58 -04:00