gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compile isses

This commit is contained in:
Eduardo Bart 2011-11-05 11:36:02 -02:00
parent d5b4137ead
commit 650713a1e6
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -149,7 +149,7 @@ ENDIF(FORBIDDEN_FUNCTIONS)
IF(WIN32) IF(WIN32)
SET(SOURCES ${SOURCES} src/framework/platform/win32platform.cpp) SET(SOURCES ${SOURCES} src/framework/platform/win32platform.cpp)
SET(ADDITIONAL_LIBRARIES ws2_32) SET(ADDITIONAL_LIBRARIES ws2_32 mswsock)
IF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_COMPILER_IS_GNUCXX)
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501)

1
src/framework/core/logger.h
View File

@ -27,6 +27,7 @@
#include "../const.h" #include "../const.h"
#include <vector> #include <vector>
#include <functional> #include <functional>
#include <list>
struct LogMessage { struct LogMessage {
LogMessage(Fw::LogLevel level, const std::string& message, std::size_t when) : level(level), message(message), when(when) { } LogMessage(Fw::LogLevel level, const std::string& message, std::size_t when) : level(level), message(message), when(when) { }

4
src/framework/ui/uimanager.cpp
View File

@ -131,9 +131,13 @@ void UIManager::importStyleFromOTML(const OTMLNodePtr& styleNode)
boost::trim(name); boost::trim(name);
boost::trim(base); boost::trim(base);
// TODO: styles must be searched by widget scopes, in that way this warning could be fixed
// disable this warning because many ppl was complening about it
/*
auto it = m_styles.find(name); auto it = m_styles.find(name);
if(it != m_styles.end()) if(it != m_styles.end())
logWarning("style '", name, "' is being redefined"); logWarning("style '", name, "' is being redefined");
*/
OTMLNodePtr style = getStyle(base)->clone(); OTMLNodePtr style = getStyle(base)->clone();
style->merge(styleNode); style->merge(styleNode);