summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/graphics/CMakeLists.txt3
-rw-r--r--data/graphics/Makefile.am8
-rw-r--r--data/graphics/images/CMakeLists.txt1
-rw-r--r--data/graphics/images/Makefile.am3
-rw-r--r--data/graphics/sprites/CMakeLists.txt6
-rw-r--r--data/graphics/sprites/Makefile.am9
-rw-r--r--data/graphics/sprites/error.png (renamed from data/graphics/images/error.png)bin314 -> 314 bytes
-rw-r--r--data/graphics/sprites/error.xml10
8 files changed, 32 insertions, 8 deletions
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index d7e78c30..a46ccfd0 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,5 +1,6 @@
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(images)
+ADD_SUBDIRECTORY(sprites)
SET (FILES
target-cursor-in-range-l.png
@@ -8,4 +9,4 @@ SET (FILES
target-cursor-normal-l.png
target-cursor-normal-m.png
target-cursor-normal-s.png
- ) \ No newline at end of file
+ )
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index 6a4d65d8..d2f93f58 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -9,8 +9,8 @@ graphics_DATA = \
target-cursor-normal-m.png \
target-cursor-normal-s.png
-SUBDIRS = gui images
-
-EXTRA_DIST = \
- $(graphics_DATA) \
+EXTRA_DIST = \
+ $(graphics_DATA) \
CMakeLists.txt
+
+SUBDIRS = gui images sprites
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index 5181b4e1..6694f254 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,5 +1,4 @@
SET(FILES
- error.png
login_wallpaper.png
)
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index 0bc2a5cd..20ea859f 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -1,9 +1,8 @@
imagesdir = $(pkgdatadir)/data/graphics/images
images_DATA = \
- error.png \
login_wallpaper.png
EXTRA_DIST = \
- $(images_DATA) \
+ $(images_DATA) \
CMakeLists.txt
diff --git a/data/graphics/sprites/CMakeLists.txt b/data/graphics/sprites/CMakeLists.txt
new file mode 100644
index 00000000..1d98772d
--- /dev/null
+++ b/data/graphics/sprites/CMakeLists.txt
@@ -0,0 +1,6 @@
+SET(FILES
+ error.png
+ error.xml
+ )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprits)
diff --git a/data/graphics/sprites/Makefile.am b/data/graphics/sprites/Makefile.am
new file mode 100644
index 00000000..249ca5cd
--- /dev/null
+++ b/data/graphics/sprites/Makefile.am
@@ -0,0 +1,9 @@
+spritesdir = $(pkgdatadir)/data/graphics/sprites
+
+sprites_DATA = \
+ error.png \
+ error.xml
+
+EXTRA_DIST = \
+ $(sprites_DATA) \
+ CMakeLists.txt
diff --git a/data/graphics/images/error.png b/data/graphics/sprites/error.png
index 6fd7c1a8..6fd7c1a8 100644
--- a/data/graphics/images/error.png
+++ b/data/graphics/sprites/error.png
Binary files differ
diff --git a/data/graphics/sprites/error.xml b/data/graphics/sprites/error.xml
new file mode 100644
index 00000000..3504bd01
--- /dev/null
+++ b/data/graphics/sprites/error.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/error.png" width="29" height="9" />
+
+ <action name="default" imageset="base">
+ <animation direction="default">
+ <frame index="0" />
+ </animation>
+ </action>
+</sprite> \ No newline at end of file