Attachment #50951 for bug #77521

View | Details | Raw Unified | Return to bug 77521
Collapse All | Expand All




.endfor
	${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h

.if ${MAMEMESS} == "mess"
.if ${OSVERSION} < 500000
	${REINPLACE_CMD} -e "s@-Wl,--allow-multiple-definition@@" \
		${WRKSRC}/makefile.mes ${WRKSRC}/src/unix/unix.mak
.endif
.endif

post-build:
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
		${GMAKE} doc/x${MAMEMESS}.6

Line 0 Link Here

(-)xmame/files/patch-makefile.mes (+11 lines)
	1	--- makefile.mes.orig Mon Feb 14 18:03:35 2005
	2	+++ makefile.mes Mon Feb 14 18:05:09 2005
	3	@@ -344,7 +344,7 @@
	4	$(OBJ)/mess/windows/parallel.o \
	5	$(OBJ)/mess/windows/strconv.o
	6	@echo Linking $@...
	7	- $(LD) $(LDFLAGS) $(CONSOLE_PROGRAM) $^ -Wl,--allow-multiple-definition $(ZLIB) $(LIBS) -lwinmm -o $@
	8	+ touch $@
	9
	10	# secondary libraries
	11	$(OBJ)/libexpat.a: $(OBJ)/expat/xmlparse.o $(OBJ)/expat/xmlrole.o $(OBJ)/expat/xmltok.o

Line 0 Link Here

(-)xmame/files/patch-src-unix-unix.mak (+11 lines)
	1	--- src/unix/unix.mak.orig Mon Feb 14 18:08:49 2005
	2	+++ src/unix/unix.mak Mon Feb 14 18:09:12 2005
	3	@@ -599,7 +599,7 @@
	4	$(OBJDIR)/sysdep/rc.o \
	5	$(OBJDIR)/tststubs.o
	6	$(CC_COMMENT) @echo 'Linking $@...'
	7	- $(CC_COMPILE) $(LD) $(LDFLAGS) $(MY_LIBS) $^ -Wl,--allow-multiple-definition -o $@
	8	+ touch $@
	9
	10	$(OBJDIR)/tststubs.o: src/unix/tststubs.c
	11	$(CC_COMPILE) $(CC) $(MY_CFLAGS) -o $@ -c $<

Return to bug 77521

Lines 253-265 Link Here

(-)xmame/Makefile (-7 lines)
253	.endfor	253	.endfor
254	${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h	254	${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h
255		255
256	.if ${MAMEMESS} == "mess"
257	.if ${OSVERSION} < 500000
258	${REINPLACE_CMD} -e "s@-Wl,--allow-multiple-definition@@" \
259	${WRKSRC}/makefile.mes ${WRKSRC}/src/unix/unix.mak
260	.endif
261	.endif
262
263	post-build:	256	post-build:
264	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \	257	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
265	${GMAKE} doc/x${MAMEMESS}.6	258	${GMAKE} doc/x${MAMEMESS}.6