diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-22 11:48:08 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-22 11:48:08 +0000 |
| commit | 3e36d08598a3ab43ddce32f2b34295447d32e38e (patch) | |
| tree | c078f85e77cd09f1e9e90d17eba06f74e7c1d137 | |
| parent | ac07e4e92cf0a3ef2402f36a95749516c4842839 (diff) | |
- oprava trapne chyby ve font.c a CMakeLists.txt
git-svn-id: http://opensvn.csie.org/tuxanci_ng@237 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | src/client/font.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 59b8fcc..6d0d861 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ SET ( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} ) # this specify location of additional cmake sources SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) #various variables -SET ( CMAKE_FONT "${CMAKE_INSTALL_PREFIX}/share/${appname}/font/DejavVuSans.ttf" CACHE PATH "Font" ) +SET ( CMAKE_FONT "${CMAKE_DATA_PATH}/${APPNAME}/font/DejaVuSans.ttf" CACHE PATH "Font" ) SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} ) SET ( CMAKE_INSTALL_BINDIR bin ) SET ( CMAKE_INSTALL_LOCALEDIR ${CMAKE_LOCALE_PATH} ) diff --git a/src/client/font.c b/src/client/font.c index 5f4e692..9a37b9f 100755 --- a/src/client/font.c +++ b/src/client/font.c @@ -21,7 +21,7 @@ void initFont(char *file,int size) assert( isInterfaceInicialized() == TRUE ); - sprintf(str, PATH_FONT "%s", file); + sprintf(str, "%s", file); if( TTF_Init() == -1 ) { |