claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates to work with new grabbag lib

Browse Source
This commit is contained in:
Josh Coalson
2002-11-07 05:07:30 +00:00
parent 0dad163d95
commit b8f8a07684
39 changed files with 141 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/test_libFLAC/Makefile.am
View File

@@ -24,7 +24,10 @@ CFLAGS = @CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
test_libFLAC_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
test_libFLAC_LDADD = \
$(top_builddir)/src/share/grabbag/grabbag.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-lm
test_libFLAC_SOURCES = \
bitbuffer.c \
decoders.c \

2
src/test_libFLAC/Makefile.lite
View File

@@ -23,7 +23,7 @@ topdir = ../..
PROGRAM_NAME = test_libFLAC
INCLUDES = -I../libFLAC/include -I$(topdir)/include
LIBS = -lFLAC -lfile_utils -lm
LIBS = -lgrabbag -lFLAC -lm
OBJS = \
bitbuffer.o \
decoders.o \

2
src/test_libFLAC/Makefile.vc
View File

@@ -41,7 +41,7 @@ OBJS= $(C_FILES:.c=.obj)
all: test_libFLAC.exe
test_libFLAC.exe: $(OBJS)
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libFLAC.lib file_utils.lib
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) file_utils.lib libFLAC.lib
clean:
-del *.obj *.pch

4
src/test_libFLAC/decoders.c
View File

@@ -23,7 +23,7 @@
#include "FLAC/file_decoder.h"
#include "FLAC/seekable_stream_decoder.h"
#include "FLAC/stream_decoder.h"
#include "share/file_utils.h"
#include "share/grabbag.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@@ -2076,7 +2076,7 @@ FLAC__bool test_decoders()
if(!test_file_decoder())
return false;
(void) FLAC__file_utils_remove_file(flacfilename_);
(void) grabbag__file_remove_file(flacfilename_);
free_metadata_blocks_();
return true;

4
src/test_libFLAC/encoders.c
View File

@@ -22,7 +22,7 @@
#include "FLAC/file_encoder.h"
#include "FLAC/seekable_stream_encoder.h"
#include "FLAC/stream_encoder.h"
#include "share/file_utils.h"
#include "share/grabbag.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1123,7 +1123,7 @@ FLAC__bool test_encoders()
if(!test_file_encoder())
return false;
(void) FLAC__file_utils_remove_file(flacfilename_);
(void) grabbag__file_remove_file(flacfilename_);
free_metadata_blocks_();
return true;

8
src/test_libFLAC/metadata_manip.c
View File

@@ -21,7 +21,7 @@
#include "FLAC/assert.h"
#include "FLAC/file_decoder.h"
#include "FLAC/metadata.h"
#include "share/file_utils.h"
#include "share/grabbag.h"
#include <stdio.h>
#include <stdlib.h> /* for malloc() */
@@ -377,8 +377,8 @@ static FLAC__bool test_file_(const char *filename, void (*metadata_callback)(con
static FLAC__bool change_stats_(const char *filename, FLAC__bool read_only)
{
if(!FLAC__file_utils_change_stats(filename, read_only))
return die_("during FLAC__file_utils_change_stats()");
if(!grabbag__file_change_stats(filename, read_only))
return die_("during grabbag__file_change_stats()");
return true;
}
@@ -388,7 +388,7 @@ static FLAC__bool remove_file_(const char *filename)
while(our_metadata_.num_blocks > 0)
delete_from_our_metadata_(0);
if(!FLAC__file_utils_remove_file(filename))
if(!grabbag__file_remove_file(filename))
return die_("removing file");
return true;

4
src/test_libFLAC/test_libFLAC.dsp
View File

@@ -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\libFLAC.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "test_libFLAC - 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\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF