--- a/QTfrontend/M3InstallController.m Mon Oct 12 19:41:17 2009 +0000
+++ b/QTfrontend/M3InstallController.m Mon Oct 12 21:29:28 2009 +0000
@@ -46,7 +46,7 @@
alternateButton:NSLocalizedString(@"Don't Install", @"Don't Install")
otherButton:nil
informativeTextWithFormat:body] retain];
- [alert setShowsSuppressionButton:YES];
+ //[alert setShowsSuppressionButton:YES];
}
return self;
}
--- a/QTfrontend/pages.cpp Mon Oct 12 19:41:17 2009 +0000
+++ b/QTfrontend/pages.cpp Mon Oct 12 21:29:28 2009 +0000
@@ -417,16 +417,16 @@
GBAreslayout->addWidget(CBResolution);
GBAlayout->addLayout(GBAreslayout);
- CBFullscreen = new QCheckBox(AGGroupBox);
- CBFullscreen->setText(QCheckBox::tr("Fullscreen"));
- GBAlayout->addWidget(CBFullscreen);
-
QHBoxLayout * GBAfpslayout = new QHBoxLayout(0);
QLabel * maxfps = new QLabel(AGGroupBox);
maxfps->setText(QLabel::tr("FPS limit"));
GBAfpslayout->addWidget(maxfps);
GBAlayout->addLayout(GBAfpslayout);
+ CBFullscreen = new QCheckBox(AGGroupBox);
+ CBFullscreen->setText(QCheckBox::tr("Fullscreen"));
+ GBAlayout->addWidget(CBFullscreen);
+
CBReduceQuality = new QCheckBox(AGGroupBox);
CBReduceQuality->setText(QCheckBox::tr("Reduced quality"));
GBAlayout->addWidget(CBReduceQuality);
--- a/cmake_modules/FindOggVorbis.cmake Mon Oct 12 19:41:17 2009 +0000
+++ b/cmake_modules/FindOggVorbis.cmake Mon Oct 12 21:29:28 2009 +0000
@@ -19,9 +19,13 @@
include (CheckLibraryExists)
find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
# [koda] (for Hedgewars) added libraries with capital names for compatibility with Mac frameworks
+if(APPLE)
+set(CMAKE_FIND_FRAMEWORK "FIRST")
+endif(APPLE)
find_library(OGG_LIBRARY NAMES ogg Ogg)
find_library(VORBIS_LIBRARY NAMES vorbis Vorbis)
find_library(VORBISFILE_LIBRARY NAMES vorbisfile Vorbis)
+
if (OGG_LIBRARY AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)
set(OGGVORBIS_FOUND TRUE)
# [sommer] (for SuperTux) reversed order of libraries, so that cmake 2.4.5 for Windows generates an MSYS Makefile that will link correctly
@@ -37,7 +41,7 @@
set (OGGVORBIS_VERSION 1)
endif (HAVE_LIBVORBISENC2)
else ()
- set (OGGVORBIS_VERSION)
+ set(OGGVORBIS_VERSION)
set(OGGVORBIS_FOUND FALSE)
endif ()
if (OGGVORBIS_FOUND)
--- a/openalbridge/errlib.c Mon Oct 12 19:41:17 2009 +0000
+++ b/openalbridge/errlib.c Mon Oct 12 21:29:28 2009 +0000
@@ -34,7 +34,7 @@
syslog (level, buf);
else {
fflush (stdout);
- fputs (buf, stderr);
+ fprintf (stderr, buf);
fflush (stderr);
}
--- a/openalbridge/openalbridge.c Mon Oct 12 19:41:17 2009 +0000
+++ b/openalbridge/openalbridge.c Mon Oct 12 21:29:28 2009 +0000
@@ -87,7 +87,7 @@
return AL_FALSE;
}
- if (usehardware = AL_TRUE)
+ if (usehardware == AL_TRUE)
device = alcOpenDevice(NULL);
else
device = alcOpenDevice("Generic Software");