comment line 210 in Overlay_macx.mm; use SDK10.6 because otherwise it…

… complains that it can not find lcrt1.10.6.so
zhenkai · Jun 4, 2011 · 4591a85 · 4591a85
1 parent 3965c45
commit 4591a85
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/compiler.pri b/compiler.pri
@@ -123,7 +123,7 @@ macx {
 	QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/lib
 
 	XCODE_PATH=$$system(xcode-select -print-path)
-	QMAKE_MAC_SDK = $${XCODE_PATH}/SDKs/MacOSX10.5.sdk
+	QMAKE_MAC_SDK = $${XCODE_PATH}/SDKs/MacOSX10.6.sdk
 
 	QMAKE_CC = $${XCODE_PATH}/usr/bin/gcc-4.2
 	QMAKE_CXX = $${XCODE_PATH}/usr/bin/g++-4.2

diff --git a/src/mumble/Overlay_macx.mm b/src/mumble/Overlay_macx.mm
@@ -207,7 +207,7 @@ - (void)eventDidFail:(const AppleEvent *)event withError:(NSError *)error {
 		for (int i = 0; i < [reps count]; i++) {
 			NSImageRep *rep = [reps objectAtIndex:i];
 			if ([rep class] == [NSBitmapImageRep class]) {
-				cgimg = [(NSBitmapImageRep *)rep CGImage];
+				//cgimg = [(NSBitmapImageRep *)rep CGImage];
 			}
 		}
 

diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
@@ -11,7 +11,7 @@ SOURCES *= smallft.cpp
 DIST		*= ../../icons/mumble.ico licenses.h smallft.h ../../icons/mumble.xpm murmur_pch.h mumble.plist
 RESOURCES	*= mumble.qrc mumble_flags.qrc
 FORMS	*= ConfigDialog.ui MainWindow.ui ConnectDialog.ui ConnectDialogEdit.ui BanEditor.ui ACLEditor.ui Plugins.ui Overlay.ui OverlayEditor.ui LookConfig.ui AudioInput.ui AudioOutput.ui Log.ui TextMessage.ui AudioStats.ui NetworkConfig.ui LCD.ui GlobalShortcut.ui GlobalShortcutTarget.ui Cert.ui UserEdit.ui AudioWizard.ui Tokens.ui RichTextEditor.ui RichTextEditorLink.ui UserInformation.ui VoiceRecorderDialog.ui
-TRANSLATIONS	= mumble_en.ts mumble_es.ts mumble_de.ts mumble_fr.ts mumble_pl.ts mumble_ru.ts mumble_cs.ts mumble_it.ts mumble_ja.ts mumble_pt_BR.ts mumble_zh_CN.ts mumble_zh_TW.ts mumble_da.ts mumble_he.ts mumble_sv.ts
+#TRANSLATIONS	= mumble_en.ts mumble_es.ts mumble_de.ts mumble_fr.ts mumble_pl.ts mumble_ru.ts mumble_cs.ts mumble_it.ts mumble_ja.ts mumble_pt_BR.ts mumble_zh_CN.ts mumble_zh_TW.ts mumble_da.ts mumble_he.ts mumble_sv.ts
 PRECOMPILED_HEADER = mumble_pch.hpp
 INCLUDEPATH *= ../bonjour