puae 2.3.1

build_macos_cocoa.sh

@@ -8,7 +8,7 @@ base=" --with-sdl --with-sdl-gl --with-sdl-gfx --with-sdl-sound --enable-drvsnd
 cd32=" --enable-cd32 "
 a600=" --enable-gayle "
 scsi=" --enable-scsi-device --enable-ncr --enable-a2091 "
-other=" --with-caps --enable-amax "
+other=" --with-caps --enable-amax --enable-gccopt"
 #
 #
 ./bootstrap.sh

configure.in

@@ -1759,8 +1759,65 @@ have_3dnow=no
 
 dnl -- macos
 if [[ "x$OSDEP" = "xod-macosx" ]]; then
-have_mmx=no
+
+AC_MSG_CHECKING([host cpu MMX support])
+CPUFLAGS=`sysctl -a hw | grep hw.optional.mmx: | awk '{print $2}'`
+if test "$CPUFLAGS" = "1"; then
+have_mmx=yes
+AC_DEFINE(HAVE_MMX,1,[CPU supports MMX])
+fi
+AC_MSG_RESULT([$have_mmx])
+
+AC_MSG_CHECKING([host cpu SSSE3 support])
+CPUFLAGS=`sysctl -a hw | grep hw.optional.supplementalsse3: | awk '{print $2}'`
+if test "$CPUFLAGS" = "1"; then
+have_ssse3=yes
+AC_DEFINE(HAVE_SSSE3,1,[CPU supports SSSE3])
+fi
+AC_MSG_RESULT([$have_ssse3])
+
+AC_MSG_CHECKING([host cpu SSE4_2 support])
+CPUFLAGS=`sysctl -a hw | grep hw.optional.sse4_2: | awk '{print $2}'`
+if test "$CPUFLAGS" = "1"; then
+have_sse4_2=yes
+AC_DEFINE(HAVE_SSE4_2,1,[CPU supports SSE4_2])
+fi
+AC_MSG_RESULT([$have_sse4_2])
+
+AC_MSG_CHECKING([host cpu SSE4_1 support])
+CPUFLAGS=`sysctl -a hw | grep hw.optional.sse4_1: | awk '{print $2}'`
+if test "$CPUFLAGS" = "1"; then
+have_sse4_1=yes
+AC_DEFINE(HAVE_SSE4_1,1,[CPU supports SSE4_1])
 fi
+AC_MSG_RESULT([$have_sse4_1])
+
+AC_MSG_CHECKING([host cpu SSE3 support])
+CPUFLAGS=`sysctl -a hw | grep hw.optional.sse3: | awk '{print $2}'`
+if test "$CPUFLAGS" = "1"; then
+have_sse3=yes
+AC_DEFINE(HAVE_SSE3,1,[CPU supports SSE3])
+fi
+AC_MSG_RESULT([$have_sse3])
+
+AC_MSG_CHECKING([host cpu SSE2 support])
+CPUFLAGS=`sysctl -a hw | grep hw.optional.sse2: | awk '{print $2}'`
+if test "$CPUFLAGS" = "1"; then
+have_sse2=yes
+AC_DEFINE(HAVE_SSE2,1,[CPU supports SSE2])
+fi
+AC_MSG_RESULT([$have_sse2])
+
+AC_MSG_CHECKING([host cpu SSE support])
+CPUFLAGS=`sysctl -a hw | grep hw.optional.sse: | awk '{print $2}'`
+if test "$CPUFLAGS" = "1"; then
+have_sse=yes
+AC_DEFINE(HAVE_SSE,1,[CPU supports SSE])
+fi
+AC_MSG_RESULT([$have_sse])
+
+dnl -- macos
+else
 
 dnl -- linux
 CPUFLAGS=`cat /proc/cpuinfo | grep flags`
@@ -1806,6 +1863,9 @@ AC_DEFINE(HAVE_3DNOW,1,[CPU supports 3DNOW])
 fi
 AC_MSG_RESULT([$have_3dnow])
 
+dnl --
+fi
+
 dnl detect cpu
 AX_GCC_ARCHFLAG(no)
 

m4/ax_gcc_x86_cpuid.m4

 # ===========================================================================
-#            http://autoconf-archive.cryp.to/ax_gcc_x86_cpuid.html
+#     http://www.gnu.org/software/autoconf-archive/ax_gcc_x86_cpuid.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -24,14 +24,11 @@
 #
 #   This macro mainly exists to be used in AX_GCC_ARCHFLAG.
 #
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
+# LICENSE
 #
 #   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
 #   Copyright (c) 2008 Matteo Frigo
+#   Copyright (c) 2011 Mustafa TUFAN (apple def)
 #
 #   This program is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -55,9 +52,11 @@
 #   all other use of the material that constitutes the Autoconf Macro.
 #
 #   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
 
 AC_DEFUN([AX_GCC_X86_CPUID],
 [AC_REQUIRE([AC_PROG_CC])
@@ -66,8 +65,16 @@ AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1,
  [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
      int op = $1, eax, ebx, ecx, edx;
      FILE *f;
-      __asm__("cpuid"
+#ifdef __APPLE__
+      __asm__ ( "pushl %%ebx	\n\t"
+		"cpuid		\n\t"
+		"movl %%ebx, %1	\n\t"
+		"popl %%ebx	\n\t"
+        : "=a" (eax), "=r" (ebx), "=c" (ecx), "=d" (edx)
+#else
+      __asm__ ("cpuid"
         : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+#endif
         : "a" (op));
      f = fopen("conftest_cpuid", "w"); if (!f) return 1;
      fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);

src/gui-cocoa/cocoaui.m

@@ -1331,7 +1331,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
 	NSRect frame = NSMakeRect(100, 100, 200, 200);
 	NSUInteger styleMask;
 	NSRect rect = [NSWindow contentRectForFrameRect:frame styleMask:styleMask];
-	NSWindow * window = [[NSWindow alloc] initWithContentRect:rect styleMask:styleMask backing:NSBackingStoreBuffered defer:false];
+	NSWindow *window = [[NSWindow alloc] initWithContentRect:rect styleMask:styleMask backing:NSBackingStoreBuffered defer:false];
 	[window center];
 	[window makeKeyAndOrderFront: window];
 

src/sysconfig.h.in

@@ -122,9 +122,15 @@
 /* CPU supports SSE2 */
 #undef HAVE_SSE2
 
+/* CPU supports SSE3 */
+#undef HAVE_SSE3
+
 /* CPU supports SSE4_1 */
 #undef HAVE_SSE4_1
 
+/* CPU supports SSE4_2 */
+#undef HAVE_SSE4_2
+
 /* CPU supports SSSE3 */
 #undef HAVE_SSSE3