fix library link order
This commit is contained in:
parent
3e40402c1a
commit
c955d2ca6e
@ -24,16 +24,16 @@ topdir = ../..
|
||||
PROGRAM_NAME = flac
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
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
|
||||
#@@@ TODO: conditionalize ogg includes, defines, and -logg
|
||||
ifeq ($(SOLARIS_BUILD),yes)
|
||||
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
|
||||
#@@@ TODO: conditionalize ogg includes, defines, and -logg
|
||||
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
|
||||
|
||||
|
@ -40,7 +40,7 @@ OBJS= $(C_FILES:.c=.obj)
|
||||
all: flac.exe
|
||||
|
||||
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:
|
||||
-del *.obj *.pch
|
||||
|
@ -23,7 +23,7 @@ topdir = ../..
|
||||
|
||||
PROGRAM_NAME = metaflac
|
||||
INCLUDES = -I./include -I$(topdir)/include
|
||||
LIBS = -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lm
|
||||
LIBS = -lreplaygain -lFLAC -lgain_analysis -lgetopt -lutf8 -lm
|
||||
|
||||
OBJS = \
|
||||
main.o
|
||||
|
@ -33,7 +33,7 @@ OBJS= $(C_FILES:.c=.obj)
|
||||
all: metaflac.exe
|
||||
|
||||
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:
|
||||
-del *.obj *.pch
|
||||
|
Loading…
Reference in New Issue
Block a user