*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Sun, 19 Feb 2006 16:42:18 +0000
changeset 137304499d3e1b6b
parent 1372 3e171fa5f4df
child 1374 998b7f9a287a
*** empty log message ***
configure.in
src/video/fbcon/SDL_fbvideo.c
     1.1 --- a/configure.in	Sun Feb 19 06:02:57 2006 +0000
     1.2 +++ b/configure.in	Sun Feb 19 16:42:18 2006 +0000
     1.3 @@ -63,6 +63,18 @@
     1.4  esac
     1.5  CFLAGS="$CFLAGS $BASE_CFLAGS"
     1.6  
     1.7 +dnl Set up the compiler and linker flags for building SDL
     1.8 +INCLUDE="-I$srcdir/include"
     1.9 +if test x$srcdir != x.; then
    1.10 +    INCLUDE="-Iinclude $INCLUDE"
    1.11 +fi
    1.12 +BUILD_CFLAGS="$BASE_CFLAGS \$(INCLUDE)"
    1.13 +BUILD_LIBS="$BASE_LIBS"
    1.14 +
    1.15 +dnl Set up the compiler and linker flags for SDL applications
    1.16 +SDL_CFLAGS="$BASE_CFLAGS"
    1.17 +SDL_LIBS="$BASE_LIBS -lSDL"
    1.18 +
    1.19  dnl Check for tools
    1.20  #AC_LIBTOOL_DLOPEN
    1.21  AC_LIBTOOL_WIN32_DLL
    1.22 @@ -108,6 +120,8 @@
    1.23          AC_DEFINE(HAVE_STRTOD)
    1.24      fi
    1.25      AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strcpy strncpy strcat strncat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol _i64toa _ui64toa strtoll atoi atof strcmp strncmp stricmp strcasecmp sscanf snprintf vsnprintf sigaction setjmp nanosleep)
    1.26 +
    1.27 +    AC_CHECK_LIB(m, pow, [BUILD_LIBS="$BUILD_LIBS -lm"])
    1.28  fi
    1.29  
    1.30  if test x$have_inttypes != xyes; then
    1.31 @@ -153,13 +167,6 @@
    1.32      AC_DEFINE(uintptr_t, unsigned long)
    1.33  fi
    1.34  
    1.35 -# Set up the build preprocessor flags
    1.36 -INCLUDE="-I$srcdir/include"
    1.37 -if test x$srcdir != x.; then
    1.38 -    INCLUDE="-Iinclude $INCLUDE"
    1.39 -fi
    1.40 -BUILD_CFLAGS="$BASE_CFLAGS \$(INCLUDE)"
    1.41 -
    1.42  # Standard C sources
    1.43  SOURCES="$SOURCES $srcdir/src/*.c"
    1.44  SOURCES="$SOURCES $srcdir/src/audio/*.c"
    1.45 @@ -173,30 +180,6 @@
    1.46  SOURCES="$SOURCES $srcdir/src/timer/*.c"
    1.47  SOURCES="$SOURCES $srcdir/src/video/*.c"
    1.48  
    1.49 -# Set up the build libraries needed
    1.50 -BUILD_LIBS="$BASE_LIBS"
    1.51 -
    1.52 -# Set up the compiler and linker flags for SDL applications
    1.53 -SDL_CFLAGS="$BASE_CFLAGS"
    1.54 -SDL_LIBS="$BASE_LIBS -lSDL"
    1.55 -
    1.56 -dnl Add the math library for the new gamma correction support
    1.57 -case "$target" in
    1.58 -    *-*-cygwin* | *-*-mingw32*)
    1.59 -        MATHLIB=""
    1.60 -        ;;
    1.61 -    *-*-beos*)
    1.62 -        MATHLIB=""
    1.63 -        ;;
    1.64 -    *-*-darwin*)
    1.65 -        MATHLIB=""
    1.66 -        ;;
    1.67 -    *)
    1.68 -        MATHLIB="-lm"
    1.69 -        ;;
    1.70 -esac
    1.71 -BUILD_LIBS="$BUILD_LIBS $MATHLIB"
    1.72 -
    1.73  dnl Enable/disable various subsystems of the SDL library
    1.74  
    1.75  AC_ARG_ENABLE(audio,
     2.1 --- a/src/video/fbcon/SDL_fbvideo.c	Sun Feb 19 06:02:57 2006 +0000
     2.2 +++ b/src/video/fbcon/SDL_fbvideo.c	Sun Feb 19 16:42:18 2006 +0000
     2.3 @@ -29,7 +29,6 @@
     2.4  #include <sys/ioctl.h>
     2.5  #include <sys/mman.h>
     2.6  #include <asm/page.h>		/* For definition of PAGE_SIZE */
     2.7 -#include <sys/io.h>		/* For ioperm() */
     2.8  
     2.9  #include "SDL_video.h"
    2.10  #include "SDL_mouse.h"
    2.11 @@ -47,6 +46,7 @@
    2.12  
    2.13  #if defined(i386) && defined(FB_TYPE_VGA_PLANES)
    2.14  #define VGA16_FBCON_SUPPORT
    2.15 +#include <sys/io.h>		/* For ioperm() */
    2.16  #ifndef FB_AUX_VGA_PLANES_VGA4
    2.17  #define FB_AUX_VGA_PLANES_VGA4	0
    2.18  #endif