X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmain.C;h=dc5c978237bf584456fe4ba75547a970dd4b462b;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=22e56f1708721ad49aed69b2222e170398a31a57;hpb=21f8cd3385b7ac7e031b910f0379d499eb49342c;p=lyx.git

diff --git a/src/main.C b/src/main.C
index 22e56f1708..dc5c978237 100644
--- a/src/main.C
+++ b/src/main.C
@@ -1,47 +1,49 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+/**
+ * \file main.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
-#include <iostream>
 
+#include "debug.h"
 #include "lyx_main.h"
 #include "gettext.h"
-#include "LString.h"
-#include "support/filetools.h"
-#include "frontends/GUIRunTime.h"
 
-using std::cerr;
-using std::endl;
+#include "support/os.h"
+
+#include <boost/filesystem/path.hpp>
+
+#ifdef HAVE_IOS
+#include <ios>
+#endif
+
 
-GUIRunTime guiruntime;
+namespace fs = boost::filesystem;
 
 int main(int argc, char * argv[])
 {
-	int val = guiruntime.initApplication(argc, argv);
-	if (val)
-		return val;
-
-	// lyx_localedir is used by gettext_init() is we have
-	//   i18n support built-in
-	string lyx_localedir = GetEnvPath("LYX_LOCALEDIR");
-	if (lyx_localedir.empty())
-		lyx_localedir = LOCALEDIR;
-	
+#ifdef HAVE_IOS
+	std::ios_base::sync_with_stdio(false);
+#endif
+	fs::path::default_name_check(fs::no_check);
+
+	// To avoid ordering of global object problems with some
+	// stdlibs we do the initialization here, but still as
+	// early as possible.
+	lyx::lyxerr.rdbuf(std::cerr.rdbuf());
+
+	lyx::support::os::init(argc, argv);
+
 	// initialize for internationalized version *EK*
-	locale_init();
-	gettext_init();
+	lyx::locale_init();
 
-#ifdef __EMX__
-	_wildcard(&argc, &argv);
-#endif
+	lyx::LyX the_lyx_instance;
 
-	LyX lyx(&argc, argv);
-	return 0; // SUCCESS
+	return the_lyx_instance.exec(argc, argv);
 }