Skip to content

Switched LuaJIT to source build on Windows #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Causeless merged 1 commit into from
May 28, 2026
Merged

Switched LuaJIT to source build on Windows #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions RTEA.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions RTEA.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions external/sources/LuaJIT-2.1/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ src/*.lib
buildvm_arch.h

_Bin/libluajit*
_Bin/luajit-*


#cmake
Expand Down
Binary file removed external/sources/LuaJIT-2.1/_Bin/luajit-debug-release.lib
View file
Open in desktop
Binary file not shown.
Binary file removed external/sources/LuaJIT-2.1/_Bin/luajit-debug.lib
View file
Open in desktop
Binary file not shown.
Binary file removed external/sources/LuaJIT-2.1/_Bin/luajit-release.lib
View file
Open in desktop
Binary file not shown.
25 changes: 8 additions & 17 deletions external/sources/LuaJIT-2.1/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion external/sources/LuaJIT-2.1/meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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')
1 change: 1 addition & 0 deletions external/sources/LuaJIT-2.1/msvc-postbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions external/sources/LuaJIT-2.1/msvc-prebuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading