From c989da318c62fa0e2d88cfaae313cc00ee337eba Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Mon, 11 Aug 2014 17:21:55 -0700 Subject: MSVC project for Dalos-cli. --- Dalos-cli.sln | 185 ++++++++++++++++++++++++++++++++++++++++ Dalos-cli.vcxproj | 210 ++++++++++++++++++++++++++++++++++++++++++++++ Dalos-cli.vcxproj.filters | 30 +++++++ LuaJIT-buildsub.bat | 116 +++++++++++++++++++++++++ LuaJIT.bat | 17 ++++ src/Dalos-cli.cc | 16 ++-- 6 files changed, 563 insertions(+), 11 deletions(-) create mode 100644 Dalos-cli.sln create mode 100644 Dalos-cli.vcxproj create mode 100644 Dalos-cli.vcxproj.filters create mode 100644 LuaJIT-buildsub.bat create mode 100644 LuaJIT.bat diff --git a/Dalos-cli.sln b/Dalos-cli.sln new file mode 100644 index 0000000..fc7c8c3 --- /dev/null +++ b/Dalos-cli.sln @@ -0,0 +1,185 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21126.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "Dalos-cli", "Dalos-cli.vcxproj", "{579CA850-21B1-11E4-8C21-0800200C9A66}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "Balau", "Balau\win32\project\Balau.vcxproj", "{6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "c-ares", "Balau\win32\project\c-ares.vcxproj", "{4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Third Party", "Third Party", "{41A44AFD-7691-46CC-BCF3-EE8AB4A1F829}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Third Party - Balau", "Third Party - Balau", "{1F771FD4-C1C7-4220-89F8-1E0D5069E205}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "zlib", "Balau\win32\project\zlib.vcxproj", "{C98A6524-5AA7-4FFD-8DDA-679A1016D185}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "iconv", "Balau\win32\project\iconv.vcxproj", "{AA262ABD-09DF-4573-BF62-81DEA60E196C}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "pthreads", "Balau\win32\project\pthreads.vcxproj", "{E5B79C22-07B5-4830-8E28-224457C0FDB8}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "tommath", "Balau\win32\project\tommath.vcxproj", "{0C334D26-6F19-4959-BB14-B4FB81099E99}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "tomcrypt", "Balau\win32\project\tomcrypt.vcxproj", "{A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}" +EndProject +Project("{36E20E70-21B1-11E4-8C21-0800200C9A66}") = "libcurl", "Balau\win32\project\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Mixed Platforms = Release|Mixed Platforms + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {579CA850-21B1-11E4-8C21-0800200C9A66}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Release|Mixed Platforms.Build.0 = Release|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {579CA850-21B1-11E4-8C21-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.Build.0 = Debug|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|x64.ActiveCfg = Debug|x64 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|x64.Build.0 = Debug|x64 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Mixed Platforms.Build.0 = Release|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.ActiveCfg = Release|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.Build.0 = Release|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|x64.ActiveCfg = Release|x64 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|x64.Build.0 = Release|x64 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Debug|Win32.ActiveCfg = Debug|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Debug|Win32.Build.0 = Debug|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Debug|x64.ActiveCfg = Debug|x64 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Debug|x64.Build.0 = Debug|x64 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Release|Mixed Platforms.Build.0 = Release|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Release|Win32.ActiveCfg = Release|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Release|Win32.Build.0 = Release|Win32 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Release|x64.ActiveCfg = Release|x64 + {6E74C651-E02E-4BEC-ADDB-7E2A79E0F6F7}.Release|x64.Build.0 = Release|x64 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Debug|Win32.Build.0 = Debug|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Debug|x64.ActiveCfg = Debug|x64 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Debug|x64.Build.0 = Debug|x64 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Release|Mixed Platforms.Build.0 = Release|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Release|Win32.ActiveCfg = Release|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Release|Win32.Build.0 = Release|Win32 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Release|x64.ActiveCfg = Release|x64 + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662}.Release|x64.Build.0 = Release|x64 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Debug|Win32.ActiveCfg = Debug|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Debug|Win32.Build.0 = Debug|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Debug|x64.ActiveCfg = Debug|x64 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Debug|x64.Build.0 = Debug|x64 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Release|Mixed Platforms.Build.0 = Release|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Release|Win32.ActiveCfg = Release|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Release|Win32.Build.0 = Release|Win32 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Release|x64.ActiveCfg = Release|x64 + {C98A6524-5AA7-4FFD-8DDA-679A1016D185}.Release|x64.Build.0 = Release|x64 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Debug|Win32.Build.0 = Debug|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Debug|x64.ActiveCfg = Debug|x64 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Debug|x64.Build.0 = Debug|x64 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Release|Mixed Platforms.Build.0 = Release|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Release|Win32.ActiveCfg = Release|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Release|Win32.Build.0 = Release|Win32 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Release|x64.ActiveCfg = Release|x64 + {AA262ABD-09DF-4573-BF62-81DEA60E196C}.Release|x64.Build.0 = Release|x64 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Debug|Win32.ActiveCfg = Debug|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Debug|Win32.Build.0 = Debug|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Debug|x64.ActiveCfg = Debug|x64 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Debug|x64.Build.0 = Debug|x64 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Release|Mixed Platforms.Build.0 = Release|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Release|Win32.ActiveCfg = Release|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Release|Win32.Build.0 = Release|Win32 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Release|x64.ActiveCfg = Release|x64 + {E5B79C22-07B5-4830-8E28-224457C0FDB8}.Release|x64.Build.0 = Release|x64 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Debug|Win32.Build.0 = Debug|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Debug|x64.ActiveCfg = Debug|x64 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Debug|x64.Build.0 = Debug|x64 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Release|Mixed Platforms.Build.0 = Release|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Release|Win32.ActiveCfg = Release|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Release|Win32.Build.0 = Release|Win32 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Release|x64.ActiveCfg = Release|x64 + {0C334D26-6F19-4959-BB14-B4FB81099E99}.Release|x64.Build.0 = Release|x64 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Debug|Win32.ActiveCfg = Debug|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Debug|Win32.Build.0 = Debug|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Debug|x64.ActiveCfg = Debug|x64 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Debug|x64.Build.0 = Debug|x64 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Release|Mixed Platforms.Build.0 = Release|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Release|Win32.ActiveCfg = Release|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Release|Win32.Build.0 = Release|Win32 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Release|x64.ActiveCfg = Release|x64 + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3}.Release|x64.Build.0 = Release|x64 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Debug|Win32.ActiveCfg = Debug|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Debug|Win32.Build.0 = Debug|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Debug|x64.ActiveCfg = Debug|x64 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Debug|x64.Build.0 = Debug|x64 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Release|Mixed Platforms.Build.0 = Release|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Release|Win32.ActiveCfg = Release|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Release|Win32.Build.0 = Release|Win32 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Release|x64.ActiveCfg = Release|x64 + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC}.Release|x64.Build.0 = Release|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|Win32.Build.0 = Debug|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|x64.ActiveCfg = Debug|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|x64.Build.0 = Debug|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|Mixed Platforms.Build.0 = Release|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|Win32.ActiveCfg = Release|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|Win32.Build.0 = Release|Win32 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.ActiveCfg = Release|x64 + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30} = {41A44AFD-7691-46CC-BCF3-EE8AB4A1F829} + {70EB01D2-EE71-4F7E-9D87-A91249F5E4AC} = {41A44AFD-7691-46CC-BCF3-EE8AB4A1F829} + {4D6AFE58-8573-4F3F-9CB7-EFF38BDC9662} = {1F771FD4-C1C7-4220-89F8-1E0D5069E205} + {C98A6524-5AA7-4FFD-8DDA-679A1016D185} = {1F771FD4-C1C7-4220-89F8-1E0D5069E205} + {AA262ABD-09DF-4573-BF62-81DEA60E196C} = {1F771FD4-C1C7-4220-89F8-1E0D5069E205} + {E5B79C22-07B5-4830-8E28-224457C0FDB8} = {1F771FD4-C1C7-4220-89F8-1E0D5069E205} + {0C334D26-6F19-4959-BB14-B4FB81099E99} = {1F771FD4-C1C7-4220-89F8-1E0D5069E205} + {A3AA0747-B12F-45BA-A1F5-0E0E6B45F3C3} = {1F771FD4-C1C7-4220-89F8-1E0D5069E205} + {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {1F771FD4-C1C7-4220-89F8-1E0D5069E205} + EndGlobalSection +EndGlobal diff --git a/Dalos-cli.vcxproj b/Dalos-cli.vcxproj new file mode 100644 index 0000000..a186041 --- /dev/null +++ b/Dalos-cli.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {579CA850-21B1-11E4-8C21-0800200C9A66} + Win32Proj + Dalos-cli + Dalos-cli + + + + Application + true + v120 + Unicode + + + Application + true + v120 + Unicode + + + Application + false + v120 + true + Unicode + + + Application + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\ + $(Platform)\$(ProjectName)\$(Configuration)\ + + + true + .exe + $(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\ + $(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;__STDC_FORMAT_MACROS;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;USE_ARES;_DEBUG;DEBUGBUILD;_CONSOLE;_LIB;%(PreprocessorDefinitions) + .;src;Dalos-modules\includes;Balau\includes;Balau\includes\msc;Balau\libev;Balau\win32;Balau\win32\pthreads-win32;Balau\win32\iconv;Balau\win32\zlib;Balau\win32\getopt;Balau\win32\regex;Balau\win32\c-ares;Balau\win32\curl\include;Balau\win32\project\curl;Balau\LuaJIT\src;Balau\src\jsoncpp\include;Balau\libtommath;Balau\libtomcrypt\src\headers;%(AdditionalIncludeDirectories) + 4290;4800;%(DisableSpecificWarnings) + $(SolutionDir)\Balau\msvc-config.h;%(ForcedIncludeFiles) + ProgramDatabase + true + + + Console + true + comctl32.lib;rpcrt4.lib;dbghelp.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51_32d.lib + (AdditionalLibraryDirectories) + + + + + NotUsing + Level3 + Disabled + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;__STDC_FORMAT_MACROS;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;USE_ARES;_DEBUG;DEBUGBUILD;_CONSOLE;_LIB;%(PreprocessorDefinitions) + .;src;Dalos-modules\includes;Balau\includes;Balau\includes\msc;Balau\libev;Balau\win32;Balau\win32\pthreads-win32;Balau\win32\iconv;Balau\win32\zlib;Balau\win32\getopt;Balau\win32\regex;Balau\win32\c-ares;Balau\win32\curl\include;Balau\win32\project\curl;Balau\LuaJIT\src;Balau\src\jsoncpp\include;Balau\libtommath;Balau\libtomcrypt\src\headers;%(AdditionalIncludeDirectories) + 4290;4800;%(DisableSpecificWarnings) + $(SolutionDir)\Balau\msvc-config.h;%(ForcedIncludeFiles) + true + + + Console + true + comctl32.lib;rpcrt4.lib;dbghelp.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51_64d.lib + %(AdditionalLibraryDirectories) + + + + + Level3 + NotUsing + MaxSpeed + true + true + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;__STDC_FORMAT_MACROS;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;USE_ARES;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + .;src;Dalos-modules\includes;Balau\includes;Balau\includes\msc;Balau\libev;Balau\win32;Balau\win32\pthreads-win32;Balau\win32\iconv;Balau\win32\zlib;Balau\win32\getopt;Balau\win32\regex;Balau\win32\c-ares;Balau\win32\curl\include;Balau\win32\project\curl;Balau\LuaJIT\src;Balau\src\jsoncpp\include;Balau\libtommath;Balau\libtomcrypt\src\headers;%(AdditionalIncludeDirectories) + 4290;4800;%(DisableSpecificWarnings) + $(SolutionDir)\Balau\msvc-config.h;%(ForcedIncludeFiles) + true + + + Console + true + true + true + comctl32.lib;rpcrt4.lib;dbghelp.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51_32r.lib + %(AdditionalLibraryDirectories) + + + + + Level3 + NotUsing + MaxSpeed + true + true + PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;__STDC_FORMAT_MACROS;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;USE_ARES;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + .;src;Dalos-modules\includes;Balau\includes;Balau\includes\msc;Balau\libev;Balau\win32;Balau\win32\pthreads-win32;Balau\win32\iconv;Balau\win32\zlib;Balau\win32\getopt;Balau\win32\regex;Balau\win32\c-ares;Balau\win32\curl\include;Balau\win32\project\curl;Balau\LuaJIT\src;Balau\src\jsoncpp\include;Balau\libtommath;Balau\libtomcrypt\src\headers;%(AdditionalIncludeDirectories) + 4290;4800;%(DisableSpecificWarnings) + $(SolutionDir)\Balau\msvc-config.h;%(ForcedIncludeFiles) + true + + + Console + true + true + true + comctl32.lib;rpcrt4.lib;dbghelp.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51_64r.lib + %(AdditionalLibraryDirectories) + + + + + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} + + + {e5b79c22-07b5-4830-8e28-224457c0fdb8} + + + {6e74c651-e02e-4bec-addb-7e2a79e0f6f7} + + + {4d6afe58-8573-4f3f-9cb7-eff38bdc9662} + + + {aa262abd-09df-4573-bf62-81dea60e196c} + + + {a3aa0747-b12f-45ba-a1f5-0e0e6b45f3c3} + + + {0c334d26-6f19-4959-bb14-b4fb81099e99} + + + {c98a6524-5aa7-4ffd-8dda-679a1016d185} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Dalos-cli.vcxproj.filters b/Dalos-cli.vcxproj.filters new file mode 100644 index 0000000..5d2f512 --- /dev/null +++ b/Dalos-cli.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {d557d81b-89dc-4275-a0f0-961b3cf41a6b} + + + {51cc51bb-e800-452c-b8d9-4dba017fe7e3} + + + + + Source + + + Source + + + Source + + + + + Headers + + + Headers + + + \ No newline at end of file diff --git a/LuaJIT-buildsub.bat b/LuaJIT-buildsub.bat new file mode 100644 index 0000000..eaae84e --- /dev/null +++ b/LuaJIT-buildsub.bat @@ -0,0 +1,116 @@ +@rem Script to build LuaJIT with MSVC. +@rem Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h +@rem +@rem Either open a "Visual Studio .NET Command Prompt" +@rem (Note that the Express Edition does not contain an x64 compiler) +@rem -or- +@rem Open a "Windows SDK Command Shell" and set the compiler environment: +@rem setenv /release /x86 +@rem -or- +@rem setenv /release /x64 +@rem +@rem Then cd to this directory and run this script. + +@if not defined INCLUDE goto :FAIL + +@setlocal +@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE +@set LJLINK=link /nologo +@set LJMT=mt /nologo +@set LJLIB=lib /nologo /nodefaultlib +@set DASMDIR=..\dynasm +@set DASM=%DASMDIR%\dynasm.lua +@set LJDLLNAME=lua51.dll +@set LJLIBNAME=lua51.lib +@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c + +%LJCOMPILE% host\minilua.c +@if errorlevel 1 goto :BAD +%LJLINK% /out:minilua.exe minilua.obj +@if errorlevel 1 goto :BAD +if exist minilua.exe.manifest^ + %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe + +@set DASMFLAGS=-D WIN -D JIT -D FFI -D P64 +@set LJARCH=x64 +@minilua +@if errorlevel 8 goto :X64 +@set DASMFLAGS=-D WIN -D JIT -D FFI +@set LJARCH=x86 +:X64 +minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc +@if errorlevel 1 goto :BAD + +%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c +@if errorlevel 1 goto :BAD +%LJLINK% /out:buildvm.exe buildvm*.obj +@if errorlevel 1 goto :BAD +if exist buildvm.exe.manifest^ + %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe + +buildvm -m peobj -o lj_vm.obj +@if errorlevel 1 goto :BAD +buildvm -m bcdef -o lj_bcdef.h %ALL_LIB% +@if errorlevel 1 goto :BAD +buildvm -m ffdef -o lj_ffdef.h %ALL_LIB% +@if errorlevel 1 goto :BAD +buildvm -m libdef -o lj_libdef.h %ALL_LIB% +@if errorlevel 1 goto :BAD +buildvm -m recdef -o lj_recdef.h %ALL_LIB% +@if errorlevel 1 goto :BAD +buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB% +@if errorlevel 1 goto :BAD +buildvm -m folddef -o lj_folddef.h lj_opt_fold.c +@if errorlevel 1 goto :BAD + +@if "%1" neq "debug" goto :NODEBUG +@shift +@set LJCOMPILE=%LJCOMPILE% /MDd /Zi +@set LJLINK=%LJLINK% /debug +@goto :COMPILE +:NODEBUG +@set LJCOMPILE=%LJCOMPILE% /MD +:COMPILE +@if "%1"=="amalg" goto :AMALGDLL +@if "%1"=="static" goto :STATIC +%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c +@if errorlevel 1 goto :BAD +%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj +@if errorlevel 1 goto :BAD +@goto :MTDLL +:STATIC +%LJCOMPILE% lj_*.c lib_*.c +@if errorlevel 1 goto :BAD +%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj +@if errorlevel 1 goto :BAD +@goto :MTDLL +:AMALGDLL +%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c +@if errorlevel 1 goto :BAD +%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj +@if errorlevel 1 goto :BAD +:MTDLL +if exist %LJDLLNAME%.manifest^ + %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 + +%LJCOMPILE% luajit.c +@if errorlevel 1 goto :BAD +%LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% +@if errorlevel 1 goto :BAD +if exist luajit.exe.manifest^ + %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe + +@del *.obj *.manifest minilua.exe buildvm.exe +@echo. +@echo === Successfully built LuaJIT for Windows/%LJARCH% === + +@goto :END +:BAD +@echo. +@echo ******************************************************* +@echo *** Build FAILED -- Please check the error messages *** +@echo ******************************************************* +@goto :END +:FAIL +@echo You must open a "Visual Studio .NET Command Prompt" to run this script +:END diff --git a/LuaJIT.bat b/LuaJIT.bat new file mode 100644 index 0000000..e51ff1f --- /dev/null +++ b/LuaJIT.bat @@ -0,0 +1,17 @@ +@echo off + +cd Balau\LuaJIT\src + +call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86 +call ..\..\..\LuaJIT-buildsub.bat static +copy lua51.lib ..\..\..\lua51_32r.lib +call ..\..\..\LuaJIT-buildsub.bat debug static +copy lua51.lib ..\..\..\lua51_32d.lib + +call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86_amd64 +call ..\..\..\LuaJIT-buildsub.bat static +copy lua51.lib ..\..\..\lua51_64r.lib +call ..\..\..\LuaJIT-buildsub.bat debug static +copy lua51.lib ..\..\..\lua51_64d.lib + +cd ..\..\.. diff --git a/src/Dalos-cli.cc b/src/Dalos-cli.cc index b331f15..f01a8de 100644 --- a/src/Dalos-cli.cc +++ b/src/Dalos-cli.cc @@ -11,16 +11,6 @@ using namespace Balau; -int getopt_flag = 0; - -struct option long_options[] = { - { "help", 0, NULL, 'h' }, - { "verbose", 0, NULL, 'v' }, - { "exec", 1, NULL, 'e' }, - { "interactive", 0, NULL, 'i' }, - { NULL, 0, NULL, 0 }, -}; - static void showhelp(const char * binname, bool longhelp) { Printer::print( "Usage:\n" @@ -62,7 +52,7 @@ void MainTask::Do() { LuaMainTask * luaMainTask = TaskMan::registerTask(new LuaMainTask); - while ((c = getopt_long(argc, argv, "Hhve:i", long_options, NULL)) != EOF) { + while ((c = getopt(argc, argv, "Hhve:i")) != EOF) { switch (c) { case 'h': case 'H': @@ -113,7 +103,11 @@ void MainTask::Do() { return; String line_read; +#ifdef _WIN32 + Readline rl("Dalos-cli", new Buffer()); +#else Readline rl("Dalos-cli", new StdIN()); +#endif for (;;) { line_read = rl.gets(); -- cgit v1.2.3