configure.in
changeset 1397 b189a73aa335
parent 1396 428c8690cf73
child 1398 27b719501eb4
     1.1 --- a/configure.in	Mon Feb 20 20:53:52 2006 +0000
     1.2 +++ b/configure.in	Mon Feb 20 22:15:38 2006 +0000
     1.3 @@ -1175,6 +1175,7 @@
     1.4          if test x$video_qtopia = xyes; then
     1.5              AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA)
     1.6              SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
     1.7 +            SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
     1.8              BUILD_CFLAGS="$BUILD_CFLAGS $QTOPIA_FLAGS"
     1.9              SDL_CFLAGS="$SDL_CFLAGS -DQWS -Dmain=SDL_main"
    1.10              SDL_LIBS="-lSDLmain $SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte"
    1.11 @@ -2117,6 +2118,7 @@
    1.12              BUILD_LDFLAGS="$BUILD_LDFLAGS -ldxguid"
    1.13          fi
    1.14          # The Win32 platform requires special setup
    1.15 +        SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
    1.16          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
    1.17          SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
    1.18          ;;
    1.19 @@ -2219,6 +2221,7 @@
    1.20              have_loadso=yes
    1.21          fi
    1.22          # The MacOS X platform requires special setup.
    1.23 +        SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
    1.24          AC_DEFINE(TARGET_API_MAC_CARBON)
    1.25          BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings -DMACOSX"
    1.26          SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.27 @@ -2274,13 +2277,11 @@
    1.28              else
    1.29                  AC_DEFINE(SDL_TIMER_MINT)
    1.30                  SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
    1.31 -                BUILD_CFLAGS="$BUILD_CFLAGS -I$srcdir/src/timer/mint"
    1.32              fi
    1.33              have_timers=yes
    1.34          fi
    1.35          # MiNT does not define "unix"
    1.36          BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
    1.37 -        BUILD_CFLAGS="$BUILD_CFLAGS -I$srcdir/src/video/ataricommon"
    1.38          ;;
    1.39      *-riscos)
    1.40          ARCH=riscos
    1.41 @@ -2345,12 +2346,19 @@
    1.42      fi
    1.43      SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c"
    1.44  fi
    1.45 +if test x$SDLMAIN_SOURCES = x; then
    1.46 +    SDLMAIN_SOURCES="$srcdir/src/main/dummy/*.c"
    1.47 +fi
    1.48  
    1.49  OBJECTS=`echo $SOURCES | sed 's,[[^ ]]*/\([[^ ]]*\)\.asm,$(objects)/\1.lo,g'`
    1.50  OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.cc,$(objects)/\1.lo,g'`
    1.51  OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.m,$(objects)/\1.lo,g'`
    1.52  OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
    1.53  
    1.54 +SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES | sed 's,[[^ ]]*/\([[^ ]]*\)\.cc,$(objects)/\1.o,g'`
    1.55 +SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.m,$(objects)/\1.o,g'`
    1.56 +SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
    1.57 +
    1.58  # Set runtime shared library paths as needed
    1.59  
    1.60  if test "x$enable_rpath" = "xyes"; then
    1.61 @@ -2434,6 +2442,8 @@
    1.62  AC_SUBST(INCLUDE)
    1.63  AC_SUBST(SOURCES)
    1.64  AC_SUBST(OBJECTS)
    1.65 +AC_SUBST(SDLMAIN_SOURCES)
    1.66 +AC_SUBST(SDLMAIN_OBJECTS)
    1.67  AC_SUBST(BUILD_CFLAGS)
    1.68  AC_SUBST(BUILD_LDFLAGS)
    1.69