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

diff --git a/src/main.C b/src/main.C
index b6366d73e6..dc5c978237 100644
--- a/src/main.C
+++ b/src/main.C
@@ -11,29 +11,39 @@
 
 #include <config.h>
 
+#include "debug.h"
 #include "lyx_main.h"
 #include "gettext.h"
+
 #include "support/os.h"
 
+#include <boost/filesystem/path.hpp>
+
 #ifdef HAVE_IOS
 #include <ios>
 #endif
 
 
-namespace os = lyx::support::os;
-
+namespace fs = boost::filesystem;
 
 int main(int argc, char * argv[])
 {
 #ifdef HAVE_IOS
 	std::ios_base::sync_with_stdio(false);
 #endif
+	fs::path::default_name_check(fs::no_check);
 
-	os::init(&argc, &argv);
+	// 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();
+	lyx::locale_init();
+
+	lyx::LyX the_lyx_instance;
 
-	LyX::exec(argc, argv);
-	return 0;
+	return the_lyx_instance.exec(argc, argv);
 }