configure.in
changeset 754 623b453a3219
parent 753 b14fdadd8311
child 758 619fc21d154e
     1.1 --- a/configure.in	Wed Dec 10 12:35:56 2003 +0000
     1.2 +++ b/configure.in	Sun Dec 14 06:25:53 2003 +0000
     1.3 @@ -505,7 +505,7 @@
     1.4                    NASMFLAGS="-f aoutb"
     1.5                    ;;
     1.6                *)
     1.7 -                  NASMFLAGS="-f elf -D __NOU__"
     1.8 +                  NASMFLAGS="-f elf"
     1.9                    ;;
    1.10              esac
    1.11              AC_SUBST(NASMFLAGS)
    1.12 @@ -1331,9 +1331,6 @@
    1.13      if test x$use_pthreads = xyes -o x$use_clone = xyes; then
    1.14          # Basic thread creation functions
    1.15          COPY_ARCH_SRC(src/thread, linux, SDL_systhread.c)
    1.16 -        if test x$use_clone = xyes; then
    1.17 -            COPY_ARCH_SRC(src/thread, linux, clone.S)
    1.18 -        fi
    1.19          COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h)
    1.20  
    1.21          # Semaphores
    1.22 @@ -1757,11 +1754,8 @@
    1.23          CheckPTHREAD
    1.24          # Set up files for the main() stub
    1.25          if test "x$video_qtopia" = "xyes"; then
    1.26 -          COPY_ARCH_SRC(src/main, linux, SDL_Qtopia_main.cc)
    1.27            SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
    1.28            SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.29 -        else
    1.30 -          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.31          fi
    1.32          # Set up files for the audio library
    1.33          # We use the OSS and ALSA API's, not the Sun audio API
    1.34 @@ -1833,8 +1827,6 @@
    1.35          CheckAAlib
    1.36          CheckOpenGL
    1.37          CheckPTHREAD
    1.38 -        # Set up files for the main() stub
    1.39 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.40          # Set up files for the audio library
    1.41          # We use the OSS and ALSA API's, not the Sun audio API
    1.42          #if test x$enable_audio = xyes; then
    1.43 @@ -1880,8 +1872,6 @@
    1.44          CheckOpenGL
    1.45          CheckPTHREAD
    1.46          CheckUSBHID
    1.47 -        # Set up files for the main() stub
    1.48 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.49          # Set up files for the audio library
    1.50          # We use the OSS and ALSA API's, not the Sun audio API
    1.51          #if test x$enable_audio = xyes; then
    1.52 @@ -1918,8 +1908,6 @@
    1.53          CheckOpenGL
    1.54          CheckPTHREAD
    1.55          CheckUSBHID
    1.56 -        # Set up files for the main() stub
    1.57 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.58          # Set up files for the audio library
    1.59          if test x$enable_audio = xyes; then
    1.60              CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.61 @@ -1960,8 +1948,6 @@
    1.62          CheckOpenGL
    1.63          CheckPTHREAD
    1.64          CheckUSBHID
    1.65 -        # Set up files for the main() stub
    1.66 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.67          # Set up files for the audio library
    1.68          if test x$enable_audio = xyes; then
    1.69              CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
    1.70 @@ -2002,8 +1988,6 @@
    1.71          CheckAAlib
    1.72          CheckOpenGL
    1.73          CheckPTHREAD
    1.74 -        # Set up files for the main() stub
    1.75 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.76          # Set up files for the audio library
    1.77          if test x$enable_audio = xyes; then
    1.78              CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.79 @@ -2045,8 +2029,6 @@
    1.80          CheckAAlib
    1.81          CheckOpenGL
    1.82          CheckPTHREAD
    1.83 -        # Set up files for the main() stub
    1.84 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.85          # Set up files for the audio library
    1.86          if test x$enable_audio = xyes; then
    1.87              CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.88 @@ -2085,8 +2067,6 @@
    1.89          CheckAAlib
    1.90          CheckOpenGL
    1.91          CheckPTHREAD
    1.92 -        # Set up files for the main() stub
    1.93 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
    1.94          # We use the dmedia audio API, not the Sun audio API
    1.95          #if test x$enable_audio = xyes; then
    1.96          #    CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
    1.97 @@ -2137,8 +2117,6 @@
    1.98          CheckAAlib
    1.99          CheckOpenGL
   1.100          CheckPTHREAD
   1.101 -        # Set up files for the main() stub
   1.102 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.103          # Set up files for the audio library
   1.104          if test x$enable_audio = xyes; then
   1.105              CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
   1.106 @@ -2178,8 +2156,6 @@
   1.107          CheckAAlib
   1.108          CheckOpenGL
   1.109          CheckPTHREAD
   1.110 -        # Set up files for the main() stub
   1.111 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.112          # Set up files for the audio library
   1.113          if test x$enable_audio = xyes; then
   1.114              AUDIO_SUBDIRS="$AUDIO_SUBDIRS paudio"
   1.115 @@ -2217,8 +2193,6 @@
   1.116          CheckOpenGL
   1.117          CheckPTHREAD
   1.118          SDL_LIBS="$SDL_LIBS -lrt"
   1.119 -        # Set up files for the main() stub
   1.120 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.121          # Set up files for the audio library
   1.122          if test x$enable_audio = xyes; then
   1.123              CFLAGS="$CFLAGS -I/usr/include/mme -DMMEAUDIO_SUPPORT"
   1.124 @@ -2257,8 +2231,6 @@
   1.125          CheckX11
   1.126          CheckOpenGL
   1.127          CheckPTHREAD
   1.128 -        # Set up files for the main() stub
   1.129 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.130          # Set up files for the audio library
   1.131          if test x$enable_audio = xyes; then
   1.132              CFLAGS="$CFLAGS -DQNXNTOAUDIO_SUPPORT"
   1.133 @@ -2302,8 +2274,6 @@
   1.134          CheckWIN32
   1.135          CheckDIRECTX
   1.136          CheckNASM
   1.137 -        # Set up files for the main() stub
   1.138 -        COPY_ARCH_SRC(src/main, win32, SDL_main.c)
   1.139          # Set up files for the audio library
   1.140          if test x$enable_audio = xyes; then
   1.141              AUDIO_SUBDIRS="$AUDIO_SUBDIRS windib"
   1.142 @@ -2360,10 +2330,6 @@
   1.143          CheckNASM
   1.144          CheckBWINDOW
   1.145          CheckBeGL
   1.146 -        # Set up files for the main() stub
   1.147 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.148 -        COPY_ARCH_SRC(src/main, beos, SDL_BeApp.cc)
   1.149 -        COPY_ARCH_SRC(src/main, beos, SDL_BeApp.h)
   1.150          # Set up files for the audio library
   1.151          if test x$enable_audio = xyes; then
   1.152              AUDIO_SUBDIRS="$AUDIO_SUBDIRS baudio"
   1.153 @@ -2406,8 +2372,6 @@
   1.154          CheckDiskAudio
   1.155          CheckTOOLBOX
   1.156          CheckMacGL
   1.157 -        # Set up files for the main() stub
   1.158 -        COPY_ARCH_SRC(src/main, macos, SDL_main.c)
   1.159          # Set up files for the audio library
   1.160          if test x$enable_audio = xyes; then
   1.161              AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom"
   1.162 @@ -2452,9 +2416,6 @@
   1.163          CheckQUARTZ
   1.164          CheckMacGL
   1.165          CheckPTHREAD
   1.166 -        # Set up files for the main() stub
   1.167 -        COPY_ARCH_SRC(src/main, macosx, SDLMain.m)
   1.168 -        COPY_ARCH_SRC(src/main, macosx, SDLMain.h)
   1.169          # Set up files for the audio library
   1.170          if test x$enable_audio = xyes; then
   1.171              AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom"
   1.172 @@ -2498,8 +2459,6 @@
   1.173          CheckAtariAudio
   1.174          CheckAtariLdg
   1.175          CheckPTH
   1.176 -        # Set up files for the main() stub
   1.177 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.178          # Set up files for the audio library
   1.179          if test x$enable_threads = xyes -a x$enable_pth = xyes; then
   1.180              if test x$enable_audio = xyes; then
   1.181 @@ -2528,8 +2487,6 @@
   1.182                  COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
   1.183              else
   1.184                  COPY_ARCH_SRC(src/timer, mint, SDL_systimer.c)
   1.185 -                COPY_ARCH_SRC(src/timer, mint, SDL_vbltimer.S)
   1.186 -                COPY_ARCH_SRC(src/timer, mint, SDL_vbltimer_s.h)
   1.187              fi
   1.188          fi
   1.189          # MiNT does not define "unix"
   1.190 @@ -2540,7 +2497,6 @@
   1.191          JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS riscos"
   1.192          JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS riscos/libjoystick_riscos.la"
   1.193          COPY_ARCH_SRC(src/timer, riscos, SDL_systimer.c)
   1.194 -        COPY_ARCH_SRC(src/main, linux, SDL_main.c)
   1.195          VIDEO_SUBDIRS="$VIDEO_SUBDIRS riscos"
   1.196          VIDEO_DRIVERS="$VIDEO_DRIVERS riscos/libvideo_riscos.la"
   1.197          AUDIO_SUBDIRS="$AUDIO_SUBDIRS riscos"
   1.198 @@ -2648,7 +2604,6 @@
   1.199  CFLAGS="$CFLAGS -I\$(top_srcdir)/include"
   1.200  CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL"
   1.201  CFLAGS="$CFLAGS -I\$(top_srcdir)/src -I\$(top_srcdir)/src/$ARCH"
   1.202 -CFLAGS="$CFLAGS -I\$(top_srcdir)/src/main"
   1.203  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio"
   1.204  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video"
   1.205  CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/XFree86/extensions"