diff options
| author | Bernd Wachter <bwachter-tmw@lart.info> | 2009-04-06 00:29:04 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-06 15:00:14 +0200 |
| commit | e76f1fe00f03ae5977e94f830980034c2453d884 (patch) | |
| tree | 9812ab1e2cb6e41956dd8b66fd77c11ab84cfc57 | |
| parent | ee4f4fd0aff3a614b4e60ab082ff4b493c18da93 (diff) | |
| download | mana-e76f1fe00f03ae5977e94f830980034c2453d884.tar.gz mana-e76f1fe00f03ae5977e94f830980034c2453d884.tar.bz2 mana-e76f1fe00f03ae5977e94f830980034c2453d884.tar.xz mana-e76f1fe00f03ae5977e94f830980034c2453d884.zip | |
Fixed DATADIR and LOCALEDIR variables for CMake-build; fixed game data installation
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
5 files changed, 6 insertions, 3 deletions
@@ -36,6 +36,7 @@ stamp-h1 CMakeFiles/ CMakeCache.txt cmake_install.cmake +install_manifest.txt # files created during build *.o diff --git a/CMakeLists.txt b/CMakeLists.txt index bf66c6ae..6cefa798 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,10 @@ OPTION(WITH_OPENGL "Enable OpenGL support" ON) IF (WIN32) SET(PKG_DATADIR ".") SET(PKG_BINDIR ".") + SET(LOCALEDIR ".") ELSE (WIN32) SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tmw) + SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) ENDIF (WIN32) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 35b9d4e2..4aa0cdd5 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,4 +4,3 @@ ADD_SUBDIRECTORY(fonts) ADD_SUBDIRECTORY(graphics) ADD_SUBDIRECTORY(help) ADD_SUBDIRECTORY(icons) -ADD_SUBDIRECTORY(fonts) diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index cca412f2..aec50890 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -11,7 +11,6 @@ SET (FILES close_button.png deepbox.png default.png - equip_bg.png gui.xml hscroll_left_default.png hscroll_left_highlight.png @@ -26,6 +25,7 @@ SET (FILES resize.png selection.png slider.png + sticky_button.png speechbubble.xml tab.png tabselected.png diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b67b81e9..c30798ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,8 @@ FIND_PACKAGE(PNG REQUIRED) SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") -SET(FLAGS "${FLAGS} -DTMW_DATADIR=\\\"${PKG_DATADIR}/\\\"") +SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") +SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") SET(FLAGS_EA "${FLAGS} -DEATHENA_SUPPORT") SET(FLAGS_TMW "${FLAGS} -DTMWSERV_SUPPORT") |