nasm -f elf

This commit is contained in:
pvalchev 2003-04-17 07:47:22 +00:00
parent 3b5475553e
commit 211f2fc2c5
2 changed files with 14 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2002/10/26 12:52:48 naddy Exp $
# $OpenBSD: Makefile,v 1.8 2003/04/17 07:47:22 pvalchev Exp $
COMMENT= "emulates arcade machines and old home computers"
COMMENT-mame= "emulates a massive variety of arcade machines"
@ -128,8 +128,8 @@ DOCS= changes.mame changes.mess changes.opengl changes.unix credits.mess \
BUILD_DEPENDS+= nasm::devel/nasm
MAKE_FLAGS+= MY_CPU=i386 \
X86_ASM_68000=1 \
NASM_FMT="-f aoutb" \
ASM_STRIP="true"
NASM_FMT="-f elf" \
ASM_STRIP="src/unix/contrib/porting/strip_"
. if ${DISPLAY_METHOD} == "x11"
MAKE_FLAGS+= X11_DGA=1
. elif ${DISPLAY_METHOD} != "SDL"

View File

@ -1,5 +1,5 @@
--- src/configure.in.orig Thu May 23 10:11:18 2002
+++ src/configure.in Wed Jul 17 05:17:37 2002
--- src/configure.in.orig Thu May 23 07:11:18 2002
+++ src/configure.in Mon Apr 7 18:15:18 2003
@@ -16,7 +16,7 @@ dnl See also: remarks supplied in the de
AC_INIT(init.asm)
AC_CONFIG_HEADER(config.h)
@ -9,6 +9,15 @@
AC_PROG_CC
AC_PATH_PROG(NASMPATH,nasm,[AC_MSG_ERROR(nasm 0.98 is required)])
NFLAGS="$NFLAGS -w-orphan-labels"
@@ -29,7 +29,7 @@ case "$target" in
;;
*-*-*openbsd*)
CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__"
- NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -D__OpenBSD__ -f aoutb"
+ NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -D__OpenBSD__ -f elf"
;;
*-*-*bsd*)
CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__"
@@ -145,31 +145,6 @@ else
CFLAGS="$CFLAGS -Os -ffast-math -fomit-frame-pointer -fschedule-insns2 -s"