Fixed pathing for langfile on windows and windows build system

Author: tilkinsc

build.mingw.bat

@@ -80,6 +80,9 @@ setlocal
 		echo Remove %CWD%\lib\*.a
 		del %CWD%\lib\*.a
 		rmdir /S /Q %CWD%\bin
+		pushd %CWD%\luajit-2.0\src
+			%MAKE% clean LUAJIT_A=libmingw_luajit.dll.a
+		popd
 
 		echo Done.
 		exit /b 0
@@ -231,8 +234,7 @@ setlocal
 	REM --------------------------------------------------------------------
 
 
-	echo This shouldn't be reached!
-	goto failure
+	goto help
 
 
 	REM --------------------------------------------------------------------
@@ -243,11 +245,10 @@ setlocal
 		echo Locally building luajit %CWD%\luajit-2.0 ...
 
 		pushd %CWD%\luajit-2.0\src
-			IF EXIST "mingw_libluajit.dll" (
+			IF EXIST "mingw_libluajit.dll.a" (
 				echo libluajit.dll already cached.
 			) ELSE (
-				%MAKE% -j%NUMBER_OF_PROCESSORS%
-				move lua51.dll	mingw_libluajit.dll
+				%MAKE% -j%NUMBER_OF_PROCESSORS% TARGET_DLLNAME=libluajit.dll TARGET_DLLDOTANAME=libmingw_luajit.dll.a
 			)
 
 			echo Locally installing luajit %CWD% ...
@@ -256,7 +257,8 @@ setlocal
 			copy /Y lualib.h		%incdir%\lualib.h
 			copy /Y lauxlib.h		%incdir%\lauxlib.h
 			copy /Y luajit.h		%incdir%\luajit.h
-			copy /Y mingw_libluajit.dll	%dlldir%\libluajit.dll
+			copy /Y libluajit.dll	%dlldir%\libluajit.dll
+			copy /Y libmingw_luajit.dll.a ..\..\lib\libmingw_luajit.dll.a
 		popd
 
 		echo Finished locally building / installing luajit.
@@ -315,7 +317,7 @@ setlocal
 	setlocal
 		IF [%1] == [luajit] (
 			set luaverdef=-DLUA_JIT_51
-			set luaverout=-lluajit
+			set luaverout=-lmingw_luajit.dll
 		) ELSE (
 			set luaverout=-l%1
 		)

src/luadriver.c

@@ -77,10 +77,29 @@ static inline void check_error(int cond, const char* str) {
 	}
 }
 
+static inline size_t strip_filename(char* buffer, char delim)
+{
+	char* iter = buffer;
+	char* last_slash = 0;
+	while (*iter++ != 0)
+	{
+		if (*iter == delim)
+			last_slash = iter;
+	}
+	iter = last_slash;
+	while (*iter != 0)
+	{
+		*iter = 0;
+		iter++;
+	}
+	return strlen(buffer);
+}
+
 
 int main(int argc, char** argv) {
 
 	const char* language = 0;
+	char langbuf[260];
 	#if defined(_WIN32) || defined(_WIN64)
 		const char english[] = "lang/english.txt";
 		const char chinese[] = "lang/chinese.txt";
@@ -90,37 +109,40 @@ int main(int argc, char** argv) {
 
 		setlocale(LC_ALL, "");
 
+		DWORD length = GetModuleFileName(NULL, langbuf, 260);
+		length = strip_filename(langbuf, '\\');
 		switch(GetUserDefaultUILanguage() | 0xFF) { // first byte is lang id
 		case 0x09: // english
-			language = "lang/english.txt";
+			language = "/lang/english.txt";
 			break;
 		case 0x04: // chinese
-			language = "lang/chinese.txt";
+			language = "/lang/chinese.txt";
 			break;
 		case 0x11: // japanese
-			language = "lang/japanese.txt";
+			language = "/lang/japanese.txt";
 			break;
 		case 0x19: // russian
-			language = "lang/russian.txt";
+			language = "/lang/russian.txt";
 			break;
 		case 0x16: // portuguese
-			language = "lang/portuguese.txt";
+			language = "/lang/portuguese.txt";
 			break;
 		case 0x0A: // spanish
-			language = "lang/spanish.txt";
+			language = "/lang/spanish.txt";
 			break;
 		default: // needs translation >:(
-			language = "lang/english.txt";
+			language = "/lang/english.txt";
 			break;
 		}
+		strcat(langbuf, language);
 	#else
-		language = "lang/english.txt";
+		language = "/lang/english.txt";
 	#endif
 
-	language = "lang/english.txt";
+	language = "/lang/english.txt";
 
 	// load language file
-	lang = langfile_load(language);
+	lang = langfile_load(langbuf);
 	if(lang == 0) {
 		puts("Failed to load lang file!");
 		return EXIT_FAILURE;
@@ -280,7 +302,6 @@ int main(int argc, char** argv) {
 	}
 
 	#if defined(_WIN32) || defined(_WIN64)
-		printf("Loading %s\n", ARGS.luaver == 0 ? DEFAULT_LUA : luastr);
 		HMODULE luacxt;
 		luacxt = LoadLibrary(ARGS.luaver == 0 ? DEFAULT_LUA : luastr);
 		check_error(luacxt == 0, _("LC_DLL_MIA"));