diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gui/inventorywindow.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/utils/gettext.h (renamed from src/resources/gettext.h) | 8 | ||||
| -rw-r--r-- | src/utils/strprintf.h | 2 | ||||
| -rw-r--r-- | src/utils/tostring.h | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5866205e..ea40d5de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -194,7 +194,6 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \ resources/equipmentdb.cpp \ resources/equipmentdb.h \ resources/equipmentinfo.h \ - resources/gettext.h \ resources/image.cpp \ resources/image.h \ resources/imagewriter.cpp \ @@ -231,6 +230,7 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \ utils/base64.h \ utils/dtor.h \ utils/fastsqrt.h \ + utils/gettext.h \ utils/minmax.h \ utils/strprintf.h \ utils/strprintf.cpp \ @@ -309,6 +309,5 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \ # set the include path found by configure INCLUDES = \ $(all_includes) \ - -DHAS_CONFIG_H \ -DTMW_DATADIR=\""$(pkgdatadir)/"\" \ -DLOCALEDIR=\""$(localedir)"\" diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index e31c87f6..2822faaa 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -39,9 +39,9 @@ #include "../item.h" #include "../localplayer.h" -#include "../resources/gettext.h" #include "../resources/iteminfo.h" +#include "../utils/gettext.h" #include "../utils/strprintf.h" InventoryWindow::InventoryWindow(): diff --git a/src/main.cpp b/src/main.cpp index 018d93dd..bde0877e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -85,13 +85,13 @@ #include "net/gameserver/gameserver.h" #include "resources/equipmentdb.h" -#include "resources/gettext.h" #include "resources/image.h" #include "resources/itemdb.h" #include "resources/monsterdb.h" #include "resources/resourcemanager.h" #include "utils/dtor.h" +#include "utils/gettext.h" #include "utils/tostring.h" std::string token; //used to store magic_token diff --git a/src/resources/gettext.h b/src/utils/gettext.h index 9abb5771..72533850 100644 --- a/src/resources/gettext.h +++ b/src/utils/gettext.h @@ -21,11 +21,11 @@ * $Id$ */ -#ifndef _TMW_RESOURCES_GETTEXT_H -#define _TMW_RESOURCES_GETTEXT_H +#ifndef _TMW_UTILS_GETTEXT_H +#define _TMW_UTILS_GETTEXT_H -#ifdef HAS_CONFIG_H -#include "../../config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #if ENABLE_NLS diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h index 4b5974a6..a1fb0f13 100644 --- a/src/utils/strprintf.h +++ b/src/utils/strprintf.h @@ -22,7 +22,7 @@ */ #ifndef _TMW_UTILS_STRPRINTF_H -#define _TMW_UTISL_STRPRINTF_H +#define _TMW_UTILS_STRPRINTF_H #include <string> diff --git a/src/utils/tostring.h b/src/utils/tostring.h index 8fc6d105..95b8985f 100644 --- a/src/utils/tostring.h +++ b/src/utils/tostring.h @@ -22,7 +22,7 @@ */ #ifndef _TMW_UTILS_TOSTRING_H -#define _TMW_UTISL_TOSTRING_H +#define _TMW_UTILS_TOSTRING_H #include <sstream> |