Previous 199869 Revisions Next

r34140 Thursday 1st January, 2015 at 14:17:09 UTC by Oliver Stöneberg
introduced BASELIBS to makefile to link smaller tools with less dependencies (nw)
[src/build]build.mak
[src/emu/cpu]cpu.mak
[src/mess/tools/castool]castool.mak
[src/mess/tools/floptool]floptool.mak
[src/mess/tools/imgtool]imgtool.mak
[src/osd/sdl]sdl.mak
[src/osd/windows]windows.mak
[src/tools]tools.mak

trunk/src/build/build.mak
r242651r242652
6464
6565$(MAKEDEP_TARGET): $(MAKEDEPOBJS) $(LIBOCORE) $(ZLIB)
6666   @echo Linking $@...
67   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
67   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
6868
6969
7070
r242651r242652
8383
8484$(MAKEMAK_TARGET): $(MAKEMAKOBJS) $(LIBOCORE) $(ZLIB)
8585   @echo Linking $@...
86   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
86   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
8787
8888
8989
r242651r242652
102102
103103$(MAKELIST_TARGET): $(MAKELISTOBJS) $(LIBOCORE) $(ZLIB)
104104   @echo Linking $@...
105   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
105   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
106106
107107
108108
r242651r242652
122122
123123$(PNG2BDC_TARGET): $(PNG2BDCOBJS) $(LIBOCORE) $(ZLIB)
124124   @echo Linking $@...
125   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
125   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
126126
127127
128128
r242651r242652
135135
136136$(VERINFO_TARGET): $(VERINFOOBJS) $(LIBOCORE)
137137   @echo Linking $@...
138   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
138   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
139139
140140else
141141#-------------------------------------------------
trunk/src/emu/cpu/cpu.mak
r242651r242652
15971597
15981598$(M68KMAKE): $(CPUOBJ)/m68000/m68kmake.o $(LIBOCORE)
15991599   @echo Linking $@...
1600   $(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(LIBS) -o $@
1600   $(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(BASELIBS) -o $@
16011601endif
16021602
16031603# rule to ensure we build the header before building the core CPU file
trunk/src/mess/tools/castool/castool.mak
r242651r242652
3636# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
3737$(CASTOOL): $(CASTOOL_OBJS) $(FORMATS_LIB) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
3838   @echo Linking $@...
39   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
39   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
trunk/src/mess/tools/floptool/floptool.mak
r242651r242652
3636# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
3737$(FLOPTOOL): $(FLOPTOOL_OBJS) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
3838   @echo Linking $@...
39   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
39   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
trunk/src/mess/tools/imgtool/imgtool.mak
r242651r242652
7676
7777$(IMGTOOL): $(IMGTOOL_OBJS) $(LIBIMGTOOL) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE)
7878   @echo Linking $@...
79   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
79   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
trunk/src/osd/sdl/sdl.mak
r242651r242652
557557endif
558558CCOMFLAGS += `$(SDL_CONFIG) --cflags  | sed -e 's:/SDL[2]*::' -e 's:\(-I[^ ]*\)::g'`
559559
560BASELIBS += `$(SDL_CONFIG) --libs`
560561LIBS += `$(SDL_CONFIG) --libs`
561562
562563ifeq ($(SDL_LIBVER),sdl2)
r242651r242652
579580
580581# libs that Haiku doesn't want but are mandatory on *IX
581582ifneq ($(TARGETOS),haiku)
583BASELIBS += -lm -lutil -lpthread
582584LIBS += -lm -lutil -lpthread
583585endif
584586
r242651r242652
845847
846848testkeys$(EXE): $(TESTKEYSOBJS) $(LIBUTIL) $(LIBOCORE) $(SDLUTILMAIN)
847849   @echo Linking $@...
848   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
850   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
849851
850852#-------------------------------------------------
851853# clean up
trunk/src/osd/windows/windows.mak
r242651r242652
312312endif
313313
314314# add the windows libraries
315BASELIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -lwsock32
315316LIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -lwsock32
316317
317318ifdef USE_SDL
trunk/src/tools/tools.mak
r242651r242652
7474
7575romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
7676   @echo Linking $@...
77   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
77   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
7878
7979
8080
r242651r242652
8888chdman$(EXE): $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE)
8989   $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
9090   @echo Linking $@...
91   $(LD) $(LDFLAGS) $(VERSIONOBJ) $^ $(LIBS) $(FLAC_LIB) -o $@
91   $(LD) $(LDFLAGS) $(VERSIONOBJ) $^ $(BASELIBS) $(FLAC_LIB) -o $@
9292
9393
9494
r242651r242652
101101
102102jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
103103   @echo Linking $@...
104   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
104   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
105105
106106
107107
r242651r242652
115115# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
116116unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM) $(LIBEMU) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB)
117117   @echo Linking $@...
118   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
118   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
119119
120120
121121
r242651r242652
128128
129129ldresample$(EXE): $(LDRESAMPLEOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(EXPAT)
130130   @echo Linking $@...
131   $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@
131   $(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@
132132
133133
134134
r242651r242652
141141
142142ldverify$(EXE): $(LDVERIFYOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(7Z_LIB) $(EXPAT)
143143   @echo Linking $@...
144   $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@
144   $(LD) $(LDFLAGS) $^ $(BASELIBS) $(FLAC_LIB) -o $@
145145
146146
147147
r242651r242652
154154
155155regrep$(EXE): $(REGREPOBJS) $(LIBUTIL) $(FLAC_LIB) $(LIBOCORE) $(ZLIB) $(EXPAT)
156156   @echo Linking $@...
157   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
157   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
158158
159159
160160
r242651r242652
167167
168168srcclean$(EXE): $(SRCCLEANOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
169169   @echo Linking $@...
170   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
170   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
171171
172172
173173
r242651r242652
180180
181181src2html$(EXE): $(SRC2HTMLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
182182   @echo Linking $@...
183   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
183   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
184184
185185
186186
r242651r242652
194194# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
195195split$(EXE): $(SPLITOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB)
196196   @echo Linking $@...
197   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
197   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
198198
199199
200200
r242651r242652
207207
208208pngcmp$(EXE): $(PNGCMPOBJS) $(LIBUTIL) $(FLAC_LIB) $(LIBOCORE) $(ZLIB)
209209   @echo Linking $@...
210   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
210   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
211211
212212#-------------------------------------------------
213213# nltool
r242651r242652
219219
220220nltool$(EXE): $(NLTOOLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
221221   @echo Linking $@...
222   $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
222   $(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
223223

https://github.com/mamedev/mame/commit/1c94c3f40892165b5d7a822cc80a90ef16b42342

Previous 199869 Revisions Next

© 1997-2024 The MAME Team