diff --git a/Minetestmapper/CMakeLists.txt b/Minetestmapper/CMakeLists.txt index 9553f70..32f9916 100644 --- a/Minetestmapper/CMakeLists.txt +++ b/Minetestmapper/CMakeLists.txt @@ -61,10 +61,15 @@ set(wingetopt_lib "") if(WIN32) set(wingetopt_lib wingetopt) endif() +set(leveldb_lib "") +if(USE_LEVELDB) +set(leveldb_lib ${LEVELDB_LIBRARY}) +endif() #link_directories (../wingetopt) # Fügen Sie der ausführbaren Datei für dieses Projekt eine Quelle hinzu. 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. diff --git a/Minetestmapper/mapper.cpp b/Minetestmapper/mapper.cpp index 1ce730c..2cbbd5f 100644 --- a/Minetestmapper/mapper.cpp +++ b/Minetestmapper/mapper.cpp @@ -952,39 +952,6 @@ void Mapper::usage() std::cout << executableName << ' ' << options_text; } - -// Parse the following geometry formats: -// x[++] -// (dimensions, and position) -// (if x and y are omitted, they default to -w/2 and -h/2) -// ,:, -// (2 corners of the area) -// ,:x -// (center of the area, and dimensions) -// [,:]++ -// (corner of the area, and dimensions) -// ,@+ - - -// 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: -// [+-]: node coordinate: node +/- n -// [+-]#: block coordinate: block +/- b (isBlockCoord will be set to true) -// [+-]#: node coordinate: node in block +/- -// [+-].: 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)) { if (!dataFile.empty()) {