adrido/minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Leveldb fix

Browse Source
This commit is contained in:
Unknown 2018-03-27 10:04:47 +02:00
parent c9219874e3
commit de634f68c9
2 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Minetestmapper/CMakeLists.txt
View File

@ -61,10 +61,15 @@ set(wingetopt_lib "")
if(WIN32) if(WIN32)
set(wingetopt_lib wingetopt) set(wingetopt_lib wingetopt)
endif() endif()
set(leveldb_lib "")
if(USE_LEVELDB)
set(leveldb_lib ${LEVELDB_LIBRARY})
endif()
#link_directories (../wingetopt) #link_directories (../wingetopt)
# Fügen Sie der ausführbaren Datei für dieses Projekt eine Quelle hinzu. # Fügen Sie der ausführbaren Datei für dieses Projekt eine Quelle hinzu.
add_executable (Minetestmapper ${sources}) add_executable (Minetestmapper ${sources})
target_link_libraries(Minetestmapper ${wingetopt_lib} ${LIBGD_LIBRARY} ${ZLIB_LIBRARY} ${SQLITE3_LIBRARY}) set_target_properties(Minetestmapper PROPERTIES COMPILE_FLAGS -DBUILDER_STATIC_DEFINE)
target_link_libraries(Minetestmapper ${wingetopt_lib} ${LIBGD_LIBRARY} ${ZLIB_LIBRARY} ${SQLITE3_LIBRARY} ${leveldb_lib})
# TODO: Fügen Sie bei Bedarf Tests und Installationsziele hinzu. # TODO: Fügen Sie bei Bedarf Tests und Installationsziele hinzu.

33
Minetestmapper/mapper.cpp
View File

@ -952,39 +952,6 @@ void Mapper::usage()
std::cout << executableName << ' ' << options_text; std::cout << executableName << ' ' << options_text;
} }
// Parse the following geometry formats:
// <w>x<h>[+<x>+<y>]
// (dimensions, and position)
// (if x and y are omitted, they default to -w/2 and -h/2)
// <x1>,<y1>:<x2>,<y2>
// (2 corners of the area)
// <x>,<y>:<w>x<h>
// (center of the area, and dimensions)
// <x>[,:]<y>+<w>+<h>
// (corner of the area, and dimensions)
// <x>,<y>@<angle>+<length>
// is: stream to read from
// coord: set to coordinate value that was read
// isBlockCoord: set to true if the coordinate read was a block coordinate
// wildcard: if non-zero, accept '*' as a coordinate, and return this value instead.
// (suggested values for 'wildcard': INT_MIN or INT_MAX)
//
// Accepted coordinate syntax:
// [+-]<n>: node coordinate: node +/- n
// [+-]<b>#: block coordinate: block +/- b (isBlockCoord will be set to true)
// [+-]<b>#<n>: node coordinate: node <n> in block +/- <b>
// [+-]<b>.<n>: node coordinate: node +/- (b * 16 + n)
// As a special feature, double signs are also supported. E.g.:
// +-3
// Which allows shell command-lines like the following
// ${width}x${height}+$xoffs+$yoffs
// (which otherwise require special measures to cope with xoffs or yoffs being negative...)
// Other uses of this feature are left as an excercise to the reader.
// Hint: --3.5 is *not* the same as 3.5
void Mapper::parseDataFile(TileGenerator & generator, const string & input, string dataFile, string defaultFile, void(TileGenerator::* parseFile)(const std::string &fileName)) void Mapper::parseDataFile(TileGenerator & generator, const string & input, string dataFile, string defaultFile, void(TileGenerator::* parseFile)(const std::string &fileName))
{ {
if (!dataFile.empty()) { if (!dataFile.empty()) {