osx fixes

data/darwin/build-dmg.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 rm -f Mitsuba.app/*.log
-dmgcanvas tools/darwin/Mitsuba.dmgCanvas Mitsuba\ $1.dmg -v "Mitsuba $1" -leopard-compatible yes
+dmgcanvas data/darwin/Mitsuba.dmgCanvas Mitsuba\ $1.dmg -v "Mitsuba $1" -leopard-compatible yes
 #echo $1 > /tmp/version
 #scp /tmp/version ChangeLog wazlaf@mitsuba-renderer.org:/home/httpd/mitsuba-renderer.org/htdocs
 #scp Mitsuba\ $1.dmg wazlaf@mitsuba-renderer.org:/home/httpd/mitsuba-renderer.org/htdocs/releases

src/libcore/util.cpp

@@ -299,7 +299,7 @@ void restoreFPExceptions(bool oldState) {
 #if !defined(MTS_SSE)
 #warning SSE must be enabled to handle FP exceptions on OSX
 #else
-	currentState = query_fpexcept_sse() != 0
+	currentState = query_fpexcept_sse() != 0;
 #endif
 #else
 	currentState = fegetexcept() & (FE_INVALID|FE_DIVBYZERO|FE_OVERFLOW);

src/qtgui/aboutdlg.cpp

@@ -66,7 +66,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
 	ui->label->setText(ui->label->text().replace("CONFIG_FLAGS", configFlags));
 
 #if defined(__OSX__)
-	ui->label1->setText(ui->label->text().replace("font-size:10pt", "font-size:14pt"));
+	ui->label->setText(ui->label->text().replace("font-size:10pt", "font-size:14pt"));
 #endif
 }
 

src/qtgui/aboutdlg.ui

@@ -22,7 +22,7 @@
     <enum>QLayout::SetMinimumSize</enum>
    </property>
    <item row="0" column="0">
-    <widget class="QLabel" name="label1">
+    <widget class="QLabel" name="logoLabel">
      <property name="minimumSize">
       <size>
        <width>80</width>