Commit Graph

434 Commits (master)

Author SHA1 Message Date
Rogier 66483b2c45 Update Changelog 2016-06-18 18:25:52 +02:00
addi 2c2536acd8 Define WIN32 for x64 too to work around the snappy bug 2016-06-18 11:49:50 +02:00
addi 050c2ce6a3 Define _CRT_SECURE_NO_WARNINGS on release build mode
This disables complaints about fopen, getenv, strerror (etc.) being
considered deprecated (by Microsoft).
2016-06-18 11:46:36 +02:00
addi 445071cad5 Fix various compiler warnings on MSVC
I tried to avoid casts whereever it was possible, but for some cases it wasn't.
2016-06-18 11:45:02 +02:00
Rogier fade10aa1b Improve rpm detection and rpm package naming
Also don't build rpm packages on debian, even if rpm is installed.
2016-06-18 11:27:33 +02:00
Rogier a35ebed4ab Allow setting packaging version
I.e. the extra version number that gets appended to the software
version number, and that should be incremented if a newer package
is built from the same software version, and installed or distributed.
2016-06-18 10:06:54 +02:00
Rogier fac2d38589 Make minetestmapper compile on fedora 2016-06-18 00:31:02 +02:00
Rogier 4d07f06362 Remove a bit of unneeded & unused code. 2016-06-17 10:05:11 +02:00
Rogier 6a4c2aeb02 Fix compiler warning (introduced by gcc5) 2016-06-14 18:17:44 +02:00
Rogier 12d0276da7 Fix building without python-docutils installed 2016-06-14 17:24:53 +02:00
addi 67b79f5851 Fix --prescan-world=disabled-force does not work 2016-06-14 04:32:36 +02:00
Rogier 9d7e6b6f58 Create new release (20160531) 2016-05-31 22:02:43 +02:00
Rogier 5eb44bad4b Merge branch 'windows-msvc-compilation' 2016-05-31 22:02:15 +02:00
adrido 8c911257ac Update documentation for MSVC build support 2016-05-31 21:44:34 +02:00
adrido db3879aeaa Add Batch script to update versioninfo.h file 2016-05-31 21:37:58 +02:00
adrido a5a6f6353c Assume that libgd.lib is called "libgd.lib" 2016-05-31 21:37:58 +02:00
adrido 95323cde3a Add wingetopt and configure include folder
wingetopt was taken from https://github.com/alex85k/wingetopt
2016-05-31 21:37:58 +02:00
adrido d61cbdde4f Add dirent.h and configure include folder
dirent.h was taken from https://github.com/tronkko/dirent
2016-05-31 21:37:58 +02:00
adrido 90dccf571c Add required packages via NuGet 2016-05-31 21:37:58 +02:00
adrido 506d7bbcc2 Setup VisualStudio project files 2016-05-31 21:37:58 +02:00
Rogier 38c0ee9962 Add date of generation and generator to build_config.h
In preparation for MSVC compilation support
2016-05-31 21:37:58 +02:00
Rogier db11689b36 Improve comment in build_config.h / build_config.h.in
In preparation for MSVC compilation support
2016-05-31 21:37:58 +02:00
Rogier 82ba727a2d Rename cmake_config.h to build_config.h, and don't make it optional
In preparation for MSVC compilation support
2016-05-31 21:37:58 +02:00
Rogier 984a4e3a97 Rename the file 'version' to 'base-version'
This better reflects its purpose

Also removed a redundant check for existence of the file in CMakeLists.txt

In preparation for MSVC compilation support
2016-05-31 21:37:58 +02:00
addi 797d671980 Fix cpp '#warning', which is not recognised on windows
In preparation for MSVC compilation support
2016-05-31 21:37:58 +02:00
adrido 925e355715 Standard C++ fopen instead of POSIX open
This is required to be able to build on Windows.
open() is not a standard ANSI C/C++ function and only available on POSIX systems.
Using fopen() provides better portability.
2016-05-31 21:37:58 +02:00
adrido c897c75463 Correct include of BlockPos.h 2016-05-31 21:37:57 +02:00
adrido 5761f103e1 Add porting.h
In preparation for MSVC compilation support
2016-05-31 21:37:57 +02:00
Rogier e2b5dce3e3 Update Changelog 2016-05-31 21:37:57 +02:00
Rogier 80a4e4b665 Fix blocks not found while minetest is running, using SQLite3 backend
If mapping while minetest is running and modifying blocks, modified
blocks queried by RowID, would not be found by SQLite3. Querying
by I64 exclusively did not cause such behavior.
2016-05-30 13:09:29 +02:00
Rogier dbec678f6b Close database when done
This prevents messages 'Connection reset by peer' in the postgresql log file.

