ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/configure.ac
(Generate patch)

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.63 by asvitkine, 2009-02-11T19:22:16Z vs.
Revision 1.64 by asvitkine, 2009-03-03T08:07:22Z

# Line 56 | Line 56 | dnl SDL options.
56   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
57   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
58   AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
59 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
60 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
61  
62   dnl Checks for programs.
63   AC_PROG_CC
# Line 128 | Line 130 | dnl Checks for libraries.
130   AC_CHECK_LIB(posix4, sem_init)
131   AC_CHECK_LIB(m, cos)
132  
133 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
134 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
135 + dnl therefore main is undefined with #undef.
136 + dnl Framework can be in an custom location.
137 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
138 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
139 +  AC_CACHE_CHECK([whether compiler supports framework $1],
140 +    ac_Framework, [
141 +    saved_LIBS="$LIBS"
142 +    LIBS="$LIBS -framework $1"
143 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
144 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
145 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
146 +      fi
147 +    fi
148 +    saved_CPPFLAGS="$CPPFLAGS"
149 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
150 +    AC_TRY_LINK(
151 +      [$2
152 + #undef main], [],
153 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
154 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
155 +    )
156 +  ])
157 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
158 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
159 +  )
160 +  AS_VAR_POPDEF([ac_Framework])
161 + ])
162 +
163   dnl Do we need SDL?
164   WANT_SDL=no
165   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 142 | Line 174 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
174    SDL_SUPPORT="$SDL_SUPPORT audio"
175   fi
176   if [[ "x$WANT_SDL" = "xyes" ]]; then
177 <  AC_PATH_PROG(sdl_config, "sdl-config")
178 <  if [[ -n "$sdl_config" ]]; then
179 <    sdl_cflags=`$sdl_config --cflags`
180 <    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
181 <      sdl_libs=`$sdl_config --static-libs`
177 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
178 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
179 >  else
180 >    ac_cv_framework_SDL=no
181 >  fi
182 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
183 >    AC_PATH_PROG(sdl_config, "sdl-config")
184 >    if [[ -n "$sdl_config" ]]; then
185 >      sdl_cflags=`$sdl_config --cflags`
186 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
187 >        sdl_libs=`$sdl_config --static-libs`
188 >      else
189 >        sdl_libs=`$sdl_config --libs`
190 >      fi
191 >      CFLAGS="$CFLAGS $sdl_cflags"
192 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
193 >      LIBS="$LIBS $sdl_libs"
194      else
195 <      sdl_libs=`$sdl_config --libs`
195 >      WANT_SDL=no
196 >      WANT_SDL_VIDEO=no
197 >      WANT_SDL_AUDIO=no
198      fi
153    CFLAGS="$CFLAGS $sdl_cflags"
154    CXXFLAGS="$CXXFLAGS $sdl_cflags"
155    LIBS="$LIBS $sdl_libs"
156  else
157    WANT_SDL=no
158    WANT_SDL_VIDEO=no
159    WANT_SDL_AUDIO=no
199    fi
200    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
201   else
# Line 565 | Line 604 | darwin*)
604    fi
605    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
606      EXTFSSRC=../MacOSX/extfs_macosx.cpp
607 <    if [[ "x$ac_cv_framework_AppKit" = "xyes" ]]; then
607 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$no_x" = "xyes" ]]; then
608        PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
609        CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
610      fi
611    fi
612 <  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
612 >  if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
613      AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
614    fi
615    ;;
# Line 614 | Line 653 | AC_SUBST(SLIRP_SRCS)
653   dnl SDL overrides
654   if [[ "x$WANT_SDL" = "xyes" ]]; then
655    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
656 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
657 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
658 +  fi
659   fi
660   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
661    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines