fix library list

This commit is contained in:
Josh Coalson
2002-12-04 06:57:38 +00:00
parent 34c1ea8ca2
commit 44ca9fedaa
20 changed files with 25 additions and 20 deletions

View File

@@ -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

View File

@@ -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 \

View File

@@ -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

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\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