Removed Boost dependency.

This commit is contained in:
Miroslav Bendík 2012-09-01 13:01:31 +02:00
parent cb65bbbc4c
commit b9e40ed972
3 changed files with 57 additions and 39 deletions

View File

@ -25,14 +25,11 @@ find_package_handle_standard_args(LibSqlite3 DEFAULT_MSG LIBSQLITE3_LIBRARY LIB
mark_as_advanced(LIBSQLITE3_INCLUDE_DIR LIBSQLITE3_LIBRARY )
find_package(Boost COMPONENTS system filesystem)
include_directories(
"${PROJECT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}"
${LIBSQLITE3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
set(mapper_HDRS
@ -54,7 +51,6 @@ add_executable(minetest_mapper
target_link_libraries(
minetest_mapper
${LIBSQLITE3_LIBRARIES}
${Boost_LIBRARIES}
gd
z
)

View File

@ -14,7 +14,8 @@
#include <iostream>
#include <sstream>
#include <zlib.h>
#include <boost/filesystem.hpp>
#include <dirent.h>
#include "config.h"
#include "TileGenerator.h"
using namespace std;
@ -554,12 +555,19 @@ void TileGenerator::renderPlayers(const std::string &inputPath)
int color = rgb2int(m_playerColor.r, m_playerColor.g, m_playerColor.b);
string playersPath = inputPath + "players";
boost::filesystem::path path(playersPath.c_str());
boost::filesystem::directory_iterator end_iter;
boost::filesystem::directory_iterator iter(path);
for (; iter != end_iter; ++iter) {
if (!boost::filesystem::is_directory(iter->status())) {
string path = iter->path().string();
DIR *dir;
dir = opendir (playersPath.c_str());
if (dir == NULL) {
return;
}
struct dirent *ent;
while ((ent = readdir (dir)) != NULL) {
if (ent->d_type == DT_DIR) {
continue;
}
string path = playersPath + PATH_SEPARATOR + ent->d_name;
ifstream in;
in.open(path.c_str(), ifstream::in);
@ -588,7 +596,7 @@ void TileGenerator::renderPlayers(const std::string &inputPath)
gdImageArc(m_image, imageX, imageY, 5, 5, 0, 360, color);
gdImageString(m_image, gdFontGetMediumBold(), imageX + 2, imageY + 2, reinterpret_cast<unsigned char *>(const_cast<char *>(name.c_str())), color);
}
}
closedir(dir);
}
inline std::list<int> TileGenerator::getZValueList() const

14
config.h Normal file
View File

@ -0,0 +1,14 @@
/*
* =====================================================================
* Version: 1.0
* Created: 01.09.2012 12:58:02
* Author: Miroslav Bendík
* Company: LinuxOS.sk
* =====================================================================
*/
#if MSDOS || __OS2__ || __NT__ || _WIN32
#define PATH_SEPARATOR '\\'
#else
#define PATH_SEPARATOR '/'
#endif