updates to work with new grabbag lib

6 files changed, 14 insertions, 9 deletions

diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am
index 1e5b41ac..080a288c 100644
--- a/src/test_libOggFLAC/Makefile.am
+++ b/src/test_libOggFLAC/Makefile.am
@@ -24,7 +24,12 @@ CFLAGS = @CFLAGS@ @OGG_CFLAGS@
 INCLUDES = 
 
 noinst_PROGRAMS = test_libOggFLAC
-test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
+test_libOggFLAC_LDADD = \
+	$(top_builddir)/src/share/grabbag/grabbag.la \
+	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
+	$(top_builddir)/src/libFLAC/libFLAC.la \
+	@OGG_LIBS@ \
+	-lm
 test_libOggFLAC_SOURCES = \
 	decoders.c \
 	encoders.c \
diff --git a/src/test_libOggFLAC/Makefile.lite b/src/test_libOggFLAC/Makefile.lite
index 8e6000ee..ad3576b9 100644
--- a/src/test_libOggFLAC/Makefile.lite
+++ b/src/test_libOggFLAC/Makefile.lite
@@ -24,7 +24,7 @@ topdir = ../..
 PROGRAM_NAME = test_libOggFLAC
 #@@@ TODO: conditionalize ogg lib path and -logg
 INCLUDES     = -I$(topdir)/include
-LIBS         = -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lfile_utils -lm
+LIBS         = -lgrabbag -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm
 OBJS = \
 	decoders.o \
 	encoders.o \
diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc
index 9c14cc42..b363cfb0 100644
--- a/src/test_libOggFLAC/Makefile.vc
+++ b/src/test_libOggFLAC/Makefile.vc
@@ -37,7 +37,7 @@ OBJS= $(C_FILES:.c=.obj)
 all: test_libOggFLAC.exe

 

 test_libOggFLAC.exe: $(OBJS)

-	link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libOggFLAC.lib libFLAC.lib ogg_static.lib file_utils.lib

+	link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) file_utils.lib libOggFLAC.lib libFLAC.lib ogg_static.lib

 

 clean:

 	-del *.obj *.pch

diff --git a/src/test_libOggFLAC/decoders.c b/src/test_libOggFLAC/decoders.c
index 277b244c..d9e62250 100644
--- a/src/test_libOggFLAC/decoders.c
+++ b/src/test_libOggFLAC/decoders.c
@@ -21,7 +21,7 @@
 #include "metadata_utils.h"
 #include "FLAC/assert.h"
 #include "OggFLAC/stream_decoder.h"
-#include "share/file_utils.h"
+#include "share/grabbag.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -815,7 +815,7 @@ FLAC__bool test_decoders()
 	if(!test_stream_decoder())
 		return false;
 
-	(void) FLAC__file_utils_remove_file(oggflacfilename_);
+	(void) grabbag__file_remove_file(oggflacfilename_);
 	free_metadata_blocks_();
 
 	return true;
diff --git a/src/test_libOggFLAC/encoders.c b/src/test_libOggFLAC/encoders.c
index ec6188e7..aa7b56b8 100644
--- a/src/test_libOggFLAC/encoders.c
+++ b/src/test_libOggFLAC/encoders.c
@@ -20,7 +20,7 @@
 #include "file_utils.h"
 #include "FLAC/assert.h"
 #include "OggFLAC/stream_encoder.h"
-#include "share/file_utils.h"
+#include "share/grabbag.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -451,7 +451,7 @@ FLAC__bool test_encoders()
 	if(!test_stream_encoder())
 		return false;
 
-	(void) FLAC__file_utils_remove_file(oggflacfilename_);
+	(void) grabbag__file_remove_file(oggflacfilename_);
 	free_metadata_blocks_();
 
 	return true;
diff --git a/src/test_libOggFLAC/test_libOggFLAC.dsp b/src/test_libOggFLAC/test_libOggFLAC.dsp
index 9bb2b86b..2a911376 100644
--- a/src/test_libOggFLAC/test_libOggFLAC.dsp
+++ b/src/test_libOggFLAC/test_libOggFLAC.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /machine:I386

 

 !ELSEIF  "$(CFG)" == "test_libOggFLAC - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 

 !ENDIF