From 6fa35b475314f054009e6fdf883b9fbc3f5f08a5 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Thu, 28 Sep 2000 15:13:42 +0000
Subject: [PATCH]

---
 data/DataCache.scr |  6 ++++++
 makefile.gfx       | 29 ++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/data/DataCache.scr b/data/DataCache.scr
index 60909d5b7..7a814c4a1 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -4,6 +4,12 @@ translations/ita.dat
 translations/ger.dat
 translations/id.dat
 translations/eng.dat
+../../../data/music/hypermmx/hypermmx.pxm
+../../../data/music/hypermmx/hypermmx.vb
+../../../data/music/hypermmx/hypermmx.vh
+../../../data/music/droppop/droppop.pxm
+../../../data/music/droppop/droppop.vb
+../../../data/music/droppop/droppop.vh
 { SYSTEM_CACHE 4
 }
 ui/uigfx.spr
diff --git a/makefile.gfx b/makefile.gfx
index b85290480..172018aea 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -117,11 +117,38 @@ $(UI_GFX_TEX_OUT) :	$(UI_GFX_TEX_IN)
 GFX_DATA_OUT +=	$(UI_GFX_TEX_OUT)
 
 
+#----------------------------------------------------------------------------
+# SFX
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Music
+#----------------------------------------------------------------------------
+MUSIC_IN_DIR :=		data/music
+MUSIC_OUT_DIR :=	$(DATA_OUT)/music
+
+MUSIC_LIST :=		hypermmx
+
+MUSIC_ALL_IN :=		$(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).PXM $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VH $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VB)
+MUSIC_ALL_OUT :=	$(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_OUT_DIR)/$(MUSIC).PXM $(MUSIC_OUT_DIR)/$(MUSIC).VH $(MUSIC_OUT_DIR)/$(MUSIC).VB)
+
+music: 	$(MUSIC_ALL_OUT)
+
+cleanmusic:
+	@$(RM) -f $(MUSIC_ALL_OUT)
+
+$(MUSIC_ALL_OUT) : $(MUSIC_ALL_IN)
+	$(CP) $(MUSIC_ALL_IN) $(MUSIC_OUT_DIR)
+
+GRAF_DIRS_TO_MAKE	+=	$(MUSIC_OUT_DIR)
+GFX_DATA_OUT		+=	$(MUSIC_ALL_OUT)
+
+
 #----------------------------------------------------------------------------
 # Dirs to Make
 #----------------------------------------------------------------------------
 
-GRAF_DIRS_TO_MAKE :=	$(TRANS_OUT_DIR) \
+GRAF_DIRS_TO_MAKE +=	$(TRANS_OUT_DIR) \
 						$(UI_GFX_OUT_DIR)
 
 gdirs : $(GRAF_DIRS_TO_MAKE)