Re: [AD] OSX x86 patch

["Miguel A. Gavidia" <juvinious@xxxxxxxxxx>]

On Sunday 09 April 2006 01:08, Elias Pschernig wrote:
> On Sat, 2006-04-08 at 18:51 +0200, Evert Glebbeek wrote:
> > > Yes, ALLEGRO_USE_C would be defined in asm.inl, as alias to
> > > ALLEGRO_NO_ASM. And the makefile define doesn't change at all.
> >
> > Ok. Go fot it!
>
> Ok, applied it to SVN. So, this means:
>
> If ALLEGRO_NO_ASM is defined, then no asm is used throughout Allegro's
> sources. ALLEGRO_USE_C does not exist anymore (since we don't know what
> it's purpose was in the first place) and should not be used (except,
> there's a makefile variable with that name, which simply will cause
> -DALLEGRO_NO_ASM being passed to the compiler.).
>
> The only consequence for the OSX x86 problems is, there should be one
> confusion less, since ALLEGRO_USE_C is gone.
>
> --
> Elias Pschernig
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by xPML, a groundbreaking scripting language
> that extends applications into web and mobile media. Attend the live
> webcast and join the prime developer group breaking into this new coding
> territory!
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642

And here's the updated patch for osx.

-- 
-juvinious

<a href="http://chasm.hopto.org";>The Chasm</a> - My Site.

Index: src/macosx/qtmidi.m
===================================================================
--- src/macosx/qtmidi.m	(revision 5772)
+++ src/macosx/qtmidi.m	(working copy)
@@ -125,8 +125,8 @@
       voice[i].vol = -1;
       voice[i].pan = -1;
       memset(&note_request, 0, sizeof(note_request));
-      note_request.info.polyphony = 8;
-      note_request.info.typicalPolyphony = 0x00010000;
+      note_request.info.polyphony.bigEndianValue = EndianU16_NtoB(8);
+	  note_request.info.typicalPolyphony.bigEndianValue = EndianS32_NtoB(X2Fix(1.0));
       result = NAStuffToneDescription(note_allocator, 1, &note_request.tone);
       result |= NANewNoteChannel(note_allocator, &note_request, &voice[i].channel);
       result |= NAResetNoteChannel(note_allocator, voice[i].channel);
Index: include/allegro/platform/alosxcfg.h
===================================================================
--- include/allegro/platform/alosxcfg.h	(revision 5772)
+++ include/allegro/platform/alosxcfg.h	(working copy)
@@ -53,8 +53,10 @@
    #define ALLEGRO_BIG_ENDIAN
 #endif
 
-#ifdef __i386__
-   #define ALLEGRO_I386
+/* Exclude ASM */
+
+#ifndef ALLEGRO_NO_ASM
+	#define ALLEGRO_NO_ASM
 #endif
 
 /* Arrange for other headers to be included later on */
Index: include/allegro/internal/alconfig.h
===================================================================
--- include/allegro/internal/alconfig.h	(revision 5772)
+++ include/allegro/internal/alconfig.h	(working copy)
@@ -111,14 +111,18 @@
       #define LONG_LONG       long long
    #endif
 
-   #ifdef __i386__
-      #define ALLEGRO_I386
-      #define _AL_SINCOS(x, s, c)  __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x))
+   #if defined __i386__
+	  #define ALLEGRO_I386
+	  #ifndef ALLEGRO_NO_ASM
+		 #define _AL_SINCOS(x, s, c)  __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x))
+	  #endif
    #endif
 
    #ifdef __amd64__
       #define ALLEGRO_AMD64
-      #define _AL_SINCOS(x, s, c)  __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x))
+	  #ifndef ALLEGRO_NO_ASM
+		#define _AL_SINCOS(x, s, c)  __asm__ ("fsincos" : "=t" (c), "=u" (s) : "0" (x))
+	  #endif
    #endif
    
    #ifdef __arm__