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

fix library link order

Browse Source
This commit is contained in:
Josh Coalson
2002-10-29 05:46:16 +00:00
parent 3e40402c1a
commit c955d2ca6e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/flac/Makefile.lite
View File

@@ -24,16 +24,16 @@ topdir = ../..
PROGRAM_NAME = flac PROGRAM_NAME = flac
ifeq ($(DARWIN_BUILD),yes) ifeq ($(DARWIN_BUILD),yes)
INCLUDES = -I./include -I$(topdir)/include INCLUDES = -I./include -I$(topdir)/include
LIBS = -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lc -lm LIBS = -lreplaygain -lFLAC -lgain_analysis -lgetopt -lutf8 -lc -lm
else else
#@@@ TODO: conditionalize ogg includes, defines, and -logg #@@@ TODO: conditionalize ogg includes, defines, and -logg
ifeq ($(SOLARIS_BUILD),yes) ifeq ($(SOLARIS_BUILD),yes)
INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
LIBS = -lOggFLAC -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg LIBS = -lreplaygain -lOggFLAC -lFLAC -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
else else
#@@@ TODO: conditionalize ogg includes, defines, and -logg #@@@ TODO: conditionalize ogg includes, defines, and -logg
INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
LIBS = -lOggFLAC -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg LIBS = -lreplaygain -lOggFLAC -lFLAC -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
endif endif
endif endif

2
src/flac/Makefile.vc
View File

@@ -40,7 +40,7 @@ OBJS= $(C_FILES:.c=.obj)
all: flac.exe all: flac.exe
flac.exe: $(OBJS) flac.exe: $(OBJS)
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libOggFLAC.lib libFLAC.lib ogg_static.lib replaygain.lib gain_analysis.lib getopt.lib utf8.lib link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) replaygain.lib libOggFLAC.lib libFLAC.lib ogg_static.lib gain_analysis.lib getopt.lib utf8.lib
clean: clean:
-del *.obj *.pch -del *.obj *.pch

2
src/metaflac/Makefile.lite
View File

@@ -23,7 +23,7 @@ topdir = ../..
PROGRAM_NAME = metaflac PROGRAM_NAME = metaflac
INCLUDES = -I./include -I$(topdir)/include INCLUDES = -I./include -I$(topdir)/include
LIBS = -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lm LIBS = -lreplaygain -lFLAC -lgain_analysis -lgetopt -lutf8 -lm
OBJS = \ OBJS = \
main.o main.o

2
src/metaflac/Makefile.vc
View File

@@ -33,7 +33,7 @@ OBJS= $(C_FILES:.c=.obj)
all: metaflac.exe all: metaflac.exe
metaflac.exe: $(OBJS) metaflac.exe: $(OBJS)
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libFLAC.lib replaygain.lib gain_analysis.lib getopt.lib utf8.lib link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) replaygain.lib libFLAC.lib gain_analysis.lib getopt.lib utf8.lib
clean: clean:
-del *.obj *.pch -del *.obj *.pch