summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog17
-rwxr-xr-xconfigure.ac2
-rw-r--r--data/CMakeLists.txt10
-rw-r--r--data/Makefile.am10
-rw-r--r--data/graphics/CMakeLists.txt1
-rw-r--r--data/graphics/Makefile.am2
-rw-r--r--data/graphics/images/CMakeLists.txt14
-rw-r--r--data/graphics/images/Makefile.am14
8 files changed, 22 insertions, 48 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dba907b..ce03c9a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-2006-12-22 Bjørn Lindeijer <bjorn@lindeijer.nl>
+2006-12-23 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * configure.ac, data/graphics/items/Makefile.am,
+ data/graphics/items/CMakeLists.txt, data/graphics/images/Makefile.am,
+ data/graphics/images/CMakeLists.txt,
+ data/graphics/sprites/Makefile.am,
+ data/graphics/sprites/CMakeLists.txt, data/graphics/Makefile.am,
+ data/graphics/CMakeLists.txt, data/maps/Makefile.am,
+ data/maps/CMakeLists.txt, data/sfx/Makefile.am,
+ data/sfx/CMakeLists.txt, data/Makefile.am, data/CMakeLists.txt:
+ Removed database files, minimaps, items, monster sprites, maps and
+ sounds from the release. They will be released dynamically only.
+ * data/graphics/tiles/snow_x3.png: Added bottom of Christmas tree by
+ pauan.
+
+2006-12-22 Bjørn Lindeijer <bjorn@lindeijer.nl>
* data/graphics/items/armor-head-rangerhat.png,
data/graphics/items/generic-redstocking.png,
diff --git a/configure.ac b/configure.ac
index 4c7be5b7..c5278e57 100755
--- a/configure.ac
+++ b/configure.ac
@@ -118,8 +118,6 @@ data/graphics/sprites/Makefile
data/graphics/tiles/Makefile
data/help/Makefile
data/icons/Makefile
-data/maps/Makefile
-data/sfx/Makefile
docs/Makefile
])
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2d2aa82f..3c482b49 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,13 +3,3 @@ SET(DATA_DIR ${PKG_DATADIR}/data)
ADD_SUBDIRECTORY(graphics)
ADD_SUBDIRECTORY(help)
ADD_SUBDIRECTORY(icons)
-ADD_SUBDIRECTORY(maps)
-ADD_SUBDIRECTORY(sfx)
-
-SET(FILES
- equipment.xml
- items.xml
- monsters.xml
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
diff --git a/data/Makefile.am b/data/Makefile.am
index e15630cc..5a28f7c1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,4 @@
-SUBDIRS = graphics help icons maps sfx
+SUBDIRS = graphics help icons
tmwdatadir = $(pkgdatadir)/data
-
-tmwdata_DATA = \
- equipment.xml \
- items.xml \
- monsters.xml
-
-EXTRA_DIST = \
- $(tmwdata_DATA)
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index c569e04f..0fa9a7be 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,5 +1,4 @@
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(items)
ADD_SUBDIRECTORY(sprites)
ADD_SUBDIRECTORY(tiles)
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index 19e95869..43354894 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = gui images items sprites tiles
+SUBDIRS = gui images sprites tiles
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index 2566cf3d..1e1cf19f 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,18 +1,8 @@
ADD_SUBDIRECTORY(ambient)
SET (FILES
- error.png
+ error.png
login_wallpaper.png
- minimap_new_1-1.png
- minimap_new_2-1.png
- minimap_new_3-1.png
- minimap_new_5-1.png
- minimap_new_7-1.png
- minimap_new_9-1.png
- minimap_new_14-1.png
- minimap_new_15-1.png
- minimap_new_16-1.png
- minimap_new_17-1.png
)
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images) \ No newline at end of file
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index 00d9ed7e..be8593f6 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -4,17 +4,7 @@ imagesdir = $(pkgdatadir)/data/graphics/images
images_DATA = \
error.png \
- login_wallpaper.png \
- minimap_new_1-1.png \
- minimap_new_2-1.png \
- minimap_new_3-1.png \
- minimap_new_5-1.png \
- minimap_new_7-1.png \
- minimap_new_9-1.png \
- minimap_new_14-1.png \
- minimap_new_15-1.png \
- minimap_new_16-1.png \
- minimap_new_17-1.png
+ login_wallpaper.png
EXTRA_DIST = \
- $(images_DATA) \ No newline at end of file
+ $(images_DATA)