Skip to content

Commit 28325e3

Browse files
q4aq4a
committed
fix windows build after update LuaJIT
1 parent 21daea1 commit 28325e3

File tree

10 files changed

+501
-4
lines changed

10 files changed

+501
-4
lines changed

‎Externals/LuaJIT-proj/BuildVm.vcxproj

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>15.0</VCProjectVersion>
23+
<ProjectGuid>{58AE014E-0DA3-4D9B-9034-21984C305447}</ProjectGuid>
24+
<RootNamespace>BuildVm</RootNamespace>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<ImportGroup Label="PropertySheets">
28+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
29+
<Import Project="$(SolutionDir)Common.props" />
30+
</ImportGroup>
31+
<PropertyGroup Label="Configuration">
32+
<ConfigurationType>Application</ConfigurationType>
33+
<PlatformToolset>v141</PlatformToolset>
34+
<CharacterSet>Unicode</CharacterSet>
35+
<OutDir>$(ProjectDir)..\LuaJIT\bin\$(PlatformShortName)\</OutDir>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
38+
<WholeProgramOptimization>true</WholeProgramOptimization>
39+
</PropertyGroup>
40+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
41+
<ImportGroup Label="ExtensionSettings">
42+
</ImportGroup>
43+
<ImportGroup Label="Shared">
44+
</ImportGroup>
45+
<PropertyGroup Label="UserMacros" />
46+
<ItemDefinitionGroup>
47+
<ClCompile>
48+
<AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
49+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
50+
</ClCompile>
51+
<PostBuildEvent>
52+
<Command>$(OutDir)$(TargetName) -m peobj -o lj_vm_$(PlatformShortName).obj
53+
$(OutDir)$(TargetName) -m bcdef -o ..\LuaJIT\src\lj_bcdef.h ..\LuaJIT\src\lib_base.c ..\LuaJIT\src\lib_math.c ..\LuaJIT\src\lib_bit.c ..\LuaJIT\src\lib_string.c ..\LuaJIT\src\lib_table.c ..\LuaJIT\src\lib_io.c ..\LuaJIT\src\lib_os.c ..\LuaJIT\src\lib_package.c ..\LuaJIT\src\lib_debug.c ..\LuaJIT\src\lib_jit.c ..\LuaJIT\src\lib_ffi.c
54+
$(OutDir)$(TargetName) -m ffdef -o ..\LuaJIT\src\lj_ffdef.h ..\LuaJIT\src\lib_base.c ..\LuaJIT\src\lib_math.c ..\LuaJIT\src\lib_bit.c ..\LuaJIT\src\lib_string.c ..\LuaJIT\src\lib_table.c ..\LuaJIT\src\lib_io.c ..\LuaJIT\src\lib_os.c ..\LuaJIT\src\lib_package.c ..\LuaJIT\src\lib_debug.c ..\LuaJIT\src\lib_jit.c ..\LuaJIT\src\lib_ffi.c
55+
$(OutDir)$(TargetName) -m libdef -o ..\LuaJIT\src\lj_libdef.h ..\LuaJIT\src\lib_base.c ..\LuaJIT\src\lib_math.c ..\LuaJIT\src\lib_bit.c ..\LuaJIT\src\lib_string.c ..\LuaJIT\src\lib_table.c ..\LuaJIT\src\lib_io.c ..\LuaJIT\src\lib_os.c ..\LuaJIT\src\lib_package.c ..\LuaJIT\src\lib_debug.c ..\LuaJIT\src\lib_jit.c ..\LuaJIT\src\lib_ffi.c
56+
$(OutDir)$(TargetName) -m recdef -o ..\LuaJIT\src\lj_recdef.h ..\LuaJIT\src\lib_base.c ..\LuaJIT\src\lib_math.c ..\LuaJIT\src\lib_bit.c ..\LuaJIT\src\lib_string.c ..\LuaJIT\src\lib_table.c ..\LuaJIT\src\lib_io.c ..\LuaJIT\src\lib_os.c ..\LuaJIT\src\lib_package.c ..\LuaJIT\src\lib_debug.c ..\LuaJIT\src\lib_jit.c ..\LuaJIT\src\lib_ffi.c
57+
$(OutDir)$(TargetName) -m vmdef -o ..\LuaJIT\src\jit\vmdef.lua ..\LuaJIT\src\lib_base.c ..\LuaJIT\src\lib_math.c ..\LuaJIT\src\lib_bit.c ..\LuaJIT\src\lib_string.c ..\LuaJIT\src\lib_table.c ..\LuaJIT\src\lib_io.c ..\LuaJIT\src\lib_os.c ..\LuaJIT\src\lib_package.c ..\LuaJIT\src\lib_debug.c ..\LuaJIT\src\lib_jit.c ..\LuaJIT\src\lib_ffi.c
58+
$(OutDir)$(TargetName) -m folddef -o ..\LuaJIT\src\lj_folddef.h ..\LuaJIT\src\lj_opt_fold.c
59+
</Command>
60+
</PostBuildEvent>
61+
<Link>
62+
<SubSystem>Console</SubSystem>
63+
</Link>
64+
</ItemDefinitionGroup>
65+
<ItemGroup>
66+
<ClCompile Include="..\LuaJIT\src\host\buildvm.c" />
67+
<ClCompile Include="..\LuaJIT\src\host\buildvm_asm.c" />
68+
<ClCompile Include="..\LuaJIT\src\host\buildvm_fold.c" />
69+
<ClCompile Include="..\LuaJIT\src\host\buildvm_lib.c" />
70+
<ClCompile Include="..\LuaJIT\src\host\buildvm_peobj.c" />
71+
</ItemGroup>
72+
<ItemGroup>
73+
<ClInclude Include="..\LuaJIT\src\host\buildvm.h" />
74+
</ItemGroup>
75+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
76+
<ImportGroup Label="ExtensionTargets">
77+
</ImportGroup>
78+
</Project>

