diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/fonts/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/fonts/Makefile.am | 5 | ||||
| -rw-r--r-- | data/graphics/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | data/graphics/gui/browserfont.png | bin | 1846 -> 0 bytes | |||
| -rw-r--r-- | data/graphics/gui/sansserif8.png | bin | 2134 -> 0 bytes | |||
| -rw-r--r-- | data/graphics/images/CMakeLists.txt | 4 |
10 files changed, 14 insertions, 9 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 3c482b49..d5e9e88e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,3 +3,4 @@ SET(DATA_DIR ${PKG_DATADIR}/data) ADD_SUBDIRECTORY(graphics) ADD_SUBDIRECTORY(help) ADD_SUBDIRECTORY(icons) +ADD_SUBDIRECTORY(fonts) diff --git a/data/Makefile.am b/data/Makefile.am index 5a28f7c1..62672207 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = graphics help icons +SUBDIRS = fonts graphics help icons tmwdatadir = $(pkgdatadir)/data diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt new file mode 100644 index 00000000..dc22e031 --- /dev/null +++ b/data/fonts/CMakeLists.txt @@ -0,0 +1,6 @@ +SET (FILES + dejavusans.ttf + ) + +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts) + diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am new file mode 100644 index 00000000..331f6c8b --- /dev/null +++ b/data/fonts/Makefile.am @@ -0,0 +1,5 @@ +fontsdir = $(pkgdatadir)/data/fonts + +fonts_DATA = dejavusans.ttf + +EXTRA_DIST = $(fonts_DATA) diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt index 9a916db3..58d75523 100644 --- a/data/graphics/CMakeLists.txt +++ b/data/graphics/CMakeLists.txt @@ -1,3 +1,2 @@ ADD_SUBDIRECTORY(gui) ADD_SUBDIRECTORY(images) -ADD_SUBDIRECTORY(tiles) diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 5cb47b8c..1ca4ee72 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -1,6 +1,5 @@ SET (FILES bg_quad_dis.png - browserfont.png button.png button_disabled.png buttonhi.png @@ -29,7 +28,6 @@ SET (FILES resize.png rpgfont_wider.png selection.png - sansserif8.png slider.png target-cursor-blue-l.png target-cursor-blue-m.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index cfa14192..0b7824c9 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -3,7 +3,6 @@ guidir = $(pkgdatadir)/data/graphics/gui gui_DATA = \ bg_quad_dis.png \ - browserfont.png \ button.png \ button_disabled.png \ buttonhi.png \ @@ -33,7 +32,6 @@ gui_DATA = \ resize.png \ rpgfont_wider.png \ selection.png \ - sansserif8.png \ slider.png \ target-cursor-blue-l.png \ target-cursor-blue-m.png \ diff --git a/data/graphics/gui/browserfont.png b/data/graphics/gui/browserfont.png Binary files differdeleted file mode 100644 index 431777c5..00000000 --- a/data/graphics/gui/browserfont.png +++ /dev/null diff --git a/data/graphics/gui/sansserif8.png b/data/graphics/gui/sansserif8.png Binary files differdeleted file mode 100644 index a4738548..00000000 --- a/data/graphics/gui/sansserif8.png +++ /dev/null diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt index 1e1cf19f..5181b4e1 100644 --- a/data/graphics/images/CMakeLists.txt +++ b/data/graphics/images/CMakeLists.txt @@ -1,6 +1,4 @@ -ADD_SUBDIRECTORY(ambient) - -SET (FILES +SET(FILES error.png login_wallpaper.png ) |
