[Scummvm-cvs-logs] scummvm master -> c4d9f7beebff75fc88a2da198f585963d0e3ea46

vinterstum oystein at geheb.com
Sat Jan 14 22:03:58 CET 2012


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3936e47711 OSX: Use static zlib library again
09ce3407b1 OSX: Avoid use of NSString:stringWithCString, for OS X 10.2 and 10.3 compatibility
c4d9f7beeb OSX: Fixed some file paths when copying docs to the bundle, and updated DS_Store


Commit: 3936e477116310f04cf39e43ffce930b06b64c29
    https://github.com/scummvm/scummvm/commit/3936e477116310f04cf39e43ffce930b06b64c29
Author: Oystein Eftevaag (oystein at geheb.com)
Date: 2012-01-14T08:04:51-08:00

Commit Message:
OSX: Use static zlib library again

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index 5f63d56..a2b0357 100644
--- a/ports.mk
+++ b/ports.mk
@@ -110,7 +110,7 @@ OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfaad.a
 endif
 
 ifdef USE_ZLIB
-OSX_ZLIB ?= -lz
+OSX_ZLIB ?= $(STATICLIBPATH)/lib/libz.a
 endif
 
 ifdef USE_SPARKLE


Commit: 09ce3407b12bc532fed47c80f1c9f883c86e9530
    https://github.com/scummvm/scummvm/commit/09ce3407b12bc532fed47c80f1c9f883c86e9530
Author: Oystein Eftevaag (oystein at geheb.com)
Date: 2012-01-14T08:04:58-08:00

Commit Message:
OSX: Avoid use of NSString:stringWithCString, for OS X 10.2 and 10.3 compatibility

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm



diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index bb089a6..97c7edb 100755
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -35,6 +35,11 @@
 - (void)setAppleMenu:(NSMenu *)menu;
 @end
 
+NSString *constructNSStringFromCString(const char* rawCString, NSStringEncoding stringEncoding) {
+        NSData *nsData = [NSData dataWithBytes:rawCString length:strlen(rawCString)];
+        return [[NSString alloc] initWithData:nsData encoding:stringEncoding];
+}
+
 void replaceApplicationMenuItems() {
 
 	// Code mainly copied and adapted from SDLmain.m
@@ -50,34 +55,47 @@ void replaceApplicationMenuItems() {
 	// Create new application menu
 	appleMenu = [[NSMenu alloc] initWithTitle:@""];
 
+	NSString *nsString = NULL;
+
 	// Get current encoding
 #ifdef USE_TRANSLATION
-	NSStringEncoding stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)[NSString stringWithCString:(TransMan.getCurrentCharset()).c_str() encoding:NSASCIIStringEncoding]));
+	nsString = constructNSStringFromCString((TransMan.getCurrentCharset()).c_str(), NSASCIIStringEncoding);
+	NSStringEncoding stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)nsString));
+	[nsString release];
 #else
 	NSStringEncoding stringEncoding = NSASCIIStringEncoding;
 #endif
-	
+
 	// Add "About ScummVM" menu item
