-
-
Notifications
You must be signed in to change notification settings - Fork 457
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix windows build after update LuaJIT
- Loading branch information
Showing
10 changed files
with
501 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<ItemGroup Label="ProjectConfigurations"> | ||
<ProjectConfiguration Include="Debug|Win32"> | ||
<Configuration>Debug</Configuration> | ||
<Platform>Win32</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Release|Win32"> | ||
<Configuration>Release</Configuration> | ||
<Platform>Win32</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Debug|x64"> | ||
<Configuration>Debug</Configuration> | ||
<Platform>x64</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Release|x64"> | ||
<Configuration>Release</Configuration> | ||
<Platform>x64</Platform> | ||
</ProjectConfiguration> | ||
</ItemGroup> | ||
<PropertyGroup Label="Globals"> | ||
<VCProjectVersion>15.0</VCProjectVersion> | ||
<ProjectGuid>{58AE014E-0DA3-4D9B-9034-21984C305447}</ProjectGuid> | ||
<RootNamespace>BuildVm</RootNamespace> | ||
</PropertyGroup> | ||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
<ImportGroup Label="PropertySheets"> | ||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
<Import Project="$(SolutionDir)Common.props" /> | ||
</ImportGroup> | ||
<PropertyGroup Label="Configuration"> | ||
<ConfigurationType>Application</ConfigurationType> | ||
<PlatformToolset>v141</PlatformToolset> | ||
<CharacterSet>Unicode</CharacterSet> | ||
<OutDir>$(ProjectDir)..\LuaJIT\bin\$(PlatformShortName)\</OutDir> | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration"> | ||
<WholeProgramOptimization>true</WholeProgramOptimization> | ||
</PropertyGroup> | ||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
<ImportGroup Label="ExtensionSettings"> | ||
</ImportGroup> | ||
<ImportGroup Label="Shared"> | ||
</ImportGroup> | ||
<PropertyGroup Label="UserMacros" /> | ||
<ItemDefinitionGroup> | ||
<ClCompile> | ||
<AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
<PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
</ClCompile> | ||
<PostBuildEvent> | ||
<Command>$(OutDir)$(TargetName) -m peobj -o lj_vm_$(PlatformShortName).obj | ||
$(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 | ||
$(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 | ||
$(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 | ||
$(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 | ||
$(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 | ||
$(OutDir)$(TargetName) -m folddef -o ..\LuaJIT\src\lj_folddef.h ..\LuaJIT\src\lj_opt_fold.c | ||
</Command> | ||
</PostBuildEvent> | ||
<Link> | ||
<SubSystem>Console</SubSystem> | ||
</Link> | ||
</ItemDefinitionGroup> | ||
<ItemGroup> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_asm.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_fold.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_lib.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_peobj.c" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<ClInclude Include="..\LuaJIT\src\host\buildvm.h" /> | ||
</ItemGroup> | ||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
<ImportGroup Label="ExtensionTargets"> | ||
</ImportGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<ItemGroup> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_peobj.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_asm.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_fold.c" /> | ||
<ClCompile Include="..\LuaJIT\src\host\buildvm_lib.c" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<ClInclude Include="..\LuaJIT\src\host\buildvm.h" /> | ||
</ItemGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,123 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<ItemGroup Label="ProjectConfigurations"> | ||
<ProjectConfiguration Include="Debug|Win32"> | ||
<Configuration>Debug</Configuration> | ||
<Platform>Win32</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Debug|x64"> | ||
<Configuration>Debug</Configuration> | ||
<Platform>x64</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Mixed|Win32"> | ||
<Configuration>Mixed</Configuration> | ||
<Platform>Win32</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Mixed|x64"> | ||
<Configuration>Mixed</Configuration> | ||
<Platform>x64</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Release|Win32"> | ||
<Configuration>Release</Configuration> | ||
<Platform>Win32</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Release|x64"> | ||
<Configuration>Release</Configuration> | ||
<Platform>x64</Platform> | ||
</ProjectConfiguration> | ||
</ItemGroup> | ||
<PropertyGroup Label="Globals"> | ||
<ProjectGuid>{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}</ProjectGuid> | ||
</PropertyGroup> | ||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
<PropertyGroup Label="Configuration"> | ||
<ConfigurationType>DynamicLibrary</ConfigurationType> | ||
<PlatformToolset>v141</PlatformToolset> | ||
<CharacterSet>MultiByte</CharacterSet> | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration"> | ||
<WholeProgramOptimization>true</WholeProgramOptimization> | ||
</PropertyGroup> | ||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
<ImportGroup Label="ExtensionSettings"> | ||
</ImportGroup> | ||
<ImportGroup Label="PropertySheets"> | ||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
<Import Project="$(SolutionDir)Common.props" /> | ||
</ImportGroup> | ||
<ItemDefinitionGroup> | ||
<Link> | ||
<AdditionalDependencies>lj_vm_$(PlatformShortName).obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
</Link> | ||
<ClCompile> | ||
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
<PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
</ClCompile> | ||
</ItemDefinitionGroup> | ||
<ItemGroup> | ||
<ClCompile Include="..\LuaJIT\src\lib_aux.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_base.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_bit.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_debug.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_ffi.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_init.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_io.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_jit.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_math.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_os.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_package.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_string.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lib_table.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_alloc.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_api.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_asm.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_bc.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_bcread.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_bcwrite.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_carith.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_ccall.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_ccallback.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_cconv.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_cdata.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_char.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_clib.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_cparse.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_crecord.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_ctype.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_debug.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_dispatch.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_err.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_ffrecord.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_func.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_gc.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_gdbjit.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_ir.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_lex.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_lib.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_load.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_mcode.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_meta.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_obj.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_opt_dce.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_opt_fold.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_opt_loop.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_opt_mem.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_opt_narrow.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_opt_sink.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_opt_split.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_parse.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_record.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_snap.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_state.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_str.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_strscan.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_tab.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_trace.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_udata.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_vmevent.c" /> | ||
<ClCompile Include="..\LuaJIT\src\lj_vmmath.c" /> | ||
</ItemGroup> | ||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
<ImportGroup Label="ExtensionTargets"> | ||
</ImportGroup> | ||
</Project> |
Oops, something went wrong.