diff options
| author | Ira Rice <irarice@gmail.com> | 2009-02-09 16:31:58 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-02-09 16:31:58 -0700 |
| commit | 1ae95b709235ce811ce72437aa257bb7500e00d0 (patch) | |
| tree | 915a9954b245f66e23535becc15d5e8e66fcd04f | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | mana-1ae95b709235ce811ce72437aa257bb7500e00d0.tar.gz mana-1ae95b709235ce811ce72437aa257bb7500e00d0.tar.bz2 mana-1ae95b709235ce811ce72437aa257bb7500e00d0.tar.xz mana-1ae95b709235ce811ce72437aa257bb7500e00d0.zip | |
Changed AETHYRA_DATADIR to PKG_DATADIR.
Signed-off-by: Ira Rice <irarice@gmail.com>
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/main.h | 4 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c6a9a9c4..be2258f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -346,7 +346,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ # set the include path found by configure INCLUDES = \ $(all_includes) \ - -DAETHYRA_DATADIR=\""$(pkgdatadir)/"\" \ + -DPKG_DATADIR=\""$(pkgdatadir)/"\" \ -DLOCALEDIR=\""$(localedir)/"\" # the library search path. diff --git a/src/main.cpp b/src/main.cpp index 73e0b0fe..1802c378 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -332,7 +332,7 @@ void init_engine(const Options &options) strncat(path, "/data", PATH_MAX - 1); resman->addToSearchPath(path, true); #else - resman->addToSearchPath(AETHYRA_DATADIR "data", true); + resman->addToSearchPath(PKG_DATADIR "data", true); #endif // Fill configuration with defaults @@ -389,7 +389,7 @@ void init_engine(const Options &options) SetClassLong(pInfo.window, GCL_HICON, (LONG) icon); } #else - SDL_Surface *icon = IMG_Load(AETHYRA_DATADIR "data/icons/aethyra.png"); + SDL_Surface *icon = IMG_Load(PKG_DATADIR "data/icons/aethyra.png"); if (icon) { SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE); @@ -30,8 +30,8 @@ #include "winver.h" #endif -#ifndef AETHYRA_DATADIR -#define AETHYRA_DATADIR "" +#ifndef PKG_DATADIR +#define PKG_DATADIR "" #endif /* diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index f193d55d..a5d927dd 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -207,7 +207,7 @@ std::string ResourceManager::getPath(const std::string &file) else { // if not found in search path return the default path - path = std::string(AETHYRA_DATADIR) + std::string("data") + "/" + file; + path = std::string(PKG_DATADIR) + std::string("data") + "/" + file; } return path; |