MacOS X tweaks

libsdl-org · Sep 7, 2001 · db3635a · db3635a
1 parent b2bb755
commit db3635a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -58,6 +58,17 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity
 dnl checks the results of sdl-config to some extent
 dnl
       rm -f conf.sdltest
+      case "$target" in
+          *-*-darwin*)
+            cp -r `$SDL_CONFIG --nib` .
+            dnl create an Info.plist file, unless one exists
+            if test -f Info.plist ; then
+             :
+            else
+             cp `$SDL_CONFIG --plist` .
+            fi
+              ;;
+      esac
       AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
@@ -140,6 +151,11 @@ int main (int argc, char *argv[])
           AC_TRY_LINK([
 #include <stdio.h>
 #include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
 ],      [ return 0; ],
         [ echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"
@@ -164,6 +180,12 @@ int main (int argc, char *argv[])
   fi
   AC_SUBST(SDL_CFLAGS)
   AC_SUBST(SDL_LIBS)
+      case "$target" in
+          *-*-darwin*)
+              SDL_APPLE_CREATOR="????"
+              AC_SUBST(SDL_APPLE_CREATOR)
+              ;;
+      esac
   rm -f conf.sdltest
 ])
 # Configure paths for SMPEG

diff --git a/configure.in b/configure.in
@@ -70,6 +70,9 @@ case "$target" in
             fi
         fi
         ;;
+    *-*-darwin*)
+        AC_DEFINE(MACOSX)
+        ;;
 esac
 
 dnl Check for SDL
@@ -138,6 +141,7 @@ if test x$enable_music_midi = xyes; then
                 ;;
             *-*-darwin*)
                 use_music_native_midi=yes
+                LIBS="$LIBS -framework QuickTime"
                 ;;
         esac
         if test x$use_music_native_midi = xyes; then

diff --git a/native_midi/native_midi_mac.c b/native_midi/native_midi_mac.c
@@ -20,12 +20,16 @@
     max@quendi.de
 */
 
-#if defined(macintosh) || defined(__APPLE__)
+#if defined(macintosh) || defined(MACOSX)
 
 #include "native_midi.h"
 #include "native_midi_common.h"
 
+#ifdef MACOSX
+#include <QuickTime/QuickTimeMusic.h>
+#else
 #include <QuickTimeMusic.h>
+#endif
 
 #include <assert.h>
 #include <stdlib.h>