diff options
author | Laurent Desnogues <laurent.desnogues@gmail.com> | 2008-05-13 10:22:16 +0000 |
---|---|---|
committer | Laurent Desnogues <laurent.desnogues@gmail.com> | 2008-05-13 10:22:16 +0000 |
commit | a97ec0a58723e56c33f1a4921860e407bf81c9cc (patch) | |
tree | 291df16f6827183ad8b04985cba836d1ddacb3ef | |
parent | 45e055c62401bc9fec6c471db835b58ffe9d6132 (diff) |
- revert commit 1566
-rw-r--r-- | src/build/build.mak | 6 | ||||
-rw-r--r-- | src/emu/cpu/cpu.mak | 2 | ||||
-rw-r--r-- | src/tools/tools.mak | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/build/build.mak b/src/build/build.mak index b48e7ea34bf..de333e56930 100644 --- a/src/build/build.mak +++ b/src/build/build.mak @@ -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 diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index fd79837d62c..35e52c3e362 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -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 diff --git a/src/tools/tools.mak b/src/tools/tools.mak index c8b0fc86c5b..9e03fbfcbc7 100644 --- a/src/tools/tools.mak +++ b/src/tools/tools.mak @@ -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 $@ |