Attachment 50951 Details for Bug 77521 – xmame.diff

[patch] xmame.diff

xmame.diff (text/plain), 1.78 KB, created by Miguel Mendez on 2005-02-14 18:20:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Mendez

Created: 2005-02-14 18:20:23 UTC

Size: 1.78 KB

patch

obsolete

>diff -ruN xmame.old/Makefile xmame/Makefile
>--- xmame.old/Makefile	Sat Feb 12 18:40:31 2005
>+++ xmame/Makefile	Mon Feb 14 18:10:02 2005
>@@ -253,13 +253,6 @@
> .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
>diff -ruN xmame.old/files/patch-makefile.mes xmame/files/patch-makefile.mes
>--- xmame.old/files/patch-makefile.mes	Thu Jan  1 01:00:00 1970
>+++ xmame/files/patch-makefile.mes	Mon Feb 14 18:05:41 2005
>@@ -0,0 +1,11 @@
>+--- makefile.mes.orig	Mon Feb 14 18:03:35 2005
>++++ makefile.mes	Mon Feb 14 18:05:09 2005
>+@@ -344,7 +344,7 @@
>+ 		$(OBJ)/mess/windows/parallel.o			\
>+ 		$(OBJ)/mess/windows/strconv.o			
>+ 	@echo Linking $@...
>+-	$(LD) $(LDFLAGS) $(CONSOLE_PROGRAM) $^ -Wl,--allow-multiple-definition $(ZLIB) $(LIBS) -lwinmm -o $@
>++	touch $@
>+ 
>+ # secondary libraries
>+ $(OBJ)/libexpat.a: $(OBJ)/expat/xmlparse.o $(OBJ)/expat/xmlrole.o $(OBJ)/expat/xmltok.o
>diff -ruN xmame.old/files/patch-src-unix-unix.mak xmame/files/patch-src-unix-unix.mak
>--- xmame.old/files/patch-src-unix-unix.mak	Thu Jan  1 01:00:00 1970
>+++ xmame/files/patch-src-unix-unix.mak	Mon Feb 14 18:09:39 2005
>@@ -0,0 +1,11 @@
>+--- src/unix/unix.mak.orig	Mon Feb 14 18:08:49 2005
>++++ src/unix/unix.mak	Mon Feb 14 18:09:12 2005
>+@@ -599,7 +599,7 @@
>+ 	$(OBJDIR)/sysdep/rc.o \
>+ 	$(OBJDIR)/tststubs.o
>+ 	$(CC_COMMENT) @echo 'Linking $@...'
>+-	$(CC_COMPILE) $(LD) $(LDFLAGS) $(MY_LIBS) $^ -Wl,--allow-multiple-definition -o $@
>++	touch $@
>+ 
>+ $(OBJDIR)/tststubs.o: src/unix/tststubs.c
>+ 	$(CC_COMPILE) $(CC) $(MY_CFLAGS) -o $@ -c $<

Actions: View | Diff

Attachments on bug 77521: 50951