A better fix for bug 675:

[lyx.git] / src / main.C

diff --git a/src/main.C b/src/main.C
index eb3bc8581db0b98f77f5bdab64a5b05c9eaea266..dc5c978237bf584456fe4ba75547a970dd4b462b 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -1,45 +1,49 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 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 FORMS_H_LOCATION
+
+#include "debug.h"
 #include "lyx_main.h"
 #include "gettext.h"
-#include "LString.h"
-#include "support/filetools.h"
-
-// I keep these here so that it will be processed as early in
-// the compilation process as possible.
-#if !defined(FL_REVISION) || (FL_REVISION != 88 && FL_REVISION != 89) \
-                         || FL_VERSION != 0
-#error LyX will not compile with this version of XForms.\
-       Please get version 0.89.\
-       If you want to try to compile anyway, delete this test in src/main.C.
+
+#include "support/os.h"
+
+#include <boost/filesystem/path.hpp>
+
+#ifdef HAVE_IOS
+#include <ios>
 #endif
 
 
-int main(int argc, char *argv[]) {
-       // 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;
-       
-       // initialize for internationalized version *EK*
-       locale_init();
-       gettext_init();
+namespace fs = boost::filesystem;
 
-#ifdef __EMX__
-       _wildcard(&argc, &argv);
+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);
+
+       // 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*
+       lyx::locale_init();
+
+       lyx::LyX the_lyx_instance;
 
-       LyX lyx(&argc, argv);
-       return 0; // ok
+       return the_lyx_instance.exec(argc, argv);
 }