From 3854f2087447389f0d44a1af3eef9f6c8e4a5002 Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Sun, 26 Nov 2006 10:27:02 +0000 Subject: Updated Makefiles and CMake Lists --- CMakeLists.txt | 3 ++- Makefile.am | 3 ++- graphics/images/CMakeLists.txt | 1 + graphics/images/Makefile.am | 1 + graphics/sprites/CMakeLists.txt | 11 +++++++---- graphics/sprites/Makefile.am | 9 ++++++--- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36259082..e60bfe30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,8 @@ ADD_SUBDIRECTORY(maps) ADD_SUBDIRECTORY(sfx) SET(FILES + equipment.xml items.xml ) -INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}) +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}) \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 7d16a1fc..ed080d08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,8 @@ SUBDIRS = graphics help icons maps sfx tmwdatadir = $(pkgdatadir)/data tmwdata_DATA = \ + equipment.xml \ items.xml EXTRA_DIST = \ - $(tmwdata_DATA) + $(tmwdata_DATA) \ No newline at end of file diff --git a/graphics/images/CMakeLists.txt b/graphics/images/CMakeLists.txt index dec22826..2566cf3d 100644 --- a/graphics/images/CMakeLists.txt +++ b/graphics/images/CMakeLists.txt @@ -1,6 +1,7 @@ ADD_SUBDIRECTORY(ambient) SET (FILES + error.png login_wallpaper.png minimap_new_1-1.png minimap_new_2-1.png diff --git a/graphics/images/Makefile.am b/graphics/images/Makefile.am index cc71b18a..00d9ed7e 100644 --- a/graphics/images/Makefile.am +++ b/graphics/images/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = ambient imagesdir = $(pkgdatadir)/data/graphics/images images_DATA = \ + error.png \ login_wallpaper.png \ minimap_new_1-1.png \ minimap_new_2-1.png \ diff --git a/graphics/sprites/CMakeLists.txt b/graphics/sprites/CMakeLists.txt index 4155dec0..66268a12 100644 --- a/graphics/sprites/CMakeLists.txt +++ b/graphics/sprites/CMakeLists.txt @@ -1,5 +1,10 @@ SET(FILES - emotions.png + chest-leather-male.png + chest-leather-male.xml + chest-leather-female.png + chest-leather-female.xml + emotions.png + error.png hairstyle1.png hairstyle1.xml hairstyle2.png @@ -18,8 +23,6 @@ SET(FILES item001.xml item002.png item002.xml - item003.png - item003.xml item004.png item004.xml item005.png @@ -111,4 +114,4 @@ SET(FILES weapon-scythe.xml ) -INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprites) +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprites) \ No newline at end of file diff --git a/graphics/sprites/Makefile.am b/graphics/sprites/Makefile.am index 6f02af52..4dea8716 100644 --- a/graphics/sprites/Makefile.am +++ b/graphics/sprites/Makefile.am @@ -2,7 +2,12 @@ spritesdir = $(pkgdatadir)/data/graphics/sprites sprites_DATA = \ + chest-leather-male.png \ + chest-leather-male.xml \ + chest-leather-female.png \ + chest-leather-female.xml \ emotions.png \ + error.xml \ hairstyle1.png \ hairstyle1.xml \ hairstyle2.png \ @@ -21,8 +26,6 @@ sprites_DATA = \ item001.xml \ item002.png \ item002.xml \ - item003.png \ - item003.xml \ item004.png \ item004.xml \ item005.png \ @@ -114,4 +117,4 @@ sprites_DATA = \ weapon-scythe.xml EXTRA_DIST = \ - $(sprites_DATA) + $(sprites_DATA) \ No newline at end of file -- cgit v1.2.3-60-g2f50