Date: Wed, 1 Feb 2006 18:20:33 -0800 From: Eric Wing Subject: SDL/Universal Binary updates Hi Sam, Attached is a big set of changes to the Xcode projects to support Universal Binaries. I have also included .dmgs that include the prebuilt frameworks. Ryan, I also updated SMPEG which is also in the package. The SDL and smpeg binaries were built against the CVS version (pulled maybe a month ago?). I do not have an Intel Mac to test on so I have no idea if this stuff actually works. However, Christian Walther has been a big help in testing 10.2.8 and 10.3.9 so I'm fairly confident we got the build settings correct for at least PPC. I have attempted to document the important things for producing these Universal Binaries. Documentation is somewhat scattered through out everything, but there is a big centralized piece of documentation in the UniversalBinaryNotes.rtf in the SDL.dmg. As far as Universal Binaries are concerned, the big things were: - Build with gcc 3.3 on PPC, 4.0 on Intel. - We couldn't get any of the MMX/SSE code to compile/link (SDL and smpeg). - All 3rd party dependencies had to be rebuilt as Universal There were also a bunch of non-Universal things that have been updated: - I converted the SDL-satellites to create .dmg's instead of .pkg installers - Updated all 3rd party static libraries with current versions. (I think libpng was the most dramatic going from 1.0.? to 1.2.8 with API breakage. I haven't found any problems so far in doing this.) - Changed some compiler optimization settings - Finally updated the exports list for SDL_mixer - Tried to include a static smpeg in SDL_mixer (multiple build variants in Xcode project now) - Enabled Altivec in SDL (we forgot to add the flags to Xcode last time) - More documentation Since so many things have changed, there might be new problems introduced. The big issue I've found so far is with SDL_mixer. As I mentioned on the mailing list, MP3's produce an assertion failure. And the MikMod problem reported on Bugzilla continues to persist. There's probably a bunch of other stuff I'm forgetting. There really were hundreds of little things I mucked with so it's hard to remember them all. If you have any questions, feel free to ask. Thanks, Eric

/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2006 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

    Sam Lantinga
    slouken@libsdl.org
*/

/* Mutex functions using the Win32 API */

#include <stdio.h>
#include <stdlib.h>
#include <windows.h>

#include "SDL_error.h"
#include "SDL_mutex.h"


struct SDL_mutex {
	HANDLE id;
};

/* Create a mutex */
SDL_mutex *SDL_CreateMutex(void)
{
	SDL_mutex *mutex;

	/* Allocate mutex memory */
	mutex = (SDL_mutex *)malloc(sizeof(*mutex));
	if ( mutex ) {
		/* Create the mutex, with initial value signaled */
		mutex->id = CreateMutex(NULL, FALSE, NULL);
		if ( ! mutex->id ) {
			SDL_SetError("Couldn't create mutex");
			free(mutex);
			mutex = NULL;
		}
	} else {
		SDL_OutOfMemory();
	}
	return(mutex);
}

/* Free the mutex */
void SDL_DestroyMutex(SDL_mutex *mutex)
{
	if ( mutex ) {
		if ( mutex->id ) {
			CloseHandle(mutex->id);
			mutex->id = 0;
		}
		free(mutex);
	}
}

/* Lock the mutex */
int SDL_mutexP(SDL_mutex *mutex)
{
	if ( mutex == NULL ) {
		SDL_SetError("Passed a NULL mutex");
		return -1;
	}
	if ( WaitForSingleObject(mutex->id, INFINITE) == WAIT_FAILED ) {
		SDL_SetError("Couldn't wait on mutex");
		return -1;
	}
	return(0);
}

/* Unlock the mutex */
int SDL_mutexV(SDL_mutex *mutex)
{
	if ( mutex == NULL ) {
		SDL_SetError("Passed a NULL mutex");
		return -1;
	}
	if ( ReleaseMutex(mutex->id) == FALSE ) {
		SDL_SetError("Couldn't release mutex");
		return -1;
	}
	return(0);
}