From 1c94c3f40892165b5d7a822cc80a90ef16b42342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Thu, 1 Jan 2015 15:17:09 +0100 Subject: introduced BASELIBS to makefile to link smaller tools with less dependencies (nw) --- src/build/build.mak | 10 +++++----- src/emu/cpu/cpu.mak | 2 +- src/mess/tools/castool/castool.mak | 2 +- src/mess/tools/floptool/floptool.mak | 2 +- src/mess/tools/imgtool/imgtool.mak | 2 +- src/osd/sdl/sdl.mak | 4 +++- src/osd/windows/windows.mak | 1 + src/tools/tools.mak | 24 ++++++++++++------------ 8 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/build/build.mak b/src/build/build.mak index 17e9bcb3912..9b7a8d2c98f 100644 --- a/src/build/build.mak +++ b/src/build/build.mak @@ -64,7 +64,7 @@ MAKEDEPOBJS = \ $(MAKEDEP_TARGET): $(MAKEDEPOBJS) $(LIBOCORE) $(ZLIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -83,7 +83,7 @@ MAKEMAKOBJS = \ $(MAKEMAK_TARGET): $(MAKEMAKOBJS) $(LIBOCORE) $(ZLIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -102,7 +102,7 @@ MAKELISTOBJS = \ $(MAKELIST_TARGET): $(MAKELISTOBJS) $(LIBOCORE) $(ZLIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -122,7 +122,7 @@ PNG2BDCOBJS = \ $(PNG2BDC_TARGET): $(PNG2BDCOBJS) $(LIBOCORE) $(ZLIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -135,7 +135,7 @@ VERINFOOBJS = \ $(VERINFO_TARGET): $(VERINFOOBJS) $(LIBOCORE) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ else #------------------------------------------------- diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index da5c799f5f1..f0f8a5418bd 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -1597,7 +1597,7 @@ BUILD += $(M68KMAKE) $(M68KMAKE): $(CPUOBJ)/m68000/m68kmake.o $(LIBOCORE) @echo Linking $@... - $(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(BASELIBS) -o $@ endif # rule to ensure we build the header before building the core CPU file diff --git a/src/mess/tools/castool/castool.mak b/src/mess/tools/castool/castool.mak index d1437d0ba7c..af3f9ae5a39 100644 --- a/src/mess/tools/castool/castool.mak +++ b/src/mess/tools/castool/castool.mak @@ -36,4 +36,4 @@ CASTOOL_OBJS = \ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking... $(CASTOOL): $(CASTOOL_OBJS) $(FORMATS_LIB) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ diff --git a/src/mess/tools/floptool/floptool.mak b/src/mess/tools/floptool/floptool.mak index 21ee8cd17fd..1041a16c97c 100644 --- a/src/mess/tools/floptool/floptool.mak +++ b/src/mess/tools/floptool/floptool.mak @@ -36,4 +36,4 @@ FLOPTOOL_OBJS = \ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking... $(FLOPTOOL): $(FLOPTOOL_OBJS) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ diff --git a/src/mess/tools/imgtool/imgtool.mak b/src/mess/tools/imgtool/imgtool.mak index 8943977060c..044ca15a4c3 100644 --- a/src/mess/tools/imgtool/imgtool.mak +++ b/src/mess/tools/imgtool/imgtool.mak @@ -76,4 +76,4 @@ IMGTOOL_OBJS = \ $(IMGTOOL): $(IMGTOOL_OBJS) $(LIBIMGTOOL) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 6b3ab1f1fbd..4929b383ee8 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -557,6 +557,7 @@ INCPATH += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-D[^ ]*\)::g endif CCOMFLAGS += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-I[^ ]*\)::g'` +BASELIBS += `$(SDL_CONFIG) --libs` LIBS += `$(SDL_CONFIG) --libs` ifeq ($(SDL_LIBVER),sdl2) @@ -579,6 +580,7 @@ endif # libs that Haiku doesn't want but are mandatory on *IX ifneq ($(TARGETOS),haiku) +BASELIBS += -lm -lutil -lpthread LIBS += -lm -lutil -lpthread endif @@ -845,7 +847,7 @@ TESTKEYSOBJS = \ testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL) $(LIBOCORE) $(SDLUTILMAIN) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ #------------------------------------------------- # clean up diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak index 39ae9f7835b..d9c526f6141 100644 --- a/src/osd/windows/windows.mak +++ b/src/osd/windows/windows.mak @@ -312,6 +312,7 @@ ifeq ($(findstring 4.4.,$(TEST_GCC)),) endif # add the windows libraries +BASELIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -lwsock32 LIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -lwsock32 ifdef USE_SDL diff --git a/src/tools/tools.mak b/src/tools/tools.mak index ef03c1fdd2b..7ecbe6625c1 100644 --- a/src/tools/tools.mak +++ b/src/tools/tools.mak @@ -74,7 +74,7 @@ ROMCMPOBJS = \ romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -88,7 +88,7 @@ CHDMANOBJS = \ chdman$(EXE): $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE) $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) @echo Linking $@... - $(LD) $(LDFLAGS) $(VERSIONOBJ) $^ $(LIBS) $(FLAC_LIB) -o $@ + $(LD) $(LDFLAGS) $(VERSIONOBJ) $^ $(BASELIBS) $(FLAC_LIB) -o $@ @@ -101,7 +101,7 @@ JEDUTILOBJS = \ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -115,7 +115,7 @@ UNIDASMOBJS = \ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking... unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM) $(LIBEMU) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -128,7 +128,7 @@ LDRESAMPLEOBJS = \ ldresample$(EXE): $(LDRESAMPLEOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(EXPAT) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@ @@ -141,7 +141,7 @@ LDVERIFYOBJS = \ ldverify$(EXE): $(LDVERIFYOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(EXPAT) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@ @@ -154,7 +154,7 @@ REGREPOBJS = \ regrep$(EXE): $(REGREPOBJS) $(LIBUTIL) $(FLAC_LIB) $(LIBOCORE) $(ZLIB) $(EXPAT) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -167,7 +167,7 @@ SRCCLEANOBJS = \ srcclean$(EXE): $(SRCCLEANOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -180,7 +180,7 @@ SRC2HTMLOBJS = \ src2html$(EXE): $(SRC2HTMLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -194,7 +194,7 @@ SPLITOBJS = \ # TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking... split$(EXE): $(SPLITOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ @@ -207,7 +207,7 @@ PNGCMPOBJS = \ pngcmp$(EXE): $(PNGCMPOBJS) $(LIBUTIL) $(FLAC_LIB) $(LIBOCORE) $(ZLIB) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ #------------------------------------------------- # nltool @@ -219,5 +219,5 @@ NLTOOLOBJS = \ nltool$(EXE): $(NLTOOLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@ -- cgit v1.2.3