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

diff --git a/src/main.C b/src/main.C
index 6a4c7b89c8..dc5c978237 100644
--- a/src/main.C
+++ b/src/main.C
@@ -1,34 +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 "LString.h"
-#include "support/filetools.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[])
 {
-	os::init(&argc, &argv);
+#ifdef HAVE_IOS
+	std::ios_base::sync_with_stdio(false);
+#endif
+	fs::path::default_name_check(fs::no_check);
 
-	// 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;
+	// 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_localedir);
+	lyx::locale_init();
+
+	lyx::LyX the_lyx_instance;
 
-	LyX lyx(argc, argv);
-	return 0;
+	return the_lyx_instance.exec(argc, argv);
 }