From 454f79862d0aee9bf61debe0e976d61d7e0f3469 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 25 Oct 2018 22:28:17 +0800 Subject: =?UTF-8?q?*luajit=20=E9=9D=99=E6=80=81=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/vc++/3rdparty/SDL2/SDL2.vcxproj | 122 +++++++ build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters | 17 + build/vc++/3rdparty/SDL2/SDL2.vcxproj.user | 4 + build/vc++/3rdparty/buildvm/buildvm-post.bat | 17 + build/vc++/3rdparty/buildvm/buildvm.vcxproj | 150 ++++++++ .../vc++/3rdparty/buildvm/buildvm.vcxproj.filters | 30 ++ build/vc++/3rdparty/buildvm/buildvm.vcxproj.user | 11 + build/vc++/3rdparty/luajit/luajit.vcxproj | 275 ++++++++++++++ build/vc++/3rdparty/luajit/luajit.vcxproj.filters | 393 +++++++++++++++++++++ build/vc++/3rdparty/luajit/luajit.vcxproj.user | 4 + build/vc++/3rdparty/minilua/minilua-post.bat | 6 + build/vc++/3rdparty/minilua/minilua.vcxproj | 136 +++++++ .../vc++/3rdparty/minilua/minilua.vcxproj.filters | 13 + build/vc++/3rdparty/minilua/minilua.vcxproj.user | 13 + build/vc++/jin.sln | 49 ++- build/vc++/jin.vcxproj | 3 + build/vc++/jin/jin.vcxproj | 12 +- build/vc++/jin/jin.vcxproj.user | 4 + build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib | Bin 33996 -> 33996 bytes build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll | Bin 364544 -> 364544 bytes build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib | Bin 59514 -> 59514 bytes build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib | Bin 33810 -> 0 bytes build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib | Bin 33996 -> 33996 bytes 23 files changed, 1252 insertions(+), 7 deletions(-) create mode 100644 build/vc++/3rdparty/SDL2/SDL2.vcxproj create mode 100644 build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters create mode 100644 build/vc++/3rdparty/SDL2/SDL2.vcxproj.user create mode 100644 build/vc++/3rdparty/buildvm/buildvm-post.bat create mode 100644 build/vc++/3rdparty/buildvm/buildvm.vcxproj create mode 100644 build/vc++/3rdparty/buildvm/buildvm.vcxproj.filters create mode 100644 build/vc++/3rdparty/buildvm/buildvm.vcxproj.user create mode 100644 build/vc++/3rdparty/luajit/luajit.vcxproj create mode 100644 build/vc++/3rdparty/luajit/luajit.vcxproj.filters create mode 100644 build/vc++/3rdparty/luajit/luajit.vcxproj.user create mode 100644 build/vc++/3rdparty/minilua/minilua-post.bat create mode 100644 build/vc++/3rdparty/minilua/minilua.vcxproj create mode 100644 build/vc++/3rdparty/minilua/minilua.vcxproj.filters create mode 100644 build/vc++/3rdparty/minilua/minilua.vcxproj.user delete mode 100644 build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib (limited to 'build/vc++') diff --git a/build/vc++/3rdparty/SDL2/SDL2.vcxproj b/build/vc++/3rdparty/SDL2/SDL2.vcxproj new file mode 100644 index 0000000..511ce2e --- /dev/null +++ b/build/vc++/3rdparty/SDL2/SDL2.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {8658F91C-9AAE-4819-9005-77D09C61D97F} + SDL2 + 10.0.17134.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + true + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + + + + \ No newline at end of file diff --git a/build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters b/build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ No newline at end of file diff --git a/build/vc++/3rdparty/SDL2/SDL2.vcxproj.user b/build/vc++/3rdparty/SDL2/SDL2.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/vc++/3rdparty/SDL2/SDL2.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/vc++/3rdparty/buildvm/buildvm-post.bat b/build/vc++/3rdparty/buildvm/buildvm-post.bat new file mode 100644 index 0000000..e02d64f --- /dev/null +++ b/build/vc++/3rdparty/buildvm/buildvm-post.bat @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..faf0e65 --- /dev/null +++ b/build/vc++/3rdparty/buildvm/buildvm.vcxproj @@ -0,0 +1,150 @@ + + + + + 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) + + + buildvm-post.bat $(SolutionDir)..\..\src\3rdparty\buildvm\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src + + + + + 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 new file mode 100644 index 0000000..9e3cb58 --- /dev/null +++ b/build/vc++/3rdparty/buildvm/buildvm.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {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 new file mode 100644 index 0000000..828e82f --- /dev/null +++ b/build/vc++/3rdparty/buildvm/buildvm.vcxproj.user @@ -0,0 +1,11 @@ + + + + $(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 new file mode 100644 index 0000000..4f254b2 --- /dev/null +++ b/build/vc++/3rdparty/luajit/luajit.vcxproj @@ -0,0 +1,275 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {80410A0C-5592-418E-848B-FEC61C432F53} + luajit + 8.1 + + + + DynamicLibrary + true + v141 + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\..\bin + + + $(SolutionDir)..\..\bin + + + + Level3 + Disabled + true + false + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + lj_vm.obj + + + $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + false + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + + + lj_vm.obj + + + $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {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 new file mode 100644 index 0000000..2e909ae --- /dev/null +++ b/build/vc++/3rdparty/luajit/luajit.vcxproj.filters @@ -0,0 +1,393 @@ + + + + + {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 new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/vc++/3rdparty/luajit/luajit.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/vc++/3rdparty/minilua/minilua-post.bat b/build/vc++/3rdparty/minilua/minilua-post.bat new file mode 100644 index 0000000..cfdfecd --- /dev/null +++ b/build/vc++/3rdparty/minilua/minilua-post.bat @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000..e663cb1 --- /dev/null +++ b/build/vc++/3rdparty/minilua/minilua.vcxproj @@ -0,0 +1,136 @@ + + + + + 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) + + + minilua-post.bat $(SolutionDir)..\..\src\3rdparty\minilua\$(TargetName) $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src + + + + + 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 new file mode 100644 index 0000000..7f78b2c --- /dev/null +++ b/build/vc++/3rdparty/minilua/minilua.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {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 new file mode 100644 index 0000000..f353c3c --- /dev/null +++ b/build/vc++/3rdparty/minilua/minilua.vcxproj.user @@ -0,0 +1,13 @@ + + + + $(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 15667fc..3413994 100644 --- a/build/vc++/jin.sln +++ b/build/vc++/jin.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27703.2047 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin-lua", "jin.vcxproj", "{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luaport", "jin.vcxproj", "{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin", "libjin\libjin.vcxproj", "{9EE02090-C15E-4520-9C05-C435E45EF2FC}" EndProject @@ -29,6 +29,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runner", "Runner", "{2D5BA0 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jin", "jin\jin.vcxproj", "{05128A0C-74E2-43EF-B5F4-B0DA70D47940}" 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}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -109,6 +119,38 @@ Global {05128A0C-74E2-43EF-B5F4-B0DA70D47940}.Release|x64.Build.0 = Release|x64 {05128A0C-74E2-43EF-B5F4-B0DA70D47940}.Release|x86.ActiveCfg = Release|Win32 {05128A0C-74E2-43EF-B5F4-B0DA70D47940}.Release|x86.Build.0 = Release|Win32 + {8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x64.ActiveCfg = Debug|x64 + {8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x64.Build.0 = Debug|x64 + {8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x86.ActiveCfg = Debug|Win32 + {8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x86.Build.0 = Debug|Win32 + {8658F91C-9AAE-4819-9005-77D09C61D97F}.Release|x64.ActiveCfg = Release|x64 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -123,6 +165,11 @@ Global {3FC3E8B7-380E-41E6-91FF-82FA5E622D29} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {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} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8} diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index f512551..bfbf21e 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -203,6 +203,9 @@ + + {80410a0c-5592-418e-848b-fec61c432f53} + {9ee02090-c15e-4520-9c05-c435e45ef2fc} diff --git a/build/vc++/jin/jin.vcxproj b/build/vc++/jin/jin.vcxproj index 30018a7..336ab5e 100644 --- a/build/vc++/jin/jin.vcxproj +++ b/build/vc++/jin/jin.vcxproj @@ -83,14 +83,14 @@ true true false - $(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)libs\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\ + $(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\ true true Windows - $(SolutionDir)libs\SDL2-2.0.5\lib\x86;$(SolutionDir)libs\LuaJIT-2.0.5\src - SDL2main.lib;SDL2.lib;opengl32.lib;lua51.lib;%(AdditionalDependencies) + $(SolutionDir)libs\SDL2-2.0.5\lib\x86 + SDL2main.lib;SDL2.lib;opengl32.lib;%(AdditionalDependencies) @@ -99,12 +99,12 @@ Disabled true false - $(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)libs\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\ + $(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\ Windows - $(SolutionDir)libs\SDL2-2.0.5\lib\x86;$(SolutionDir)libs\LuaJIT-2.0.5\src - SDL2main.lib;SDL2.lib;opengl32.lib;lua51.lib;%(AdditionalDependencies) + $(SolutionDir)libs\SDL2-2.0.5\lib\x86 + SDL2main.lib;SDL2.lib;opengl32.lib;%(AdditionalDependencies) diff --git a/build/vc++/jin/jin.vcxproj.user b/build/vc++/jin/jin.vcxproj.user index 8790539..bfad347 100644 --- a/build/vc++/jin/jin.vcxproj.user +++ b/build/vc++/jin/jin.vcxproj.user @@ -4,4 +4,8 @@ $(ProjectDir)..\..\..\bin WindowsLocalDebugger + + $(ProjectDir)..\..\..\bin + WindowsLocalDebugger + \ No newline at end of file diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib b/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib index be22bd4..c7be727 100644 Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib and b/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib differ diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll index 8e366c2..c9edadf 100644 Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll and b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll differ diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib index cdcb9a2..36f6e7c 100644 Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib and b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib differ diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib b/build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib deleted file mode 100644 index 8a4ef15..0000000 Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib and /dev/null differ diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib b/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib index 1a4ed3f..e2b3ac3 100644 Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib and b/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib differ -- cgit v1.1-26-g67d0