‎Externals/LuaJIT-proj/BuildVm.vcxproj.filters

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ClCompile Include="..\LuaJIT\src\host\buildvm.c" />
5+
<ClCompile Include="..\LuaJIT\src\host\buildvm_peobj.c" />
6+
<ClCompile Include="..\LuaJIT\src\host\buildvm_asm.c" />
7+
<ClCompile Include="..\LuaJIT\src\host\buildvm_fold.c" />
8+
<ClCompile Include="..\LuaJIT\src\host\buildvm_lib.c" />
9+
</ItemGroup>
10+
<ItemGroup>
11+
<ClInclude Include="..\LuaJIT\src\host\buildvm.h" />
12+
</ItemGroup>
13+
</Project>

‎Externals/LuaJIT-proj/LuaJIT.vcxproj

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Mixed|Win32">
13+
<Configuration>Mixed</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Mixed|x64">
17+
<Configuration>Mixed</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Release|Win32">
21+
<Configuration>Release</Configuration>
22+
<Platform>Win32</Platform>
23+
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
28+
</ItemGroup>
29+
<PropertyGroup Label="Globals">
30+
<ProjectGuid>{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}</ProjectGuid>
31+
</PropertyGroup>
32+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
33+
<PropertyGroup Label="Configuration">
34+
<ConfigurationType>DynamicLibrary</ConfigurationType>
35+
<PlatformToolset>v141</PlatformToolset>
36+
<CharacterSet>MultiByte</CharacterSet>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
39+
<WholeProgramOptimization>true</WholeProgramOptimization>
40+
</PropertyGroup>
41+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
42+
<ImportGroup Label="ExtensionSettings">
43+
</ImportGroup>
44+
<ImportGroup Label="PropertySheets">
45+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
46+
<Import Project="$(SolutionDir)Common.props" />
47+
</ImportGroup>
48+
<ItemDefinitionGroup>
49+
<Link>
50+
<AdditionalDependencies>lj_vm_$(PlatformShortName).obj;%(AdditionalDependencies)</AdditionalDependencies>
51+
</Link>
52+
<ClCompile>
53+
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
54+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
55+
</ClCompile>
56+
</ItemDefinitionGroup>
57+
<ItemGroup>
58+
<ClCompile Include="..\LuaJIT\src\lib_aux.c" />
59+
<ClCompile Include="..\LuaJIT\src\lib_base.c" />
60+
<ClCompile Include="..\LuaJIT\src\lib_bit.c" />
61+
<ClCompile Include="..\LuaJIT\src\lib_debug.c" />
62+
<ClCompile Include="..\LuaJIT\src\lib_ffi.c" />
63+
<ClCompile Include="..\LuaJIT\src\lib_init.c" />
64+
<ClCompile Include="..\LuaJIT\src\lib_io.c" />
65+
<ClCompile Include="..\LuaJIT\src\lib_jit.c" />
66+
<ClCompile Include="..\LuaJIT\src\lib_math.c" />
67+
<ClCompile Include="..\LuaJIT\src\lib_os.c" />
68+
<ClCompile Include="..\LuaJIT\src\lib_package.c" />
69+
<ClCompile Include="..\LuaJIT\src\lib_string.c" />
70+
<ClCompile Include="..\LuaJIT\src\lib_table.c" />
71+
<ClCompile Include="..\LuaJIT\src\lj_alloc.c" />
72+
<ClCompile Include="..\LuaJIT\src\lj_api.c" />
73+
<ClCompile Include="..\LuaJIT\src\lj_asm.c" />
74+
<ClCompile Include="..\LuaJIT\src\lj_bc.c" />
75+
<ClCompile Include="..\LuaJIT\src\lj_bcread.c" />
76+
<ClCompile Include="..\LuaJIT\src\lj_bcwrite.c" />
77+
<ClCompile Include="..\LuaJIT\src\lj_carith.c" />
78+
<ClCompile Include="..\LuaJIT\src\lj_ccall.c" />
79+
<ClCompile Include="..\LuaJIT\src\lj_ccallback.c" />
80+
<ClCompile Include="..\LuaJIT\src\lj_cconv.c" />
81+
<ClCompile Include="..\LuaJIT\src\lj_cdata.c" />
82+
<ClCompile Include="..\LuaJIT\src\lj_char.c" />
83+
<ClCompile Include="..\LuaJIT\src\lj_clib.c" />
84+
<ClCompile Include="..\LuaJIT\src\lj_cparse.c" />
85+
<ClCompile Include="..\LuaJIT\src\lj_crecord.c" />
86+
<ClCompile Include="..\LuaJIT\src\lj_ctype.c" />
87+
<ClCompile Include="..\LuaJIT\src\lj_debug.c" />
88+
<ClCompile Include="..\LuaJIT\src\lj_dispatch.c" />
89+
<ClCompile Include="..\LuaJIT\src\lj_err.c" />
90+
<ClCompile Include="..\LuaJIT\src\lj_ffrecord.c" />
91+
<ClCompile Include="..\LuaJIT\src\lj_func.c" />
92+
<ClCompile Include="..\LuaJIT\src\lj_gc.c" />
93+
<ClCompile Include="..\LuaJIT\src\lj_gdbjit.c" />
94+
<ClCompile Include="..\LuaJIT\src\lj_ir.c" />
95+
<ClCompile Include="..\LuaJIT\src\lj_lex.c" />
96+
<ClCompile Include="..\LuaJIT\src\lj_lib.c" />
97+
<ClCompile Include="..\LuaJIT\src\lj_load.c" />
98+
<ClCompile Include="..\LuaJIT\src\lj_mcode.c" />
99+
<ClCompile Include="..\LuaJIT\src\lj_meta.c" />
100+
<ClCompile Include="..\LuaJIT\src\lj_obj.c" />
101+
<ClCompile Include="..\LuaJIT\src\lj_opt_dce.c" />
102+
<ClCompile Include="..\LuaJIT\src\lj_opt_fold.c" />
103+
<ClCompile Include="..\LuaJIT\src\lj_opt_loop.c" />
104+
<ClCompile Include="..\LuaJIT\src\lj_opt_mem.c" />
105+
<ClCompile Include="..\LuaJIT\src\lj_opt_narrow.c" />
106+
<ClCompile Include="..\LuaJIT\src\lj_opt_sink.c" />
107+
<ClCompile Include="..\LuaJIT\src\lj_opt_split.c" />
108+
<ClCompile Include="..\LuaJIT\src\lj_parse.c" />
109+
<ClCompile Include="..\LuaJIT\src\lj_record.c" />
110+
<ClCompile Include="..\LuaJIT\src\lj_snap.c" />
111+
<ClCompile Include="..\LuaJIT\src\lj_state.c" />
112+
<ClCompile Include="..\LuaJIT\src\lj_str.c" />
113+
<ClCompile Include="..\LuaJIT\src\lj_strscan.c" />
114+
<ClCompile Include="..\LuaJIT\src\lj_tab.c" />
115+
<ClCompile Include="..\LuaJIT\src\lj_trace.c" />
116+
<ClCompile Include="..\LuaJIT\src\lj_udata.c" />
117+
<ClCompile Include="..\LuaJIT\src\lj_vmevent.c" />
118+
<ClCompile Include="..\LuaJIT\src\lj_vmmath.c" />
119+
</ItemGroup>
120+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
121+
<ImportGroup Label="ExtensionTargets">
122+
</ImportGroup>
123+
</Project>

0 commit comments

Comments
 (0)