Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Almost added Mac OS X nasm support
  • Loading branch information
slouken committed Jun 26, 2006
1 parent 95a09a5 commit 0a6af9b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build-scripts/strip_fPIC.sh
Expand Up @@ -8,6 +8,9 @@ while [ $# -gt 0 ]; do
-?PIC)
# Ignore -fPIC and -DPIC options
;;
-fno-common)
# Ignore -fPIC and -DPIC options
;;
*)
command="$command $1"
;;
Expand Down
9 changes: 8 additions & 1 deletion configure.in
Expand Up @@ -611,6 +611,9 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes
openbsd)
NASMFLAGS="-f aoutb"
;;
macosx)
NASMFLAGS="-f macho"
;;
*)
NASMFLAGS="-f elf"
;;
Expand All @@ -620,7 +623,7 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes

dnl See if hidden visibility is supported
echo 'GLOBAL _bar:function hidden' > nasm_vis.asm
if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD ; then
if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD 2>&1; then
NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY"
fi
rm -f nasm_vis.asm nasm_vis.o
Expand Down Expand Up @@ -2413,6 +2416,10 @@ case "$host" in
CheckDummyAudio
CheckDLOPEN

# Temporarily disabled:
# ld: mmxp2_32.o has external relocation entries in non-writable section (__TEXT,__text) for symbols: _mmxreturn
#CheckNASM

# Set up files for the shared object loading library
# (this needs to be done before the dynamic X11 check)
if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
Expand Down

0 comments on commit 0a6af9b

Please sign in to comment.