configure.in
changeset 1402 d910939febfa
parent 1399 c35c161a1100
child 1438 1f4f09641645
     1.1 --- a/configure.in	Tue Feb 21 08:34:45 2006 +0000
     1.2 +++ b/configure.in	Tue Feb 21 08:46:50 2006 +0000
     1.3 @@ -57,10 +57,10 @@
     1.4  case "$target" in
     1.5      *-*-cygwin*)
     1.6          # We build SDL on cygwin without the UNIX emulation layer
     1.7 -        CFLAGS="$CFLAGS -I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
     1.8 +        CFLAGS="$CFLAGS -I/usr/include/mingw -mno-cygwin"
     1.9          BUILD_CFLAGS="$CFLAGS \$(INCLUDE)"
    1.10          BUILD_LDFLAGS="$LDFLAGS -mno-cygwin"
    1.11 -        SDL_CFLAGS="-I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
    1.12 +        SDL_CFLAGS="-I/usr/include/mingw -mno-cygwin"
    1.13          SDL_LIBS="-lSDL -mno-cygwin"
    1.14          ;;
    1.15      *)
    1.16 @@ -239,11 +239,11 @@
    1.17  if test x$enable_cpuinfo != xyes; then
    1.18      AC_DEFINE(SDL_CPUINFO_DISABLED)
    1.19  fi
    1.20 -AC_ARG_ENABLE(assembly-blit,
    1.21 -AC_HELP_STRING([--enable-asm-blit], [Enable assembly blitters [default=yes]]),
    1.22 -              , enable_asm_blit=yes)
    1.23 -if test x$enable_asm_blit = xyes; then
    1.24 -    AC_DEFINE(SDL_ASSEMBLY_BLITTERS)
    1.25 +AC_ARG_ENABLE(assembly,
    1.26 +AC_HELP_STRING([--enable-assembly], [Enable assembly routines [default=yes]]),
    1.27 +              , enable_assembly=yes)
    1.28 +if test x$enable_assembly = xyes; then
    1.29 +    AC_DEFINE(SDL_ASSEMBLY_ROUTINES)
    1.30  fi
    1.31  
    1.32  dnl See if the OSS audio interface is supported
    1.33 @@ -559,7 +559,7 @@
    1.34      AC_ARG_ENABLE(nasm,
    1.35  AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [default=yes]]),
    1.36                    , enable_nasm=yes)
    1.37 -    if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_nasm = xyes; then
    1.38 +    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
    1.39          AC_PATH_PROG(NASM, nasm)
    1.40          if test x$NASM != x -a x$NASM != x'"$NASM"'; then
    1.41              AC_DEFINE(SDL_HERMES_BLITTERS)
    1.42 @@ -595,7 +595,7 @@
    1.43      AC_ARG_ENABLE(altivec,
    1.44  AC_HELP_STRING([--enable-altivec], [use altivec assembly blitters on PPC [default=yes]]),
    1.45                    , enable_altivec=yes)
    1.46 -    if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_altivec = xyes; then
    1.47 +    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_altivec = xyes; then
    1.48          have_altivec_h_hdr=no
    1.49          AC_CHECK_HEADER(altivec.h, have_altivec_h_hdr=yes)
    1.50  
    1.51 @@ -2012,13 +2012,6 @@
    1.52              SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
    1.53              have_timers=yes
    1.54          fi
    1.55 -        # Do any final platform setup
    1.56 -        case $ARCH in
    1.57 -            openbsd|netbsd)
    1.58 -                # OpenBSD and NetBSD do not define "unix"
    1.59 -                BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
    1.60 -            ;;
    1.61 -        esac
    1.62          ;;
    1.63      *-*-qnx*)
    1.64          ARCH=qnx
    1.65 @@ -2221,8 +2214,7 @@
    1.66          fi
    1.67          # The MacOS X platform requires special setup.
    1.68          SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
    1.69 -        AC_DEFINE(TARGET_API_MAC_CARBON)
    1.70 -        BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings -DMACOSX"
    1.71 +        BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings"
    1.72          SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.73          if test x$enable_video_cocoa = xyes; then
    1.74              BUILD_LDFLAGS="$BUILD_LDFLAGS -framework Cocoa"
    1.75 @@ -2279,8 +2271,6 @@
    1.76              fi
    1.77              have_timers=yes
    1.78          fi
    1.79 -        # MiNT does not define "unix"
    1.80 -        BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
    1.81          ;;
    1.82      *-riscos)
    1.83          ARCH=riscos