diff --git a/RTEA.sln b/RTEA.sln
index 5ef3299d0..6a7229b90 100644
--- a/RTEA.sln
+++ b/RTEA.sln
@@ -4,6 +4,8 @@ VisualStudioVersion = 17.7.34018.315
MinimumVisualStudioVersion = 16.0
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RTEA", "RTEA.vcxproj", "{A58C9DD7-8BC7-48DA-9E04-04D04F582BE3}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluajit", "external\sources\LuaJIT-2.1\libluajit.vcxproj", "{9C341649-AA1F-35E8-81E3-228A6A09B2BB}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Full|x64 = Debug Full|x64
@@ -23,6 +25,16 @@ Global
{A58C9DD7-8BC7-48DA-9E04-04D04F582BE3}.Final|x64.Build.0 = Final|x64
{A58C9DD7-8BC7-48DA-9E04-04D04F582BE3}.Profiling|x64.ActiveCfg = Profiling|x64
{A58C9DD7-8BC7-48DA-9E04-04D04F582BE3}.Profiling|x64.Build.0 = Profiling|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Debug Full|x64.ActiveCfg = Debug|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Debug Full|x64.Build.0 = Debug|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Debug Minimal|x64.ActiveCfg = RelWithDebInfo|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Debug Minimal|x64.Build.0 = RelWithDebInfo|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Debug Release|x64.ActiveCfg = RelWithDebInfo|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Debug Release|x64.Build.0 = RelWithDebInfo|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Final|x64.ActiveCfg = Release|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Final|x64.Build.0 = Release|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Profiling|x64.ActiveCfg = RelWithDebInfo|x64
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}.Profiling|x64.Build.0 = RelWithDebInfo|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/RTEA.vcxproj b/RTEA.vcxproj
index a7f062590..0610e3f5f 100644
--- a/RTEA.vcxproj
+++ b/RTEA.vcxproj
@@ -1486,6 +1486,11 @@
+
+
+ {9C341649-AA1F-35E8-81E3-228A6A09B2BB}
+
+
diff --git a/external/sources/LuaJIT-2.1/.gitignore b/external/sources/LuaJIT-2.1/.gitignore
index dc5c905f0..07df652e4 100644
--- a/external/sources/LuaJIT-2.1/.gitignore
+++ b/external/sources/LuaJIT-2.1/.gitignore
@@ -14,6 +14,7 @@ src/*.lib
buildvm_arch.h
_Bin/libluajit*
+_Bin/luajit-*
#cmake
diff --git a/external/sources/LuaJIT-2.1/_Bin/luajit-debug-release.lib b/external/sources/LuaJIT-2.1/_Bin/luajit-debug-release.lib
deleted file mode 100644
index fdd888d61..000000000
Binary files a/external/sources/LuaJIT-2.1/_Bin/luajit-debug-release.lib and /dev/null differ
diff --git a/external/sources/LuaJIT-2.1/_Bin/luajit-debug.lib b/external/sources/LuaJIT-2.1/_Bin/luajit-debug.lib
deleted file mode 100644
index 91f671f45..000000000
Binary files a/external/sources/LuaJIT-2.1/_Bin/luajit-debug.lib and /dev/null differ
diff --git a/external/sources/LuaJIT-2.1/_Bin/luajit-release.lib b/external/sources/LuaJIT-2.1/_Bin/luajit-release.lib
deleted file mode 100644
index 20babcd66..000000000
Binary files a/external/sources/LuaJIT-2.1/_Bin/luajit-release.lib and /dev/null differ
diff --git a/external/sources/LuaJIT-2.1/meson.build b/external/sources/LuaJIT-2.1/meson.build
index bbe92317d..80fa00014 100644
--- a/external/sources/LuaJIT-2.1/meson.build
+++ b/external/sources/LuaJIT-2.1/meson.build
@@ -20,23 +20,14 @@ dynasm = files('dynasm/dynasm.lua')
subdir('src')
-if not get_option('use_prebuilt_libraries') or host_machine.system() in ['linux', 'darwin']
- libluajit = library(lj_libname, ljlib_sources + ljcore_sources + buildvm_headers,
- include_directories: luajit_source_dir,
- c_args: lj_defines,
- name_prefix: lj_libprefix,
- dependencies: luajit_dependencies,
- build_by_default: false,
- install: true
- )
-else
- libluajit = []
- if get_option('debug')
- luajit_dependencies += cc.find_library('luajit-debug', dirs: meson.current_source_dir()/'_Bin')
- else
- luajit_dependencies += cc.find_library('luajit-release', dirs: meson.current_source_dir()/'_Bin')
- endif
-endif
+libluajit = library(lj_libname, ljlib_sources + ljcore_sources + buildvm_headers,
+ include_directories: luajit_source_dir,
+ c_args: lj_defines,
+ name_prefix: lj_libprefix,
+ dependencies: luajit_dependencies,
+ build_by_default: false,
+ install: true
+)
luajit_dep = declare_dependency(
dependencies : luajit_dependencies,
diff --git a/external/sources/LuaJIT-2.1/meson_options.txt b/external/sources/LuaJIT-2.1/meson_options.txt
index e8ffe71fd..424cceb89 100644
--- a/external/sources/LuaJIT-2.1/meson_options.txt
+++ b/external/sources/LuaJIT-2.1/meson_options.txt
@@ -1,3 +1,2 @@
option('portable', type : 'boolean', value : false, description: 'portable install in a single directory')
option('app', type : 'boolean', value : true, description: 'Build the luajit executable')
-option('use_prebuilt_libraries', type: 'boolean', value: true, yield: true, description: 'On windows use the prebuilt libraries')
diff --git a/external/sources/LuaJIT-2.1/msvc-postbuild.bat b/external/sources/LuaJIT-2.1/msvc-postbuild.bat
index 82ef315d2..57566605b 100644
--- a/external/sources/LuaJIT-2.1/msvc-postbuild.bat
+++ b/external/sources/LuaJIT-2.1/msvc-postbuild.bat
@@ -5,6 +5,7 @@
cd %~dp0\src\
@setlocal
+@set PATH=.;%PATH%
@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
@set LJLINK=link /nologo
@set LJMT=mt /nologo
diff --git a/external/sources/LuaJIT-2.1/msvc-prebuild.bat b/external/sources/LuaJIT-2.1/msvc-prebuild.bat
index 509a7c869..32b58ddb9 100644
--- a/external/sources/LuaJIT-2.1/msvc-prebuild.bat
+++ b/external/sources/LuaJIT-2.1/msvc-prebuild.bat
@@ -5,6 +5,7 @@
cd %~dp0\src\
@setlocal
+@set PATH=.;%PATH%
@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
@set LJLINK=link /nologo
@set LJMT=mt /nologo