diff options
author | Josh Coalson <jcoalson@users.sourceforce.net> | 2002-12-04 06:57:38 +0000 |
---|---|---|
committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2002-12-04 06:57:38 +0000 |
commit | 44ca9fedaa0ba7b104b208c33e6b874a147b2ec7 (patch) | |
tree | cbd041f24b4d6b643c581251a60b3b857dd2589d | |
parent | 34c1ea8ca2a567043d079c4a6e0baa3f0f6341d4 (diff) | |
download | flac-44ca9fedaa0ba7b104b208c33e6b874a147b2ec7.tar.gz |
fix library list
-rw-r--r-- | src/test_grabbag/cuesheet/Makefile.am | 1 | ||||
-rw-r--r-- | src/test_grabbag/cuesheet/Makefile.lite | 2 | ||||
-rw-r--r-- | src/test_grabbag/cuesheet/Makefile.vc | 2 | ||||
-rw-r--r-- | src/test_grabbag/cuesheet/test_cuesheet.dsp | 4 | ||||
-rw-r--r-- | src/test_libFLAC++/Makefile.am | 1 | ||||
-rw-r--r-- | src/test_libFLAC++/Makefile.lite | 2 | ||||
-rw-r--r-- | src/test_libFLAC++/Makefile.vc | 2 | ||||
-rw-r--r-- | src/test_libFLAC++/test_libFLAC++.dsp | 4 | ||||
-rw-r--r-- | src/test_libFLAC/Makefile.am | 1 | ||||
-rw-r--r-- | src/test_libFLAC/Makefile.lite | 2 | ||||
-rw-r--r-- | src/test_libFLAC/Makefile.vc | 2 | ||||
-rw-r--r-- | src/test_libFLAC/test_libFLAC.dsp | 4 | ||||
-rw-r--r-- | src/test_libOggFLAC++/Makefile.am | 1 | ||||
-rw-r--r-- | src/test_libOggFLAC++/Makefile.lite | 2 | ||||
-rw-r--r-- | src/test_libOggFLAC++/Makefile.vc | 2 | ||||
-rw-r--r-- | src/test_libOggFLAC++/test_libOggFLAC++.dsp | 4 | ||||
-rw-r--r-- | src/test_libOggFLAC/Makefile.am | 1 | ||||
-rw-r--r-- | src/test_libOggFLAC/Makefile.lite | 2 | ||||
-rw-r--r-- | src/test_libOggFLAC/Makefile.vc | 2 | ||||
-rw-r--r-- | src/test_libOggFLAC/test_libOggFLAC.dsp | 4 |
20 files changed, 25 insertions, 20 deletions
diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am index 7bdcde47..6ee2c038 100644 --- a/src/test_grabbag/cuesheet/Makefile.am +++ b/src/test_grabbag/cuesheet/Makefile.am @@ -27,6 +27,7 @@ test_cuesheet_SOURCES = \ main.c test_cuesheet_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.a \ + $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \ $(top_builddir)/src/libFLAC/libFLAC.la \ -lm diff --git a/src/test_grabbag/cuesheet/Makefile.lite b/src/test_grabbag/cuesheet/Makefile.lite index ba27ef7f..b5da6662 100644 --- a/src/test_grabbag/cuesheet/Makefile.lite +++ b/src/test_grabbag/cuesheet/Makefile.lite @@ -23,7 +23,7 @@ topdir = ../../.. PROGRAM_NAME = test_cuesheet INCLUDES = -I./include -I$(topdir)/include -LIBS = -lgrabbag -lFLAC -lm +LIBS = -lgrabbag -lgain_analysis -lFLAC -lm SRCS_C = \ main.c diff --git a/src/test_grabbag/cuesheet/Makefile.vc b/src/test_grabbag/cuesheet/Makefile.vc index 0cb7b93e..2b1692d8 100644 --- a/src/test_grabbag/cuesheet/Makefile.vc +++ b/src/test_grabbag/cuesheet/Makefile.vc @@ -33,7 +33,7 @@ OBJS= $(C_FILES:.c=.obj) all: test_cuesheet.exe
test_cuesheet.exe: $(OBJS)
- link.exe /libpath:"..\..\..\obj\release\lib" -out:../../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libFLAC_static.lib
+ link.exe /libpath:"..\..\..\obj\release\lib" -out:../../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib gain_analysis_static.lib libFLAC_static.lib
clean:
-del *.obj *.pch
diff --git a/src/test_grabbag/cuesheet/test_cuesheet.dsp b/src/test_grabbag/cuesheet/test_cuesheet.dsp index ea89f4ab..319ffafd 100644 --- a/src/test_grabbag/cuesheet/test_cuesheet.dsp +++ b/src/test_grabbag/cuesheet/test_cuesheet.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\release\lib\grabbag_static.lib ..\..\..\obj\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\..\..\obj\release\lib\grabbag_static.lib ..\..\..\obj\release\lib\gain_analysis_static.lib ..\..\..\obj\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "test_cuesheet - 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\debug\lib\grabbag_static.lib ..\..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\..\obj\debug\lib\grabbag_static.lib ..\..\..\obj\debug\lib\gain_analysis_static.lib ..\..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am index 2464a279..0e5202c9 100644 --- a/src/test_libFLAC++/Makefile.am +++ b/src/test_libFLAC++/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = \ noinst_PROGRAMS = test_libFLAC++ test_libFLAC___LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.a \ + $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \ $(top_builddir)/src/libFLAC++/libFLAC++.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ -lm diff --git a/src/test_libFLAC++/Makefile.lite b/src/test_libFLAC++/Makefile.lite index 30e365dd..2270990a 100644 --- a/src/test_libFLAC++/Makefile.lite +++ b/src/test_libFLAC++/Makefile.lite @@ -23,7 +23,7 @@ topdir = ../.. PROGRAM_NAME = test_libFLAC++ INCLUDES = -I$(topdir)/include -LIBS = -lgrabbag -lFLAC++ -lFLAC -lm +LIBS = -lgrabbag -lgain_analysis -lFLAC++ -lFLAC -lm SRCS_CPP = \ decoders.cpp \ encoders.cpp \ diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc index e19924ac..f5c70679 100644 --- a/src/test_libFLAC++/Makefile.vc +++ b/src/test_libFLAC++/Makefile.vc @@ -52,7 +52,7 @@ CPP_OBJS= $(CPP_FILES:.cpp=.obj) all: test_libFLAC++.exe
test_libFLAC++.exe: $(C_OBJS) $(CPP_OBJS)
- link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(CPP_OBJS) $(C_OBJS) grabbag_static.lib libFLAC++_static.lib libFLAC_static.lib
+ link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(CPP_OBJS) $(C_OBJS) grabbag_static.lib gain_analysis_static.lib libFLAC++_static.lib libFLAC_static.lib
clean:
-del *.obj *.pch
diff --git a/src/test_libFLAC++/test_libFLAC++.dsp b/src/test_libFLAC++/test_libFLAC++.dsp index 921ca249..1bef26ec 100644 --- a/src/test_libFLAC++/test_libFLAC++.dsp +++ b/src/test_libFLAC++/test_libFLAC++.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\release\lib\grabbag_static.lib ..\..\obj\release\lib\libFLAC++_static.lib ..\..\obj\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\gain_analysis_static.lib ..\..\obj\release\lib\libFLAC++_static.lib ..\..\obj\release\lib\libFLAC_static.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\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC++_static.lib ..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\gain_analysis_static.lib ..\..\obj\debug\lib\libFLAC++_static.lib ..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index 11494247..074fd12f 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -26,6 +26,7 @@ INCLUDES = -I$(top_srcdir)/src/libFLAC/include noinst_PROGRAMS = test_libFLAC test_libFLAC_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.a \ + $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \ $(top_builddir)/src/libFLAC/libFLAC.la \ -lm test_libFLAC_SOURCES = \ diff --git a/src/test_libFLAC/Makefile.lite b/src/test_libFLAC/Makefile.lite index 0598dacf..712c2786 100644 --- a/src/test_libFLAC/Makefile.lite +++ b/src/test_libFLAC/Makefile.lite @@ -23,7 +23,7 @@ topdir = ../.. PROGRAM_NAME = test_libFLAC INCLUDES = -I../libFLAC/include -I$(topdir)/include -LIBS = -lgrabbag -lFLAC -lm +LIBS = -lgrabbag -lgain_analysis -lFLAC -lm SRCS_C = \ bitbuffer.c \ decoders.c \ diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc index b37df36e..124fb9e6 100644 --- a/src/test_libFLAC/Makefile.vc +++ b/src/test_libFLAC/Makefile.vc @@ -41,7 +41,7 @@ OBJS= $(C_FILES:.c=.obj) all: test_libFLAC.exe
test_libFLAC.exe: $(OBJS)
- link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libFLAC_static.lib
+ link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib gain_analysis_static.lib libFLAC_static.lib
clean:
-del *.obj *.pch
diff --git a/src/test_libFLAC/test_libFLAC.dsp b/src/test_libFLAC/test_libFLAC.dsp index d9e45cb9..7c0f7d36 100644 --- a/src/test_libFLAC/test_libFLAC.dsp +++ b/src/test_libFLAC/test_libFLAC.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\release\lib\grabbag_static.lib ..\..\obj\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\gain_analysis_static.lib ..\..\obj\release\lib\libFLAC_static.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\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\gain_analysis_static.lib ..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
diff --git a/src/test_libOggFLAC++/Makefile.am b/src/test_libOggFLAC++/Makefile.am index b6964be7..b905f456 100644 --- a/src/test_libOggFLAC++/Makefile.am +++ b/src/test_libOggFLAC++/Makefile.am @@ -26,6 +26,7 @@ CFLAGS = @CFLAGS@ @OGG_CFLAGS@ noinst_PROGRAMS = test_libOggFLAC++ test_libOggFLAC___LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.a \ + $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \ $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la \ $(top_builddir)/src/libOggFLAC/libOggFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ diff --git a/src/test_libOggFLAC++/Makefile.lite b/src/test_libOggFLAC++/Makefile.lite index 5862b897..db318a1a 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 = -lgrabbag -lOggFLAC++ -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm +LIBS = -lgrabbag -lgain_analysis -lOggFLAC++ -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm SRCS_CPP = \ decoders.cpp \ encoders.cpp \ diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc index aaf67923..b68868d4 100644 --- a/src/test_libOggFLAC++/Makefile.vc +++ b/src/test_libOggFLAC++/Makefile.vc @@ -49,7 +49,7 @@ CPP_OBJS= $(CPP_FILES:.cpp=.obj) all: test_libOggFLAC++.exe
test_libOggFLAC++.exe: $(C_OBJS) $(CPP_OBJS)
- link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(CPP_OBJS) $(C_OBJS) grabbag_static.lib libOggFLAC++_static.lib libOggFLAC_static.lib libFLAC_static.lib ogg_static.lib
+ link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(CPP_OBJS) $(C_OBJS) grabbag_static.lib gain_analysis_static.lib libOggFLAC++_static.lib libOggFLAC_static.lib libFLAC_static.lib ogg_static.lib
clean:
-del *.obj *.pch
diff --git a/src/test_libOggFLAC++/test_libOggFLAC++.dsp b/src/test_libOggFLAC++/test_libOggFLAC++.dsp index dbe5be2e..01e36c3b 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\release\lib\grabbag_static.lib ..\..\obj\release\lib\libOggFLAC++_static.lib ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libFLAC++_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\gain_analysis_static.lib ..\..\obj\release\lib\libOggFLAC++_static.lib ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libFLAC++_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.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\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libOggFLAC++_static.lib ..\..\obj\debug\lib\libOggFLAC_static.lib ..\..\obj\debug\lib\libFLAC++_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\gain_analysis_static.lib ..\..\obj\debug\lib\libOggFLAC++_static.lib ..\..\obj\debug\lib\libOggFLAC_static.lib ..\..\obj\debug\lib\libFLAC++_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am index 64bf1840..089598e4 100644 --- a/src/test_libOggFLAC/Makefile.am +++ b/src/test_libOggFLAC/Makefile.am @@ -26,6 +26,7 @@ INCLUDES = noinst_PROGRAMS = test_libOggFLAC test_libOggFLAC_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.a \ + $(top_builddir)/src/share/gain_analysis/libgain_analysis.a \ $(top_builddir)/src/libOggFLAC/libOggFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ @OGG_LIBS@ \ diff --git a/src/test_libOggFLAC/Makefile.lite b/src/test_libOggFLAC/Makefile.lite index a080d7f2..be5e93e2 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 = -lgrabbag -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm +LIBS = -lgrabbag -lgain_analysis -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm SRCS_C = \ decoders.c \ encoders.c \ diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc index f7c7ebac..e9369453 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\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libOggFLAC_static.lib libFLAC_static.lib ogg_static.lib
+ link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib gain_analysis_static.lib libOggFLAC_static.lib libFLAC_static.lib ogg_static.lib
clean:
-del *.obj *.pch
diff --git a/src/test_libOggFLAC/test_libOggFLAC.dsp b/src/test_libOggFLAC/test_libOggFLAC.dsp index c3a4ed19..af1b9194 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\release\lib\grabbag_static.lib ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\gain_analysis_static.lib ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.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\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libOggFLAC_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\gain_analysis_static.lib ..\..\obj\debug\lib\libOggFLAC_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
|