--- a/Makefile	Sun Apr 14 13:27:26 2013 -0700
+++ b/Makefile	Sun Feb 23 21:23:50 2014 -0800
@@ -2,6 +2,8 @@
 # Makefile for IpePresenter
 # --------------------------------------------------------------------
 
+CXX=g++
+
 QT_CFLAGS = -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/usr/include/qt4
 QT_LIBS = -lQtGui -lQtCore
 CPPFLAGS += $(QT_CFLAGS)
@@ -31,10 +33,10 @@
 	$(UIC) $< > $@
 
 mainwindow.o: mainwindow.cpp ui_mainwindow.h
-	g++ $< -c $(CPPFLAGS)
+	$(CXX) $< -c $(CPPFLAGS)
 
 ipepresenter: $(OBJECTS)
-	g++ $+ -o $@ $(LIBS)
+	$(CXX) $+ -o $@ $(LIBS)
 
 install: ipepresenter
 	install -m 755 ipepresenter $(DESTDIR)

--- a/mainwindow.cpp	Sun Apr 14 13:27:26 2013 -0700
+++ b/mainwindow.cpp	Sun Feb 23 21:23:50 2014 -0800
@@ -32,6 +32,7 @@
 #include "mainwindow.h"
 #include "canvasview.h"
 #include "ipetool.h"
+#include <clocale>
 
 using namespace ipe;
 //using namespace ipeqt;