Merge pull request #280 from Madreag/pr/luajit-windows-source-build

Switched LuaJIT to source build on Windows

Author: Causeless

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

RTEA.vcxproj

@@ -1486,6 +1486,11 @@
     <None Include="cpp.hint" />
     <None Include="Source\System\Semver200\version.inl" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="external\sources\LuaJIT-2.1\libluajit.vcxproj">
+      <Project>{9C341649-AA1F-35E8-81E3-228A6A09B2BB}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

external/sources/LuaJIT-2.1/.gitignore

@@ -14,6 +14,7 @@ src/*.lib
 buildvm_arch.h
 
 _Bin/libluajit*
+_Bin/luajit-*
 
 
 #cmake

external/sources/LuaJIT-2.1/_Bin/luajit-debug-release.lib

@@ -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,

external/sources/LuaJIT-2.1/_Bin/luajit-debug.lib

@@ -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')

external/sources/LuaJIT-2.1/_Bin/luajit-release.lib

@@ -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

external/sources/LuaJIT-2.1/meson.build

@@ -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