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

diff --git a/src/main.C b/src/main.C
index 6ba9adc0c7..dc5c978237 100644
--- a/src/main.C
+++ b/src/main.C
@@ -1,29 +1,49 @@
 /**
  * \file main.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * 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 "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 fs = boost::filesystem;
 
 int main(int argc, char * argv[])
 {
-	std::ios::sync_with_stdio(false);
+#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());
 
-	os::init(&argc, &argv);
+	lyx::support::os::init(argc, argv);
 
 	// initialize for internationalized version *EK*
-	locale_init();
+	lyx::locale_init();
+
+	lyx::LyX the_lyx_instance;
 
-	LyX lyx(argc, argv);
-	return 0;
+	return the_lyx_instance.exec(argc, argv);
 }