- revert commit 1566

This commit is contained in:
Laurent Desnogues 2008-05-13 10:22:16 +00:00
parent 45e055c624
commit a97ec0a587
3 changed files with 11 additions and 11 deletions

View File

@ -41,7 +41,7 @@ FILE2STROBJS = \
$(FILE2STR): $(FILE2STROBJS) $(LIBOCORE)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -54,7 +54,7 @@ PNG2BDCOBJS = \
$(PNG2BDC): $(PNG2BDCOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -67,6 +67,6 @@ VERINFOOBJS = \
$(VERINFO): $(VERINFOOBJS) $(LIBOCORE)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
endif

View File

@ -1078,7 +1078,7 @@ BUILD += $(M68KMAKE)
$(M68KMAKE): $(CPUOBJ)/m68000/m68kmake.o $(LIBOCORE)
@echo Linking $@...
$(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(LIBS) -o $@
endif
# rule to ensure we build the header before building the core CPU file

View File

@ -42,7 +42,7 @@ ROMCMPOBJS = \
romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -56,7 +56,7 @@ CHDMANOBJS = \
chdman$(EXE): $(VERSIONOBJ) $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
@echo Linking $@...
$(LD) $(LDFLAGS) $(LIBS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -69,7 +69,7 @@ JEDUTILOBJS = \
jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -82,7 +82,7 @@ MAKEMETAOBJS = \
makemeta$(EXE): $(MAKEMETAOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -95,7 +95,7 @@ REGREPOBJS = \
regrep$(EXE): $(REGREPOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -108,7 +108,7 @@ SRCCLEANOBJS = \
srcclean$(EXE): $(SRCCLEANOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
@ -121,4 +121,4 @@ SRC2HTMLOBJS = \
src2html$(EXE): $(SRC2HTMLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@