diff options
19 files changed, 320 insertions, 1122 deletions
diff --git a/bin/SDL2.dll b/bin/SDL2.dll Binary files differindex 8e26c27..2e5e94f 100644 --- a/bin/SDL2.dll +++ b/bin/SDL2.dll diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex c40d365..139aa39 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/build/vc++/3rdparty/buildvm/buildvm-post.bat b/build/vc++/3rdparty/buildvm/buildvm-post.bat deleted file mode 100644 index e02d64f..0000000 --- a/build/vc++/3rdparty/buildvm/buildvm-post.bat +++ /dev/null @@ -1,17 +0,0 @@ -set buildvm=%1 -set outdir=%2 - -if not exist %outdir% mkdir -p %outdir% - -set src=..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src - -set sources=%src%\lib_base.c %src%\lib_math.c %src%\lib_bit.c %src%\lib_string.c %src%\lib_table.c %src%\lib_io.c %src%\lib_os.c %src%\lib_package.c %src%\lib_debug.c %src%\lib_jit.c %src%\lib_ffi.c - -%buildvm% -m peobj -o %outdir%\lj_vm.obj %sources% -%buildvm% -m bcdef -o %outdir%\lj_bcdef.h %sources% -%buildvm% -m ffdef -o %outdir%\lj_ffdef.h %sources% -%buildvm% -m libdef -o %outdir%\lj_libdef.h %sources% -%buildvm% -m recdef -o %outdir%\lj_recdef.h %sources% -%buildvm% -m vmdef -o %outdir%\vmdef.lua %sources% -%buildvm% -m folddef -o %outdir%\lj_folddef.h %src%\lj_opt_fold.c - diff --git a/build/vc++/3rdparty/buildvm/buildvm.vcxproj b/build/vc++/3rdparty/buildvm/buildvm.vcxproj deleted file mode 100644 index bf55f5e..0000000 --- a/build/vc++/3rdparty/buildvm/buildvm.vcxproj +++ /dev/null @@ -1,154 +0,0 @@ -<?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>{8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}</ProjectGuid> - <RootNamespace>buildvm</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)..\..\src\3rdparty\buildvm</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)..\..\src\3rdparty\buildvm</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BrowseInformation>true</BrowseInformation> - </ClCompile> - <PostBuildEvent> - <Command>buildvm-post.bat $(SolutionDir)..\..\src\3rdparty\buildvm\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src</Command> - </PostBuildEvent> - <Bscmake> - <PreserveSbr>true</PreserveSbr> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PostBuildEvent> - <Command>buildvm-post.bat $(SolutionDir)..\..\src\3rdparty\buildvm\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_asm.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_fold.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_lib.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_peobj.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\minilua\minilua.vcxproj"> - <Project>{c87c5b2f-4088-4bbc-8bee-c6a2bb22f9a0}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/buildvm/buildvm.vcxproj.filters b/build/vc++/3rdparty/buildvm/buildvm.vcxproj.filters deleted file mode 100644 index 9e3cb58..0000000 --- a/build/vc++/3rdparty/buildvm/buildvm.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="src"> - <UniqueIdentifier>{372ba491-5bba-40da-845a-a18b090d3a59}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_lib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_peobj.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_asm.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm_fold.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\buildvm.h"> - <Filter>src</Filter> - </ClInclude> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/buildvm/buildvm.vcxproj.user b/build/vc++/3rdparty/buildvm/buildvm.vcxproj.user deleted file mode 100644 index 828e82f..0000000 --- a/build/vc++/3rdparty/buildvm/buildvm.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\src\3rdparty\buildvm</LocalDebuggerWorkingDirectory> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\src\3rdparty\buildvm</LocalDebuggerWorkingDirectory> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/luajit/luajit.vcxproj b/build/vc++/3rdparty/luajit/luajit.vcxproj deleted file mode 100644 index 70b5c91..0000000 --- a/build/vc++/3rdparty/luajit/luajit.vcxproj +++ /dev/null @@ -1,302 +0,0 @@ -<?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>{80410A0C-5592-418E-848B-FEC61C432F53}</ProjectGuid> - <RootNamespace>luajit</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)..\..\bin</OutDir> - <TargetName>$(ProjectName)</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)..\..\bin</OutDir> - <TargetName>$(ProjectName)</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <TargetName>lua51</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <TargetName>lua51</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>false</ConformanceMode> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;D_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BrowseInformation>true</BrowseInformation> - </ClCompile> - <Lib> - <AdditionalDependencies>lj_vm.obj</AdditionalDependencies> - </Lib> - <Lib> - <AdditionalLibraryDirectories>$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src</AdditionalLibraryDirectories> - </Lib> - <Link> - <AdditionalLibraryDirectories>$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>lj_vm.obj;%(AdditionalDependencies)</AdditionalDependencies> - <ModuleDefinitionFile>luajit.def</ModuleDefinitionFile> - </Link> - <Bscmake> - <PreserveSbr>true</PreserveSbr> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <ModuleDefinitionFile>luajit.def</ModuleDefinitionFile> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>false</ConformanceMode> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;D_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalLibraryDirectories>$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>lj_vm.obj;%(AdditionalDependencies)</AdditionalDependencies> - <ModuleDefinitionFile>luajit.def</ModuleDefinitionFile> - </Link> - <Lib> - <AdditionalDependencies>lj_vm.obj</AdditionalDependencies> - </Lib> - <Lib> - <AdditionalLibraryDirectories>$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src</AdditionalLibraryDirectories> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <ModuleDefinitionFile>luajit.def</ModuleDefinitionFile> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lauxlib.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_alloc.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_arch.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_arm.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_mips.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_ppc.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_x86.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bc.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bcdump.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_carith.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccall.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccallback.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cconv.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cdata.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_char.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_clib.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cparse.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_crecord.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ctype.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_debug.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_def.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_dispatch.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_arm.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_mips.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_ppc.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_x86.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_err.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_errmsg.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ff.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ffrecord.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_frame.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_func.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gc.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gdbjit.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ir.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ircall.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_iropt.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_jit.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lex.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lib.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_mcode.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_meta.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_obj.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_parse.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_record.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_snap.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_state.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_str.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_strscan.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_tab.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_arm.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_mips.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_ppc.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_x86.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_trace.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_traceerr.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_udata.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vm.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vmevent.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lua.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lua.hpp" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\luaconf.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\luajit.h" /> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lualib.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_aux.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_base.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_bit.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_debug.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_ffi.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_init.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_io.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_jit.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_math.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_os.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_package.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_string.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_table.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_alloc.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_api.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bc.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bcread.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bcwrite.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_carith.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccall.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccallback.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cconv.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cdata.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_char.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_clib.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cparse.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_crecord.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ctype.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_debug.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_dispatch.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_err.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ffrecord.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_func.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gc.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gdbjit.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ir.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lex.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lib.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_load.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_mcode.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_meta.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_obj.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_dce.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_fold.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_loop.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_mem.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_narrow.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_sink.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_split.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_parse.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_record.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_snap.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_state.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_str.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_strscan.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_tab.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_trace.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_udata.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vmevent.c" /> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vmmath.c" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\buildvm\buildvm.vcxproj"> - <Project>{8b1269cf-1aff-4aa3-9209-96ddba4fa17f}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="luajit.def" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/luajit/luajit.vcxproj.filters b/build/vc++/3rdparty/luajit/luajit.vcxproj.filters deleted file mode 100644 index 9599ffc..0000000 --- a/build/vc++/3rdparty/luajit/luajit.vcxproj.filters +++ /dev/null @@ -1,396 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="src"> - <UniqueIdentifier>{81660f22-f79d-4743-8837-9e0c757a0bc3}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lua.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lualib.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\luajit.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\luaconf.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lua.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vmevent.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vm.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_udata.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_traceerr.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_trace.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_x86.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_ppc.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_mips.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target_arm.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_target.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_tab.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_strscan.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_str.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_state.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_snap.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_record.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_parse.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_obj.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_meta.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_mcode.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lib.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lex.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_jit.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_iropt.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ircall.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ir.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gdbjit.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gc.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_func.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_frame.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ffrecord.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ff.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_errmsg.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_err.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_x86.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_ppc.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_mips.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_emit_arm.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_dispatch.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_def.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_debug.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ctype.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_crecord.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cparse.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_clib.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_char.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cdata.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cconv.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccallback.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccall.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_carith.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bcdump.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bc.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_x86.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_ppc.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_mips.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm_arm.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_arch.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_alloc.h"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lauxlib.h"> - <Filter>src</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vmmath.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_vmevent.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_udata.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_trace.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_tab.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_strscan.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_str.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_state.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_snap.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_record.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_parse.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_split.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_sink.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_narrow.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_mem.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_loop.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_fold.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_opt_dce.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_obj.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_meta.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_mcode.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_load.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_lex.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ir.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gdbjit.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_gc.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_func.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ffrecord.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_err.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_dispatch.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_debug.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ctype.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_crecord.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cparse.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_clib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_char.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cdata.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_cconv.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccallback.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_ccall.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_carith.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bcwrite.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bcread.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_bc.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_asm.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_api.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lj_alloc.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_table.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_string.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_package.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_os.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_math.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_jit.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_io.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_init.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_ffi.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_debug.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_bit.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_base.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\lib_aux.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="luajit.def" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/luajit/luajit.vcxproj.user b/build/vc++/3rdparty/luajit/luajit.vcxproj.user deleted file mode 100644 index be25078..0000000 --- a/build/vc++/3rdparty/luajit/luajit.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup /> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/minilua/minilua-post.bat b/build/vc++/3rdparty/minilua/minilua-post.bat deleted file mode 100644 index cfdfecd..0000000 --- a/build/vc++/3rdparty/minilua/minilua-post.bat +++ /dev/null @@ -1,6 +0,0 @@ -set minilua=%1 -set outdir=%2 -set luajit=..\..\..\..\src\3rdparty\LuaJIT-2.0.5 - -if not exist %outdir% mkdir -p %outdir% -%minilua% %luajit%\dynasm\dynasm.lua -LN -D WIN -D JIT -D FFI -o %outdir%\buildvm_arch.h %luajit%\src\vm_x86.dasc diff --git a/build/vc++/3rdparty/minilua/minilua.vcxproj b/build/vc++/3rdparty/minilua/minilua.vcxproj deleted file mode 100644 index 9e2aff2..0000000 --- a/build/vc++/3rdparty/minilua/minilua.vcxproj +++ /dev/null @@ -1,140 +0,0 @@ -<?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>{C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}</ProjectGuid> - <RootNamespace>minilua</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)..\..\src\3rdparty\minilua</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)..\..\src\3rdparty\minilua</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>false</ConformanceMode> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BrowseInformation>true</BrowseInformation> - </ClCompile> - <PostBuildEvent> - <Command>minilua-post.bat $(SolutionDir)..\..\src\3rdparty\minilua\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src</Command> - </PostBuildEvent> - <Bscmake> - <PreserveSbr>true</PreserveSbr> - </Bscmake> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>false</ConformanceMode> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PostBuildEvent> - <Command>minilua-post.bat $(SolutionDir)..\..\src\3rdparty\minilua\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\minilua.c" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/minilua/minilua.vcxproj.filters b/build/vc++/3rdparty/minilua/minilua.vcxproj.filters deleted file mode 100644 index 7f78b2c..0000000 --- a/build/vc++/3rdparty/minilua/minilua.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="src"> - <UniqueIdentifier>{a2e8a60a-016f-4231-b0fb-040778ce3716}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\..\src\3rdparty\LuaJIT-2.0.5\src\host\minilua.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/minilua/minilua.vcxproj.user b/build/vc++/3rdparty/minilua/minilua.vcxproj.user deleted file mode 100644 index f353c3c..0000000 --- a/build/vc++/3rdparty/minilua/minilua.vcxproj.user +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\src\3rdparty\minilua</LocalDebuggerWorkingDirectory> - <LocalDebuggerAttach>false</LocalDebuggerAttach> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\src\3rdparty\minilua</LocalDebuggerWorkingDirectory> - <LocalDebuggerAttach>false</LocalDebuggerAttach> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> -</Project>
\ No newline at end of file diff --git a/build/vc++/jin.sln b/build/vc++/jin.sln index 0f33f15..bafb697 100644 --- a/build/vc++/jin.sln +++ b/build/vc++/jin.sln @@ -31,13 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "jin\jin.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "3rdparty\SDL2\SDL2.vcxproj", "{8658F91C-9AAE-4819-9005-77D09C61D97F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "3rdparty\luajit\luajit.vcxproj", "{80410A0C-5592-418E-848B-FEC61C432F53}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LuaJIT-2.0.5", "LuaJIT-2.0.5", "{2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buildvm", "3rdparty\buildvm\buildvm.vcxproj", "{8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minilua", "3rdparty\minilua\minilua.vcxproj", "{C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua", "Lua", "{2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{CD378AC6-A4FE-48F7-984A-EB68C60A211B}" EndProject @@ -47,6 +41,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StateMachine", "examples\St EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "examples\Animation\Animation.vcxproj", "{3191C07B-085A-46BC-9436-469B4E2BF5F0}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT-2.0.5", "3rdparty\LuaJIT-2.0.5\LuaJIT-2.0.5.vcxproj", "{45AC0438-98A8-4369-A21D-BBCBE7995B34}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -135,30 +131,6 @@ Global {8658F91C-9AAE-4819-9005-77D09C61D97F}.Release|x64.Build.0 = Release|x64 {8658F91C-9AAE-4819-9005-77D09C61D97F}.Release|x86.ActiveCfg = Release|Win32 {8658F91C-9AAE-4819-9005-77D09C61D97F}.Release|x86.Build.0 = Release|Win32 - {80410A0C-5592-418E-848B-FEC61C432F53}.Debug|x64.ActiveCfg = Debug|x64 - {80410A0C-5592-418E-848B-FEC61C432F53}.Debug|x64.Build.0 = Debug|x64 - {80410A0C-5592-418E-848B-FEC61C432F53}.Debug|x86.ActiveCfg = Debug|Win32 - {80410A0C-5592-418E-848B-FEC61C432F53}.Debug|x86.Build.0 = Debug|Win32 - {80410A0C-5592-418E-848B-FEC61C432F53}.Release|x64.ActiveCfg = Release|x64 - {80410A0C-5592-418E-848B-FEC61C432F53}.Release|x64.Build.0 = Release|x64 - {80410A0C-5592-418E-848B-FEC61C432F53}.Release|x86.ActiveCfg = Release|Win32 - {80410A0C-5592-418E-848B-FEC61C432F53}.Release|x86.Build.0 = Release|Win32 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Debug|x64.ActiveCfg = Debug|x64 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Debug|x64.Build.0 = Debug|x64 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Debug|x86.ActiveCfg = Debug|Win32 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Debug|x86.Build.0 = Debug|Win32 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Release|x64.ActiveCfg = Release|x64 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Release|x64.Build.0 = Release|x64 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Release|x86.ActiveCfg = Release|Win32 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F}.Release|x86.Build.0 = Release|Win32 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Debug|x64.ActiveCfg = Debug|x64 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Debug|x64.Build.0 = Debug|x64 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Debug|x86.ActiveCfg = Debug|Win32 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Debug|x86.Build.0 = Debug|Win32 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Release|x64.ActiveCfg = Release|x64 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Release|x64.Build.0 = Release|x64 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Release|x86.ActiveCfg = Release|Win32 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Release|x86.Build.0 = Release|Win32 {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Debug|x64.ActiveCfg = Debug|x64 {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Debug|x64.Build.0 = Debug|x64 {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Debug|x86.ActiveCfg = Debug|Win32 @@ -183,6 +155,14 @@ Global {3191C07B-085A-46BC-9436-469B4E2BF5F0}.Release|x64.Build.0 = Release|x64 {3191C07B-085A-46BC-9436-469B4E2BF5F0}.Release|x86.ActiveCfg = Release|Win32 {3191C07B-085A-46BC-9436-469B4E2BF5F0}.Release|x86.Build.0 = Release|Win32 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Debug|x64.ActiveCfg = Debug|x64 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Debug|x64.Build.0 = Debug|x64 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Debug|x86.ActiveCfg = Debug|Win32 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Debug|x86.Build.0 = Debug|Win32 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Release|x64.ActiveCfg = Release|x64 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Release|x64.Build.0 = Release|x64 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Release|x86.ActiveCfg = Release|Win32 + {45AC0438-98A8-4369-A21D-BBCBE7995B34}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -198,14 +178,12 @@ Global {9A0EAD3F-5A23-41C8-8FFD-8F6B71F43342} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {05128A0C-74E2-43EF-B5F4-B0DA70D47940} = {2D5BA0D9-04A7-43BB-BD30-000D39317B07} {8658F91C-9AAE-4819-9005-77D09C61D97F} = {CD378AC6-A4FE-48F7-984A-EB68C60A211B} - {80410A0C-5592-418E-848B-FEC61C432F53} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} {CD378AC6-A4FE-48F7-984A-EB68C60A211B} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794} = {CD378AC6-A4FE-48F7-984A-EB68C60A211B} {C70BFD61-6462-49D2-9F54-F16D77FF434A} = {6FC112F9-B317-4444-B4FB-2E0BF70328F1} {3191C07B-085A-46BC-9436-469B4E2BF5F0} = {6FC112F9-B317-4444-B4FB-2E0BF70328F1} + {45AC0438-98A8-4369-A21D-BBCBE7995B34} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8} diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index 3394bf6..b3c36a7 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -254,8 +254,8 @@ <Image Include="..\..\res\icon.ico" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="3rdparty\luajit\luajit.vcxproj"> - <Project>{80410a0c-5592-418e-848b-fec61c432f53}</Project> + <ProjectReference Include="3rdparty\LuaJIT-2.0.5\LuaJIT-2.0.5.vcxproj"> + <Project>{45ac0438-98a8-4369-a21d-bbcbe7995b34}</Project> </ProjectReference> <ProjectReference Include="libjin\libjin.vcxproj"> <Project>{9ee02090-c15e-4520-9c05-c435e45ef2fc}</Project> diff --git a/src/3rdparty/LuaJIT-2.0.5/src/lua51.dll b/src/3rdparty/LuaJIT-2.0.5/src/lua51.dll Binary files differdeleted file mode 100644 index c9edadf..0000000 --- a/src/3rdparty/LuaJIT-2.0.5/src/lua51.dll +++ /dev/null diff --git a/src/3rdparty/LuaJIT-2.0.5/src/lua51.lib b/src/3rdparty/LuaJIT-2.0.5/src/lua51.lib Binary files differdeleted file mode 100644 index 36f6e7c..0000000 --- a/src/3rdparty/LuaJIT-2.0.5/src/lua51.lib +++ /dev/null diff --git a/src/3rdparty/tinyxml/CMakeLists.txt b/src/3rdparty/tinyxml/CMakeLists.txt new file mode 100644 index 0000000..30b2f28 --- /dev/null +++ b/src/3rdparty/tinyxml/CMakeLists.txt @@ -0,0 +1,8 @@ +# ASEPRITE +# Copyright (C) 2001-2013 David Capello + +add_library(tinyxml + tinystr.cpp + tinyxml.cpp + tinyxmlerror.cpp + tinyxmlparser.cpp) diff --git a/src/3rdparty/tinyxml/changes.txt b/src/3rdparty/tinyxml/changes.txt new file mode 100644 index 0000000..e1c78c2 --- /dev/null +++ b/src/3rdparty/tinyxml/changes.txt @@ -0,0 +1,298 @@ +Changes in version 1.0.1: +- Fixed comment tags which were outputing as '<?--' instead of + the correct '<!--'. +- Implemented the Next and Prev methods of the TiXmlAttribute class. +- Renamed 'LastAttribtute' to 'LastAttribute' +- Fixed bad pointer to 'isspace' that could occur while parsing text. +- Errors finding beginning and end of tags no longer throw it into an + infinite loop. (Hopefully.) + +Changes in version 1.0.2 +- Minor documentation fixes. + +Changes in version 1.0.3 +- After nodes are added to a document, they return a pointer + to the new node instead of a bool for success. +- Elements can be constructed with a value, which is the + element name. Every element must have a value or it will be + invalid, but the code changes to enforce this are not fully + in place. + +Changes in version 1.1.0 +- Added the TiXmlAttributeSet class to pull the attributes into + a seperate container. +- Moved the doubly liked list out of XmlBase. Now XmlBase only + requires the Print() function and defines some utility functions. +- Moved errors into a seperate file. (With the idea of internationalization + to the other latin-1 languages.) +- Added the "NodeType" +- Fixed white space parsing in text to conform with the standard. + Basically, all white space becomes just one space. +- Added the TiXmlDeclaration class to read xml declarations. + +Changes in version 1.2.0 +- Removed the factory. The factory was not really in the spirit + of small and simple, confused the code, and was of limited value. +- Added FirstChildElement and NextSiblingElement, because they + are such common functions. +- Re-wrote the example to test and demonstrate more functionality. + +Changes in version 1.2.1 +- Fixed a bug where comments couldn't be inside elements. +- Loading now clears out existing XML rather than appending. +- Added the "Clear" method on a node to delete all its children. + +Changes in version 1.2.2 +- Fixed TiXmlAttribute::Previous actually returning "next." Thanks + to Rickard Troedsson for the bug fix. + +Changes in version 1.2.3 +- Added the TIXML prefix to the error strings to resolve conflicts + with #defines in OS headers. Thanks to Steve Lhomme. +- Fixed a delete buf that should be a delete [] buf. + Thanks to Ephi Sinowitz. + +Changes in version 1.2.4 +- ReplaceChild() was almost guarenteed to fail. Should be fixed, + thanks to Joe Smith. Joe also pointed out that the Print() functions + should take stream references: I agree, and would like to overload + the Print() method to take either format, but I don't want to do + this in a dot release. +- Some compilers seem to need an extra <ctype.h> include. Thanks + to Steve Lhomme for that. + +Changes in version 2.0.0 BETA +- Made the ToXXX() casts safe if 'this' is null. + When "LoadFile" is called with a filename, the value will correctly get set. + Thanks to Brian Yoder. +- Fixed bug where isalpha() and isalnum() would get called with a negative value for + high ascii numbers. Thanks to Alesky Aksenov. +- Fixed some errors codes that were not getting set. +- Made methods "const" that were not. +- Added a switch to enable or disable the ignoring of white space. ( TiXmlDocument::SetIgnoreWhiteSpace() ) +- Greater standardization and code re-use in the parser. +- Added a stream out operator. +- Added a stream in operator. +- Entity support, of predefined entites. &#x entities are untouched by input or output. +- Improved text out formatting. +- Fixed ReplaceChild bug, thanks to Tao Chen. + +Changes in version 2.0.1 +- Fixed hanging on loading a 0 length file. Thanks to Jeff Scozzafava. +- Fixed crashing on InsertBeforeChild and InsertAfterChild. Also possibility of bad links being + created by same function. Thanks to Frank De prins. +- Added missing licence text. Thanks to Lars Willemsens. +- Added <ctype.h> include, at the suggestion of Steve Walters. + +Changes in version 2.1.0 +- Yves Berquin brings us the STL switch. The forum on SourceForge, and various emails to + me, have long debated all out STL vs. no STL at all. And now you can have it both ways. + TinyXml will compile either way. + +Changes in version 2.1.1 +- Compilation warnings. + +Changes in version 2.1.2 +- Uneeded code is not compiled in the STL case. +- Changed headers so that STL can be turned on or off in tinyxml.h + +Changes in version 2.1.3 +- Fixed non-const reference in API; now uses a pointer. +- Copy constructor of TiXmlString not checking for assignment to self. +- Nimrod Cohen found a truly evil bug in the STL implementation that occurs + when a string is converted to a c_str and then assigned to self. Search for + STL_STRING_BUG for a full description. I'm asserting this is a Microsoft STL + bug, since &string and string.c_str() should never be the same. Nevertheless, + the code works around it. +- Urivan Saaib pointed out a compiler conflict, where the C headers define + the isblank macro, which was wiping out the TiXmlString::isblank() method. + The method was unused and has been removed. + +Changes in version 2.1.4 +- Reworked the entity code. Entities were not correctly surving round trip input and output. + Will now automatically create entities for high ascii in output. + +Changes in version 2.1.5 +- Bug fix by kylotan : infinite loop on some input (tinyxmlparser.cpp rev 1.27) +- Contributed by Ivica Aracic (bytelord) : 1 new VC++ project to compile versions as static libraries (tinyxml_lib.dsp), + and an example usage in xmltest.dsp + (Patch request ID 678605) +- A suggestion by Ronald Fenner Jr (dormlock) to add #include <istream> and <ostream> for Apple's Project Builder + (Patch request ID 697642) +- A patch from ohommes that allows to parse correctly dots in element names and attribute names + (Patch request 602600 and kylotan 701728) +- A patch from hermitgeek ( James ) and wasteland for improper error reporting +- Reviewed by Lee, with the following changes: + - Got sick of fighting the STL/non-STL thing in the windows build. Broke + them out as seperate projects. + - I have too long not included the dsw. Added. + - TinyXmlText had a protected Print. Odd. + - Made LinkEndChild public, with docs and appropriate warnings. + - Updated the docs. + +2.2.0 +- Fixed an uninitialized pointer in the TiXmlAttributes +- Fixed STL compilation problem in MinGW (and gcc 3?) - thanks Brian Yoder for finding this one +- Fixed a syntax error in TiXmlDeclaration - thanks Brian Yoder +- Fletcher Dunn proposed and submitted new error handling that tracked the row and column. Lee + modified it to not have performance impact. +- General cleanup suggestions from Fletcher Dunn. +- In error handling, general errors will no longer clear the error state of specific ones. +- Fix error in documentation : comments starting with "<?--" instead of "<!--" (thanks ion_pulse) +- Added the TiXmlHandle. An easy, safe way to browse XML DOMs with less code. +- Added QueryAttribute calls which have better error messaging. (Proposed by Fletcher Dunn) +- Nodes and attributes can now print themselves to strings. (Yves suggestion) +- Fixed bug where entities with one character would confuse parser. (Thanks Roman) + +2.2.1 +- Additional testing (no more bugs found to be fixed in this release) +- Significant performance improvement to the cursor code. + +2.3.0 +- User Data are now defined in TiXmlBase instead of TiXmlNode +- Character Entities are now UCS-2 +- Character Entities can be decimal or hexadecimal +- UTF-8 conversion. +- Fixed many, many bugs. + +2.3.1 +- Fixed bug in handling nulls embedded in the input. +- Make UTF-8 parser tolerant of bad text encoding. +- Added encoding detection. +- Many fixes and input from John-Philip Leonard Johansson (JP) and Ellers, + including UTF-8 feedback, bug reports, and patches. Thanks! +- Added version # constants - a suggestion from JP and Ellers. +- [ 979180 ] Missing ; in entity reference, fix from Rob Laveaux. +- Copy constructors and assignment have been a long time coming. Thanks to + Fokke and JP. + +2.3.2 +- Made the IsAlpha and IsAlphaNum much more tolerant of non-UTF-8 encodings. Thanks + Volker Boerchers for finding the issue. +- Ran the program though the magnificent Valgrind - http://valgrind.kde.org - to check + for memory errors. Fixed some minor issues. + +2.3.3 +- Fixed crash when test program was run from incorrect directory. +- Fixed bug 1070717 - empty document not returned correctly - thanks Katsuhisa Yuasa. +- Bug 1079301 resolved - deprecated stdlib calls. Thanks Adrian Boeing. +- Bug 1035218 fixed - documentation errors. Xunji Luo +- Other bug fixes have accumulated and been fixed on the way as well; my apologies to + authors not credited! +- Big fix / addition is to correctly return const values. TinyXml could basically + remove const in a method like this: TiXmlElement* Foo() const, where the returned element + was a pointer to internal data. That is now: const TiXmlElement* Foo() const and + TiXmlElement* Foo(). + +2.3.4 +- Fixed additional const errors, thanks Kent Gibson. +- Correctly re-enable warnings after tinyxml header. Thanks Cory Nelson. +- Variety of type cleanup and warning fixes. Thanks Warren Stevens. +- Cleaned up unneeded constructor calls in TinyString - thanks to Geoff Carlton and + the discussion group on sourceforge. + +2.4.0 +- Improved string class, thanks Tyge Lovset (whose name gets mangled in English - sorry) +- Type cast compiler warning, thanks Rob van den Bogaard +- Added GetText() convenience function. Thanks Ilya Parniuk & Andrew Ellers for input. +- Many thanks to marlonism for finding an infinite loop in bad xml. +- A patch to cleanup warnings from Robert Gebis. +- Added ValueStr() to get the value of a node as a string. +- TiXmlText can now parse and output as CDATA +- Additional string improvement from James (z2895) +- Removed extraneous 'const', thanks David Aldrich +- First pass at switching to the "safe" stdlib functions. Many people have suggested and + pushed on this, but Warren Stevens put together the first proposal. +- TinyXml now will do EOL normalization before parsing, consistent with the W3C XML spec. +- Documents loaded with the UTF-8 BOM will now save with the UTF-8 BOM. Good suggestion + from 'instructor_' +- Ellers submitted his very popular tutorials, which have been added to the distribution. + +2.4.1 +- Fixed CDATA output formatting +- Fixed memory allocators in TinyString to work with overloaded new/delete + +2.4.2 +- solosnake pointed out that TIXML_LOG causes problems on an XBOX. The definition in the header + was superflous and was moved inside of DEBUG_PARSING + +2.4.3 +- Fixed a test bug that caused a crash in 'xmltest'. TinyXML was fine, but it isn't good + to ship with a broken test suite. +- Started converting some functions to not cast between std::string and const char* + quite as often. +- Added FILE* versions of the document loads - good suggestion from Wade Brainerd +- Empty documents might not always return the errors they should. [1398915] Thanks to igor v. +- Added some asserts for multiply adding a node, regardng bug [1391937] suggested by Paco Arjonilla. + +2.4.4 +- Bug find thanks to andre-gross found a memory leak that occured when a document failed to load. +- Bug find (and good analysis) by VirtualJim who found a case where attribute parsing + should be throwing an error and wasn't. +- Steve Hyatt suggested the QueryValueAttribute method, which is now implemented. +- DavidA identified a chunk of dead code. +- Andrew Baxter sent in some compiler warnings that were good clean up points. + +2.5 +- Added the Visit() API. Many thanks to both Andrew Ellerton and John-Philip for all their + work, code, suggestion, and just general pushing that it should be done. +- Removed existing streaming code and use TiXmlPrinter instead. +- [ tinyxml-Bugs-1527079 ] Compile error in tinystr.cpp fixed, thanks to Paul Suggs +- [ tinyxml-Bugs-1522890 ] SaveFile has no error checks fixed, thanks to Ivan Dobrokotov +- Ivan Dobrokotov also reported redundant memory allocation in the Attribute() method, which + upon investigation was a mess. The attribute should now be fixed for both const char* and + std::string, and the return types match the input parameters. +- Feature [ 1511105 ] Make TiXmlComment constructor accept a string / char*, implemented. + Thanks to Karl Itschen for the feedback. +- [ 1480108 ] Stream parsing fails when CDATA contains tags was found by Tobias Grimm, who also + submitted a test case and patch. A significant bug in CDATA streaming (operator>>) has now + been fixed. + +2.5.2 +- Lieven, and others, pointed out a missing const-cast that upset the Open Watcom compiler. + Should now be fixed. +- ErrorRow and ErrorCol should have been const, and weren't. Fixed thanks to Dmitry Polutov. + +2.5.3 +- zloe_zlo identified a missing string specialization for QueryValueAttribute() [ 1695429 ]. Worked + on this bug, but not sure how to fix it in a safe, cross-compiler way. +- increased warning level to 4 and turned on detect 64 bit portability issues for VC2005. + May address [ 1677737 ] VS2005: /Wp64 warnings +- grosheck identified several problems with the Document copy. Many thanks for [ 1660367 ] +- Nice catch, and suggested fix, be Gilad Novik on the Printer dropping entities. + "[ 1600650 ] Bug when printing xml text" is now fixed. +- A subtle fix from Nicos Gollan in the tinystring initializer: + [ 1581449 ] Fix initialiser of TiXmlString::nullrep_ +- Great catch, although there isn't a submitter for the bug. [ 1475201 ] TinyXML parses entities in comments. + Comments should not, in fact, parse entities. Fixed the code path and added tests. +- We were not catching all the returns from ftell. Thanks to Bernard for catching that. + +2.5.4 +- A TiXMLDocument can't be a sub-node. Block this from happening in the 'replace'. Thanks Noam. +- [ 1714831 ] TiXmlBase::location is not copied by copy-ctors, fix reported and suggested by Nicola Civran. +- Fixed possible memory overrun in the comment reading code - thanks gcarlton77 + +2.5.5 +- Alex van der Wal spotted incorrect types (lf) being used in print and scan. robertnestor pointed out some problems with the simple solution. Types updated. +- Johannes Hillert pointed out some bug typos. +- Christian Mueller identified inconsistent error handling with Attributes. +- olivier barthelemy also reported a problem with double truncation, also related to the %lf issue. +- zaelsius came up with a great (and simple) suggestion to fix QueryValueAttribute truncating strings. +- added some null pointer checks suggested by hansenk +- Sami Visnen found a (rare) buffer overrun that could occur in parsing. +- vi tri filed a bug that led to a refactoring of the attribute setting mess (as well as adding a missing SetDoubleAttribute() ) +- removed TIXML_ERROR_OUT_OF_MEMORY. TinyXML does not systematically address OOO, and the notion it does is misleading. +- vanneto, keithmarshall, others all reported the warning from IsWhiteSpace() usage. Cleaned this up - many thanks to everyone who reported this one. +- tibur found a bug in end tag parsing + + +2.6.2 +- Switched over to VC 2010 +- Fixed up all the build issues arising from that. (Lots of latent build problems.) +- Removed the old, now unmaintained and likely not working, build files. +- Fixed some static analysis issues reported by orbitcowboy from cppcheck. +- Bayard 95 sent in analysis from a different analyzer - fixes applied from that as well. +- Tim Kosse sent a patch fixing an infinite loop. +- Ma Anguo identified a doc issue. +- Eddie Cohen identified a missing qualifier resulting in a compilation error on some systems. +- Fixed a line ending bug. (What year is this? Can we all agree on a format for text files? Please? ...oh well.) |