-	[appleMenu addItemWithTitle:[NSString stringWithCString:_("About ScummVM") encoding:stringEncoding] action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
+	nsString = constructNSStringFromCString(_("About ScummVM"), stringEncoding);
+	[appleMenu addItemWithTitle:nsString action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
+	[nsString release];
 
 	// Add separator
 	[appleMenu addItem:[NSMenuItem separatorItem]];
 
 	// Add "Hide ScummVM" menu item
-	[appleMenu addItemWithTitle:[NSString stringWithCString:_("Hide ScummVM") encoding:stringEncoding] action:@selector(hide:) keyEquivalent:@"h"];
+	nsString = constructNSStringFromCString(_("Hide ScummVM"), stringEncoding);
+	[appleMenu addItemWithTitle:nsString action:@selector(hide:) keyEquivalent:@"h"];
+	[nsString release];
 
 	// Add "Hide Others" menu item
-	menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:[NSString stringWithCString:_("Hide Others") encoding:stringEncoding] action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
+	nsString = constructNSStringFromCString(_("Hide Others"), stringEncoding);
+	menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:nsString action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
 	[menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
 
 	// Add "Show All" menu item
-	[appleMenu addItemWithTitle:[NSString stringWithCString:_("Show All") encoding:stringEncoding] action:@selector(unhideAllApplications:) keyEquivalent:@""];
+	nsString = constructNSStringFromCString(_("Show All"), stringEncoding);
+	[appleMenu addItemWithTitle:nsString action:@selector(unhideAllApplications:) keyEquivalent:@""];
+	[nsString release];
 
 	// Add separator
 	[appleMenu addItem:[NSMenuItem separatorItem]];
 
 	// Add "Quit ScummVM" menu item
-	[appleMenu addItemWithTitle:[NSString stringWithCString:_("Quit ScummVM") encoding:stringEncoding] action:@selector(terminate:) keyEquivalent:@"q"];
+	nsString = constructNSStringFromCString(_("Quit ScummVM"), stringEncoding);
+	[appleMenu addItemWithTitle:nsString action:@selector(terminate:) keyEquivalent:@"q"];
+	[nsString release];
 
 	// Put application menu into the menubar
 	menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
@@ -89,16 +107,22 @@ void replaceApplicationMenuItems() {
 
 
 	// Create new "Window" menu
-	windowMenu = [[NSMenu alloc] initWithTitle:[NSString stringWithCString:_("Window") encoding:stringEncoding]];
+	nsString = constructNSStringFromCString(_("Window"), stringEncoding);
+	windowMenu = [[NSMenu alloc] initWithTitle:nsString];
+	[nsString release];
 
 	// Add "Minimize" menu item
-	menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithCString:_("Minimize") encoding:stringEncoding] action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+	nsString = constructNSStringFromCString(_("Minimize"), stringEncoding);
+	menuItem = [[NSMenuItem alloc] initWithTitle:nsString action:@selector(performMiniaturize:) keyEquivalent:@"m"];
 	[windowMenu addItem:menuItem];
+	[nsString release];
 
 	// Put menu into the menubar
-	menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithCString:_("Window") encoding:stringEncoding] action:nil keyEquivalent:@""];
+	nsString = constructNSStringFromCString(_("Window"), stringEncoding);
+	menuItem = [[NSMenuItem alloc] initWithTitle:nsString action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:windowMenu];
 	[[NSApp mainMenu] addItem:menuItem];
+	[nsString release];
 
 	// Tell the application object that this is now the window menu.
 	[NSApp setWindowsMenu:windowMenu];


Commit: c4d9f7beebff75fc88a2da198f585963d0e3ea46
    https://github.com/scummvm/scummvm/commit/c4d9f7beebff75fc88a2da198f585963d0e3ea46
Author: Oystein Eftevaag (oystein at geheb.com)
Date: 2012-01-14T08:05:05-08:00

Commit Message:
OSX: Fixed some file paths when copying docs to the bundle, and updated DS_Store

Changed paths:
    dists/macosx/DS_Store
    ports.mk



diff --git a/dists/macosx/DS_Store b/dists/macosx/DS_Store
index 2d4193a..7ad5a19 100644
Binary files a/dists/macosx/DS_Store and b/dists/macosx/DS_Store differ
diff --git a/ports.mk b/ports.mk
index a2b0357..82239f4 100644
--- a/ports.mk
+++ b/ports.mk
@@ -165,10 +165,10 @@ osxsnap: bundle
 	mkdir ScummVM-snapshot/doc/it
 	cp $(srcdir)/doc/it/GuidaRapida ./ScummVM-snapshot/doc/it/GuidaRapida
 	mkdir ScummVM-snapshot/doc/no-nb
-	cp $(srcdir)doc/no-nb/HurtigStart ./ScummVM-snapshot/doc/no-nb/HurtigStart
+	cp $(srcdir)/doc/no-nb/HurtigStart ./ScummVM-snapshot/doc/no-nb/HurtigStart
 	mkdir ScummVM-snapshot/doc/se
-	cp $(srcdir)doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig
-	cp $(srcdir)doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart
+	cp $(srcdir)/doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig
+	cp $(srcdir)/doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart
 	/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/cz/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/de/*






More information about the Scummvm-git-logs mailing list