It might have benefits for other databases as well ?
2016-05-23 12:46:25 +02:00
Rogier ba9166fd79 Add support for the official postgresql backend implementation
The connection strings and database structure of the previous unofficial
versions (by Shadowninja and johhnyjoy) are also still supported, but
support will be removed in a future version of minetestmapper.
2016-05-22 23:43:36 +02:00
proller 3ffda4ab57 Final std::ws skipping not needed when parsing block coordinates, and it makes is.fail() == true 2016-05-17 16:17:41 +02:00
Rogier 22384eb9db Disable some unused code to avoid the resulting compiler warning 2016-01-18 18:57:58 +01:00
Rogier f54afcbd99 Remove spurious postgresql include
THis prevents building when postgresql is not installed.
2016-01-18 18:53:53 +01:00
Rogier 56af6644fb Improve parsing of heightmap colors file
Error detection was not entirely correct
2016-01-17 10:37:52 +01:00
Rogier f908282a16 Improve parsing of textual block ID (i64 or axyz)
- Accept trailing spaces
- Fix error detection (use 'fail()' instead of 'bad()')
2016-01-17 10:37:52 +01:00
Rogier 570ed84fd2 Convert text drawn on the map to ISO8859-2 (which is what libgd uses)
Using non-ISO8859-2 encoded text (e.g. utf-8), or anything else,
may result in garbage characters.
2016-01-17 10:37:52 +01:00
Rogier e47e3bcd3a Add iconv cmake module
Needed to make the libgd draw characters correctly.

Obtained from
c361a45cfb/cmake/Modules/FindIconv.cmake
2016-01-17 10:37:51 +01:00
Rogier 304d0ef564 Fix to parsing of geometry flags - the last flag could be overlooked. 2016-01-17 10:37:51 +01:00
Rogier 1ad247ddc4 Add an option to draw 'ignore' nodes.
This does require a color definition to be added to the colors file.

Implemented as a generic option to draw or ignore types of nodes
(i.e. 'air', 'ignore'). Ignoring specific named nodes from the
command-line is not (yet??) supported.
2016-01-17 10:37:51 +01:00
Rogier 61fa760af5 Document 'air' and 'ignore' flags in colors.txt 2016-01-17 10:37:51 +01:00
Rogier ca66635176 Add a colors.txt node flag for air-type nodes (nodes will be treated as air)
This means that they are only drawn if the option '--drawair'
is specified on the command-line. Else they are ignored.
2016-01-17 10:37:51 +01:00
Rogier b3019c1804 Add a colors.txt node flag for ignore-type nodes (nodes will be ignored)
Ignoring a node is more efficient than drawing it with full transparency.
This is noticeable when there are a large number of such nodes.
2016-01-17 10:37:51 +01:00
Rogier 5660f71175 Add support for setting flags for nodes in the colors.txt file.
These will allow special treatement for such nodes.
See subsequent commits
2016-01-17 10:37:51 +01:00
Rogier 99b3134810 Add option to draw arrows on the map 2016-01-17 10:37:51 +01:00
Rogier 00920947af Add a geometry syntax using angle and length (2D only)
Draw a line with an angle of 30 degrees and a lenght of 200:
	--drawline <x>,<y>@30+200
2016-01-17 10:37:51 +01:00
Rogier a09819285a Fix end-of-string detection for some options 2016-01-17 10:37:51 +01:00
Rogier e6d52279ac Make sure all options are case-agnostic for their parameters
I.e. the following are now equivalent:
	'--backend leveldb'
	'--backend LEVELDB'
	'--backend LevelDB'
2016-01-17 10:37:51 +01:00
Rogier 326d609675 Use strlower() instead of tolower() and strcasecmp() where possible. 2016-01-17 10:37:51 +01:00