add rwx and xwb to appropriate places, rename ps2_fsb.c and ps2_rsd.c to fsb.c and rsd.c, respectively

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@317 51a99a44-fe44-0410-b1ba-c3e57ba2b86b

src/Makefile

@@ -77,8 +77,10 @@ META_OBJS=meta/adx_header.o \
     meta/xss.o \
     meta/ps2_sl3.o \
     meta/ps2_aus.o \
-    meta/ps2_fsb.o \
-    meta/ps2_rsd.o
+    meta/fsb.o \
+    meta/rsd.o \
+    meta/rwx.o \
+    meta/xwb.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/libvgmstream.vcproj

@@ -230,6 +230,10 @@
 					RelativePath=".\meta\ea_header.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\fsb.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\gcsw.c"
 					>
@@ -290,10 +294,6 @@
 					RelativePath=".\meta\ps2_exst.c"
 					>
 				</File>
-				<File
-					RelativePath=".\meta\ps2_fsb.c"
-					>
-				</File>
 				<File
 					RelativePath=".\meta\ps2_hgc1.c"
 					>
@@ -322,10 +322,6 @@
 					RelativePath=".\meta\ps2_pnb.c"
 					>
 				</File>
-				<File
-					RelativePath=".\meta\ps2_rsd.c"
-					>
-				</File>
 				<File
 					RelativePath=".\meta\ps2_rws.c"
 					>
@@ -374,6 +370,10 @@
 					RelativePath=".\meta\rs03.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\rsd.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\rsf.c"
 					>

src/meta/Makefile.unix.am

@@ -4,6 +4,6 @@ AM_CFLAGS = -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
 AM_MAKEFLAGS=-f Makefile.unix
 
 libmeta_la_LDFLAGS = 
-libmeta_la_SOURCES = Cstr.c adx_header.c afc_header.c agsc.c ast.c brstm.c ea_header.c gcsw.c halpst.c nds_strm.c ngc_adpdtk.c ngc_caf.c ngc_dsp_std.c ps2_ads.c ps2_exst.c ps2_ild.c ps2_int.c ps2_mib.c ps2_mic.c ps2_npsf.c ps2_pnb.c ps2_rxw.c ps2_str.c ps2_svag.c ps2_vag.c ps2_vpk.c psx_cdxa.c raw.c rs03.c rsf.c rwsd.c psx_gms.c xbox_xwav.c xbox_wavm.c genh.c ogg_vorbis_file.c ps2_bmdx.c aifc.c str_snds.c ws_aud.c ahx.c ivb.c svs.c riff.c pos.c nwa.c ps2_rws.c ps2_hgc1.c xss.c ps2_sl3.c ps2_aus.c ps2_fsb.c ps2_rsd.c
+libmeta_la_SOURCES = Cstr.c adx_header.c afc_header.c agsc.c ast.c brstm.c ea_header.c gcsw.c halpst.c nds_strm.c ngc_adpdtk.c ngc_caf.c ngc_dsp_std.c ps2_ads.c ps2_exst.c ps2_ild.c ps2_int.c ps2_mib.c ps2_mic.c ps2_npsf.c ps2_pnb.c ps2_rxw.c ps2_str.c ps2_svag.c ps2_vag.c ps2_vpk.c psx_cdxa.c raw.c rs03.c rsf.c rwsd.c psx_gms.c xbox_xwav.c xbox_wavm.c genh.c ogg_vorbis_file.c ps2_bmdx.c aifc.c str_snds.c ws_aud.c ahx.c ivb.c svs.c riff.c pos.c nwa.c ps2_rws.c ps2_hgc1.c xss.c ps2_sl3.c ps2_aus.c fsb.c rsd.c rwx.c xwb.c
 
 EXTRA_DIST = meta.h

unix/data.c

@@ -76,6 +76,8 @@ gchar *vgmstream_exts [] = {
   "rws",
   "rsd",
   "fsb",
+  "rwx",
+  "xwb",
   /* terminator */
   NULL
 };