diff --git a/source/tools/fontbuilder/FontBuilder.vcproj b/source/tools/fontbuilder/FontBuilder.vcproj
index 16d528ae62..24424e95e0 100755
--- a/source/tools/fontbuilder/FontBuilder.vcproj
+++ b/source/tools/fontbuilder/FontBuilder.vcproj
@@ -192,9 +192,33 @@
 			<Filter
 				Name="platform"
 				Filter="">
-				<File
-					RelativePath=".\platform\msw\fontselect.cpp">
-				</File>
+				<Filter
+					Name="msw"
+					Filter="">
+					<File
+						RelativePath=".\platform\msw\fontselect.cpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="linux"
+					Filter="">
+					<File
+						RelativePath=".\platform\linux\fontselect.cpp">
+						<FileConfiguration
+							Name="Debug|Win32"
+							ExcludedFromBuild="TRUE">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/source/tools/fontbuilder/fontbuilder.icproj b/source/tools/fontbuilder/fontbuilder.icproj
index cbc2c0dfdc..2e63b8eeff 100755
--- a/source/tools/fontbuilder/fontbuilder.icproj
+++ b/source/tools/fontbuilder/fontbuilder.icproj
@@ -114,6 +114,13 @@
 			<FileConfiguration 
 				Name="Release|Win32"/>
 		</File>
+		<File 
+			RelativePath=".\platform\linux\fontselect.cpp">
+			<FileConfiguration 
+				Name="Debug|Win32"/>
+			<FileConfiguration 
+				Name="Release|Win32"/>
+		</File>
 		<File 
 			RelativePath=".\filemanip.h">
 			<FileConfiguration 
diff --git a/source/tools/fontbuilder/platform/fontselect.h b/source/tools/fontbuilder/platform/fontselect.h
index c51bde2299..aa8d3476c6 100755
--- a/source/tools/fontbuilder/platform/fontselect.h
+++ b/source/tools/fontbuilder/platform/fontselect.h
@@ -1,23 +1,29 @@
-// $Id: fontselect.h,v 1.1 2004/06/17 19:32:04 philip Exp $
+// $Id: fontselect.h,v 1.2 2004/06/18 22:05:58 philip Exp $
 
 class FontSelectorDialog : public wxDialog
 {
 public:
 	FontSelectorDialog(wxWindow* parent);
+#ifdef _WIN32
 	~FontSelectorDialog();
+#endif
 
 	wxString FontName;
 	wxString FontFilename;
 
+#ifdef _WIN32
 	void OnFontSelect(wxCommandEvent& event);
 	void OnOK(wxCommandEvent& event);
+#endif
 
 	static void DefaultFonts(wxString& Name0, wxString& Filename0, wxString& Name1, wxString& Filename1);
 
 private:
 
+#ifdef _WIN32
 	wxArrayString FontNames;
 	wxCharBuffer** FontFilenames;
+#endif
 
 	DECLARE_EVENT_TABLE()
 };
diff --git a/source/tools/fontbuilder/platform/linux/fontselect.cpp b/source/tools/fontbuilder/platform/linux/fontselect.cpp
new file mode 100755
index 0000000000..185aaa9b1f
--- /dev/null
+++ b/source/tools/fontbuilder/platform/linux/fontselect.cpp
@@ -0,0 +1,29 @@
+// $Id: fontselect.cpp,v 1.1 2004/06/18 22:05:58 philip Exp $
+
+#include "stdafx.h"
+
+#include "../fontselect.h"
+
+FontSelectorDialog::FontSelectorDialog(wxWindow* parent)
+: wxDialog(parent, -1, wxString(wxT("Font selector")), wxDefaultPosition, wxSize(400, 200), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+{
+	wxFileDialog Dlg (this, wxT("Select a font file"), wxEmptyString, wxEmptyString, wxT("TTF files (*.ttf)|*.ttf|All files (*.*)|*.*"), wxOPEN | wxHIDE_READONLY)
+	if (Dlg.ShowModal() == wxID_OK)
+	{
+		FontName = Dlg.GetFilename();
+		FontFilename = Dlg.GetPath();
+		EndModal(wxID_OK);
+	}
+	else
+	{
+		EndModal(wxID_CANCEL);
+	}
+}
+
+void FontSelectorDialog::DefaultFonts(wxString& Name0, wxString& Filename0, wxString& Name1, wxString& Filename1)
+{
+	Name0 = wxT("Please select");
+	Filename0 = wxT("");
+	Name1 = wxT("Please select");
+	Filename1 = wxT("");
+}
diff --git a/source/tools/fontbuilder/stdafx.h b/source/tools/fontbuilder/stdafx.h
index a23297d757..97d93fdd17 100755
--- a/source/tools/fontbuilder/stdafx.h
+++ b/source/tools/fontbuilder/stdafx.h
@@ -1,4 +1,4 @@
-// $Id: stdafx.h,v 1.1 2004/06/17 19:32:04 philip Exp $
+// $Id: stdafx.h,v 1.2 2004/06/18 22:05:58 philip Exp $
 
 // Precompiled headers
 
@@ -7,11 +7,11 @@
 
 // Disable some complaints in wx headers
 #pragma warning (push)
-#pragma warning (disable: 4267 4311 1125)
+#pragma warning (disable: 4267 4311)
 
 #ifdef __INTEL_COMPILER
 // Disable some of the excessively pedantic icl /W4 warnings (remarks)
-#pragma warning (disable: 193 373 444 981 383 1418)
+#pragma warning (disable: 193 373 444 981 383 1125 1418)
 #endif
 
 // Include relevant wx headers
diff --git a/source/tools/fontbuilder/wxapp.cpp b/source/tools/fontbuilder/wxapp.cpp
index b62937095b..12ae19360a 100755
--- a/source/tools/fontbuilder/wxapp.cpp
+++ b/source/tools/fontbuilder/wxapp.cpp
@@ -1,4 +1,4 @@
-// $Id: wxapp.cpp,v 1.1 2004/06/17 19:32:04 philip Exp $
+// $Id: wxapp.cpp,v 1.2 2004/06/18 22:05:58 philip Exp $
 
 #include "stdafx.h"
 
@@ -19,7 +19,7 @@ bool FontBuilderApp::OnInit()
 {
 	ConfigInit();
 
-	MainFrame *frame = new MainFrame(wxString::Format(wxT("Font Builder %s"), version), wxDefaultPosition, wxSize(640,480));
+	MainFrame *frame = new MainFrame(wxString::Format(wxT("Font Builder %s"), (const wchar_t*)version), wxDefaultPosition, wxSize(640,480));
 	frame->SetIcon(wxIcon(wxT("IDI_ICON1")));
 	frame->Show(true);
 	SetTopWindow(frame);