MAME SVN History

199869 Revisions

r23748 Monday 17th June, 2013 at 10:27:14 UTC by Miodrag Milanović
put optional cpu, video, sound and machine cores in one library in order to prevent linking issues on small builds, also created temp solution for subtargets for arcade,fruit and pinball machines (nw)

[/trunk]	makefile
[src/emu]	emu.mak
[src/mame]	arcade.mak* fruit.mak* mame.mak pinball.mak*

trunk/src/emu/emu.mak
r23747	r23748
183	183
184	184	include $(EMUSRC)/cpu/cpu.mak
185	185
186		$(LIBCPU): $(CPUOBJS)
187
188	186	$(LIBDASM): $(DASMOBJS)
189	187
190	188
191
192	189	#-------------------------------------------------
193	190	# sound core objects
194	191	#-------------------------------------------------
195	192
196	193	include $(EMUSRC)/sound/sound.mak
197	194
198		$(LIBSOUND): $(SOUNDOBJS)
199
200
201
202	195	#-------------------------------------------------
203	196	# video core objects
204	197	#-------------------------------------------------
205	198
206	199	include $(EMUSRC)/video/video.mak
207	200
208		$(LIBVIDEO): $(VIDEOOBJS)
209
210
211	201	#-------------------------------------------------
212	202	# machine core objects
213	203	#-------------------------------------------------
214	204
215	205	include $(EMUSRC)/machine/machine.mak
216	206
217		$(LIBMACHINE): $(MACHINEOBJS)
	207	#-------------------------------------------------
	208	# core optional library
	209	#-------------------------------------------------
218	210
	211	$(LIBOPTIONAL): $(CPUOBJS) $(SOUNDOBJS) $(VIDEOOBJS) $(MACHINEOBJS)
219	212
220	213	#-------------------------------------------------
221	214	# additional dependencies

trunk/src/mame/fruit.mak
r0	r23748
	1	###########################################################################
	2	#
	3	# fruit.mak
	4	#
	5	# Small driver-specific example makefile
	6	# Use make SUBTARGET=fruit to build
	7	#
	8	# Copyright Nicola Salmoria and the MAME Team.
	9	# Visit http://mamedev.org for licensing and usage restrictions.
	10	#
	11	###########################################################################
	12
	13	include $(SRC)/$(TARGET)/mame.mak
		No newline at end of file

Property changes on: trunk/src/mame/fruit.mak
Added: svn:eol-style + native Added: svn:mime-type + text/plain

trunk/src/mame/mame.mak
r23747	r23748
597	597	$(MACHINE)/segacrp2.o \
598	598	$(MACHINE)/ticket.o \
599	599	$(VIDEO)/avgdvg.o \
	600	$(AUDIO)/decobsmt.o \
600	601
601	602	#-------------------------------------------------
602	603	# manufacturer-specific groupings for drivers
r23747	r23748
870	871	$(DRIVERS)/deco_mlc.o $(VIDEO)/deco_mlc.o \
871	872	$(DRIVERS)/deco156.o $(MACHINE)/deco156.o \
872	873	$(DRIVERS)/deco32.o $(VIDEO)/deco32.o $(VIDEO)/dvi.o \
873		$(AUDIO)/decobsmt.o \
874	874	$(DRIVERS)/decocass.o $(MACHINE)/decocass.o $(MACHINE)/decocass_tape.o $(VIDEO)/decocass.o \
875	875	$(DRIVERS)/deshoros.o \
876	876	$(DRIVERS)/dietgo.o $(VIDEO)/dietgo.o \

trunk/src/mame/arcade.mak
r0	r23748
	1	###########################################################################
	2	#
	3	# arcade.mak
	4	#
	5	# Small driver-specific example makefile
	6	# Use make SUBTARGET=arcade to build
	7	#
	8	# Copyright Nicola Salmoria and the MAME Team.
	9	# Visit http://mamedev.org for licensing and usage restrictions.
	10	#
	11	###########################################################################
	12
	13	include $(SRC)/$(TARGET)/mame.mak
		No newline at end of file

Property changes on: trunk/src/mame/arcade.mak
Added: svn:mime-type + text/plain Added: svn:eol-style + native

trunk/src/mame/pinball.mak
r0	r23748
	1	###########################################################################
	2	#
	3	# pinball.mak
	4	#
	5	# Small driver-specific example makefile
	6	# Use make SUBTARGET=pinball to build
	7	#
	8	# Copyright Nicola Salmoria and the MAME Team.
	9	# Visit http://mamedev.org for licensing and usage restrictions.
	10	#
	11	###########################################################################
	12
	13	include $(SRC)/$(TARGET)/mame.mak
		No newline at end of file

Property changes on: trunk/src/mame/pinball.mak
Added: svn:mime-type + text/plain Added: svn:eol-style + native

trunk/makefile
r23747	r23748
636	636	#-------------------------------------------------
637	637
638	638	LIBEMU = $(OBJ)/libemu.a
639		LIBCPU = $(OBJ)/$(TARGET)/$(SUBTARGET)/libcpu.a
	639	LIBOPTIONAL = $(OBJ)/$(TARGET)/$(SUBTARGET)/liboptional.a
640	640	LIBDASM = $(OBJ)/$(TARGET)/$(SUBTARGET)/libdasm.a
641		LIBSOUND = $(OBJ)/$(TARGET)/$(SUBTARGET)/libsound.a
642		LIBVIDEO = $(OBJ)/$(TARGET)/$(SUBTARGET)/libvideo.a
643		LIBMACHINE = $(OBJ)/$(TARGET)/$(SUBTARGET)/libmachine.a
644	641	LIBUTIL = $(OBJ)/libutil.a
645	642	LIBOCORE = $(OBJ)/libocore.a
646	643	LIBOSD = $(OBJ)/libosd.a
r23747	r23748
822	819
823	820	ifndef EXECUTABLE_DEFINED
824	821
825		$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCP~~U) $(L~~I~~BMACHI~~NE) $(LIBEMU) $(LIBDASM~~) $(LIBSOUND) $(LIBVIDEO~~) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE)
	822	$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBOPTIONAL) $(LIBEMU) $(LIBDASM) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE)
826	823	$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
827	824	@echo Linking $@...
828	825	$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@

199869 Revisions