X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_win32.cpp;h=a6e5da7c5ad060b40f5b0c6b32ba4d99f4367d67;hb=c0000cc405063044fb4eca3f04ab35f69fe3dd74;hp=0928259b72dd47fa9de466d4ca2ccec86450bc0d;hpb=1b1f8dd235ba8e168348cd23c824063f2595a0c5;p=lyx.git

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 0928259b72..a6e5da7c5a 100644
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -60,11 +60,13 @@
 #include <stdio.h>
 #endif
 
-
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#else
 extern "C" {
 extern void __wgetmainargs(int * argc, wchar_t *** argv, wchar_t *** envp,
 			   int expand_wildcards, int * new_mode);
 }
+#endif
 
 using namespace std;
 
@@ -157,9 +159,13 @@ void init(int argc, char * argv[])
 
 
 	// Get the wide program arguments array
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+	argv_ = CommandLineToArgvW(GetCommandLineW(), &argc_);
+#else
 	wchar_t ** envp = 0;
 	int newmode = 0;
 	__wgetmainargs(&argc_, &argv_, &envp, -1, &newmode);
+#endif
 	LATTEST(argc == argc_);
 
 	// If Cygwin is detected, query the cygdrive prefix.
@@ -544,19 +550,34 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode,
 {
 	string const texinputs = os::latex_path_list(
 			replaceCurdirPath(path, lyxrc.texinputs_prefix));
+	string const otherinputs = os::latex_path_list(path);
 	string const sep = windows_style_tex_paths_ ? ";" : ":";
-	string const oldval = getEnv("TEXINPUTS");
-	string const newval = "." + sep + texinputs + sep + oldval;
-	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
-		setEnv("TEXINPUTS", newval);
+	string const oldtexinputs = getEnv("TEXINPUTS");
+	string const newtexinputs = "." + sep + texinputs + sep + oldtexinputs;
+	string const oldbibinputs = getEnv("BIBINPUTS");
+	string const newbibinputs = "." + sep + otherinputs + sep + oldbibinputs;
+	string const oldbstinputs = getEnv("BSTINPUTS");
+	string const newbstinputs = "." + sep + otherinputs + sep + oldbstinputs;
+	string const oldtexfonts = getEnv("TEXFONTS");
+	string const newtexfonts = "." + sep + otherinputs + sep + oldtexfonts;
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+		setEnv("TEXINPUTS", newtexinputs);
+		setEnv("BIBINPUTS", newbibinputs);
+		setEnv("BSTINPUTS", newbstinputs);
+		setEnv("TEXFONTS", newtexfonts);
+	}
 
 	// reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
 	char const * action = (mode == VIEW) ? "open" : "edit";
-	bool success = reinterpret_cast<int>(ShellExecute(NULL, action,
+	bool success = reinterpret_cast<intptr_t>(ShellExecute(NULL, action,
 		to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32;
 
-	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
-		setEnv("TEXINPUTS", oldval);
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+		setEnv("TEXINPUTS", oldtexinputs);
+		setEnv("BIBINPUTS", oldbibinputs);
+		setEnv("BSTINPUTS", oldbstinputs);
+		setEnv("TEXFONTS", oldtexfonts);
+	}
 	return success;
 }