From 1f17e8be1d1ad9ae2d669f40e8cd8115c751c752 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 28 Nov 2018 17:20:11 +0800 Subject: =?UTF-8?q?-=E5=88=A0=E9=99=A4luajit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/SDL2.dll | Bin 1279488 -> 771072 bytes bin/jin.exe | Bin 2329088 -> 538112 bytes build/vc++/3rdparty/buildvm/buildvm-post.bat | 17 - build/vc++/3rdparty/buildvm/buildvm.vcxproj | 154 -------- .../vc++/3rdparty/buildvm/buildvm.vcxproj.filters | 30 -- build/vc++/3rdparty/buildvm/buildvm.vcxproj.user | 11 - build/vc++/3rdparty/luajit/luajit.vcxproj | 302 ---------------- build/vc++/3rdparty/luajit/luajit.vcxproj.filters | 396 --------------------- build/vc++/3rdparty/luajit/luajit.vcxproj.user | 4 - build/vc++/3rdparty/minilua/minilua-post.bat | 6 - build/vc++/3rdparty/minilua/minilua.vcxproj | 140 -------- .../vc++/3rdparty/minilua/minilua.vcxproj.filters | 13 - build/vc++/3rdparty/minilua/minilua.vcxproj.user | 13 - build/vc++/jin.sln | 46 +-- build/vc++/jin.vcxproj | 4 +- src/3rdparty/LuaJIT-2.0.5/src/lua51.dll | Bin 364544 -> 0 bytes src/3rdparty/LuaJIT-2.0.5/src/lua51.lib | Bin 59514 -> 0 bytes src/3rdparty/tinyxml/CMakeLists.txt | 8 + src/3rdparty/tinyxml/changes.txt | 298 ++++++++++++++++ 19 files changed, 320 insertions(+), 1122 deletions(-) delete mode 100644 build/vc++/3rdparty/buildvm/buildvm-post.bat delete mode 100644 build/vc++/3rdparty/buildvm/buildvm.vcxproj delete mode 100644 build/vc++/3rdparty/buildvm/buildvm.vcxproj.filters delete mode 100644 build/vc++/3rdparty/buildvm/buildvm.vcxproj.user delete mode 100644 build/vc++/3rdparty/luajit/luajit.vcxproj delete mode 100644 build/vc++/3rdparty/luajit/luajit.vcxproj.filters delete mode 100644 build/vc++/3rdparty/luajit/luajit.vcxproj.user delete mode 100644 build/vc++/3rdparty/minilua/minilua-post.bat delete mode 100644 build/vc++/3rdparty/minilua/minilua.vcxproj delete mode 100644 build/vc++/3rdparty/minilua/minilua.vcxproj.filters delete mode 100644 build/vc++/3rdparty/minilua/minilua.vcxproj.user delete mode 100644 src/3rdparty/LuaJIT-2.0.5/src/lua51.dll delete mode 100644 src/3rdparty/LuaJIT-2.0.5/src/lua51.lib create mode 100644 src/3rdparty/tinyxml/CMakeLists.txt create mode 100644 src/3rdparty/tinyxml/changes.txt diff --git a/bin/SDL2.dll b/bin/SDL2.dll index 8e26c27..2e5e94f 100644 Binary files a/bin/SDL2.dll and b/bin/SDL2.dll differ diff --git a/bin/jin.exe b/bin/jin.exe index c40d365..139aa39 100644 Binary files a/bin/jin.exe and b/bin/jin.exe differ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F} - buildvm - 8.1 - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)..\..\src\3rdparty\buildvm - - - $(SolutionDir)..\..\src\3rdparty\buildvm - - - - Level3 - Disabled - true - true - $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - buildvm-post.bat $(SolutionDir)..\..\src\3rdparty\buildvm\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src - - - true - - - - - Level3 - Disabled - true - true - - - - - Level3 - MaxSpeed - true - true - true - true - $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - true - true - - - buildvm-post.bat $(SolutionDir)..\..\src\3rdparty\buildvm\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - - - - - - - - - - - {c87c5b2f-4088-4bbc-8bee-c6a2bb22f9a0} - - - - - - \ 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 @@ - - - - - {372ba491-5bba-40da-845a-a18b090d3a59} - - - - - src - - - src - - - src - - - src - - - src - - - - - src - - - \ 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 @@ - - - - $(SolutionDir)..\..\src\3rdparty\buildvm - WindowsLocalDebugger - - - $(SolutionDir)..\..\src\3rdparty\buildvm - WindowsLocalDebugger - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {80410A0C-5592-418E-848B-FEC61C432F53} - luajit - 8.1 - - - - StaticLibrary - true - v141 - MultiByte - - - StaticLibrary - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)..\..\bin - $(ProjectName) - - - $(SolutionDir)..\..\bin - $(ProjectName) - - - lua51 - - - lua51 - - - - Level3 - Disabled - true - false - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;D_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - - - lj_vm.obj - - - $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src - - - $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories) - lj_vm.obj;%(AdditionalDependencies) - luajit.def - - - true - - - - - Level3 - Disabled - true - true - - - luajit.def - - - - - Level3 - MaxSpeed - true - true - true - false - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;D_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - - - true - true - $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories) - lj_vm.obj;%(AdditionalDependencies) - luajit.def - - - lj_vm.obj - - - $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - luajit.def - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8b1269cf-1aff-4aa3-9209-96ddba4fa17f} - - - - - - - - - \ 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 @@ - - - - - {81660f22-f79d-4743-8837-9e0c757a0bc3} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - - - - \ 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 @@ - - - - \ 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0} - minilua - 8.1 - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)..\..\src\3rdparty\minilua - - - $(SolutionDir)..\..\src\3rdparty\minilua - - - - Level3 - Disabled - true - false - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - minilua-post.bat $(SolutionDir)..\..\src\3rdparty\minilua\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src - - - true - - - - - Level3 - Disabled - true - true - - - - - Level3 - MaxSpeed - true - true - true - false - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - true - true - - - minilua-post.bat $(SolutionDir)..\..\src\3rdparty\minilua\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - - - - - \ 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 @@ - - - - - {a2e8a60a-016f-4231-b0fb-040778ce3716} - - - - - src - - - \ 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 @@ - - - - $(SolutionDir)..\..\src\3rdparty\minilua - false - WindowsLocalDebugger - - - $(SolutionDir)..\..\src\3rdparty\minilua - false - WindowsLocalDebugger - - \ 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 @@ - - {80410a0c-5592-418e-848b-fec61c432f53} + + {45ac0438-98a8-4369-a21d-bbcbe7995b34} {9ee02090-c15e-4520-9c05-c435e45ef2fc} diff --git a/src/3rdparty/LuaJIT-2.0.5/src/lua51.dll b/src/3rdparty/LuaJIT-2.0.5/src/lua51.dll deleted file mode 100644 index c9edadf..0000000 Binary files a/src/3rdparty/LuaJIT-2.0.5/src/lua51.dll and /dev/null differ diff --git a/src/3rdparty/LuaJIT-2.0.5/src/lua51.lib b/src/3rdparty/LuaJIT-2.0.5/src/lua51.lib deleted file mode 100644 index 36f6e7c..0000000 Binary files a/src/3rdparty/LuaJIT-2.0.5/src/lua51.lib and /dev/null differ 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 ' 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 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 and 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 ">) 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 Väisänen 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.) -- cgit v1.1-26-g67d0