mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Switch from regular Lua to LuaJIT

Browse source
This commit is contained in:
Thomas Goyne 2014-04-27 19:45:14 -07:00
parent ec4a8c9a26
commit 63f4bf1beb
260 changed files with 108151 additions and 17196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -74,5 +74,11 @@ tools/osx-bundle-restart-helper
tools/osx-bundle.sed
tools/repack-thes-dict
tools/repack-thes-dict.dSYM
vendor/luajit/src/host/buildvm
vendor/luajit/src/host/minilua
vendor/luajit/src/jit/vmdef.lua
vendor/luajit/src/gen
vendor/luajit/src/lj_vm.s
vendor/luajit/src/luajit
.nuget

77
Aegisub.sln
View file

@ -15,6 +15,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaegisub", "build\libaegi
ProjectSection(ProjectDependencies) = postProject
{A649D828-A399-4D81-ADEF-94CFDBA7847F} = {A649D828-A399-4D81-ADEF-94CFDBA7847F}
{F934AB7B-186B-4E96-B20C-A58C38C1B818} = {F934AB7B-186B-4E96-B20C-A58C38C1B818}
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F} = {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}
{965054D2-44F2-4EB2-9879-051CC3D7EF08} = {965054D2-44F2-4EB2-9879-051CC3D7EF08}
EndProjectSection
EndProject
@ -26,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "build\libresrc\
{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} = {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "build\lua51\lua51.vcxproj", "{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luabins", "build\luabins\luabins.vcxproj", "{A7A30702-8162-4E1A-A010-EF51B590C121}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "respack", "build\respack\respack.vcxproj", "{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}"
@ -99,6 +98,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "build\tests\tests.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTasks", "build\BuildTasks\BuildTasks.csproj", "{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit-minilua", "build\luajit-minilua\luajit-minilua.vcxproj", "{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit-buildvm", "build\luajit-buildvm\luajit-buildvm.vcxproj", "{7CA6A4EB-A11B-4975-8F3A-F633111C6213}"
ProjectSection(ProjectDependencies) = postProject
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF} = {FCAED410-90EF-4EF9-916C-4B86DC13A3CF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "build\luajit\luajit.vcxproj", "{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}"
ProjectSection(ProjectDependencies) = postProject
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF} = {FCAED410-90EF-4EF9-916C-4B86DC13A3CF}
{7CA6A4EB-A11B-4975-8F3A-F633111C6213} = {7CA6A4EB-A11B-4975-8F3A-F633111C6213}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -211,20 +223,6 @@ Global
{BD00D65F-24DA-4784-8860-3B972EA125FC}.Release-MinDep|Win32.Build.0 = Release|Win32
{BD00D65F-24DA-4784-8860-3B972EA125FC}.Release-MinDep|x64.ActiveCfg = Release|x64
{BD00D65F-24DA-4784-8860-3B972EA125FC}.Release-MinDep|x64.Build.0 = Release|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|Win32.ActiveCfg = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|Win32.Build.0 = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|x64.ActiveCfg = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|x64.Build.0 = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|x64.ActiveCfg = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|x64.ActiveCfg = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|Win32.ActiveCfg = Release|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|Win32.Build.0 = Release|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|x64.ActiveCfg = Release|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|x64.Build.0 = Release|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release-MinDep|Win32.ActiveCfg = Release|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release-MinDep|x64.ActiveCfg = Release|x64
{A7A30702-8162-4E1A-A010-EF51B590C121}.Debug|Win32.ActiveCfg = Debug|Win32
{A7A30702-8162-4E1A-A010-EF51B590C121}.Debug|Win32.Build.0 = Debug|Win32
{A7A30702-8162-4E1A-A010-EF51B590C121}.Debug|x64.ActiveCfg = Debug|x64
@ -241,7 +239,6 @@ Global
{A7A30702-8162-4E1A-A010-EF51B590C121}.Release|x64.Build.0 = Release|x64
{A7A30702-8162-4E1A-A010-EF51B590C121}.Release-MinDep|Win32.ActiveCfg = Release|Win32
{A7A30702-8162-4E1A-A010-EF51B590C121}.Release-MinDep|x64.ActiveCfg = Release|x64
{A7A30702-8162-4E1A-A010-EF51B590C121}.Release-MinDep|x64.Build.0 = Release|x64
{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}.Debug|Win32.ActiveCfg = Debug|Win32
{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}.Debug|Win32.Build.0 = Debug|Win32
{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}.Debug|x64.ActiveCfg = Debug|x64
@ -411,7 +408,7 @@ Global
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|x64.ActiveCfg = Debug|x64
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug|x64.Build.0 = Debug|x64
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-MinDep|x64.ActiveCfg = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-MinDep|x64.ActiveCfg = Debug|x64
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Debug-Tests|x64.ActiveCfg = Debug|x64
{A649D828-A399-4D81-ADEF-94CFDBA7847F}.Release|Win32.ActiveCfg = Release|Win32
@ -473,6 +470,50 @@ Global
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release|x64.ActiveCfg = Release|Any CPU
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release-MinDep|Win32.ActiveCfg = Release|Any CPU
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release-MinDep|x64.ActiveCfg = Release|Any CPU
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug|Win32.ActiveCfg = Debug|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug|Win32.Build.0 = Debug|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug|x64.ActiveCfg = Debug|x64
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug|x64.Build.0 = Debug|x64
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug-MinDep|x64.ActiveCfg = Debug|x64
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Debug-Tests|x64.ActiveCfg = Debug|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Release|Win32.ActiveCfg = Release|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Release|Win32.Build.0 = Release|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Release|x64.ActiveCfg = Release|x64
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Release|x64.Build.0 = Release|x64
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Release-MinDep|Win32.ActiveCfg = Release|Win32
{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}.Release-MinDep|x64.ActiveCfg = Release|x64
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug|Win32.ActiveCfg = Debug|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug|Win32.Build.0 = Debug|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug|x64.ActiveCfg = Debug|x64
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug|x64.Build.0 = Debug|x64
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug-MinDep|x64.ActiveCfg = Debug|x64
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Debug-Tests|x64.ActiveCfg = Debug|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Release|Win32.ActiveCfg = Release|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Release|Win32.Build.0 = Release|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Release|x64.ActiveCfg = Release|x64
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Release|x64.Build.0 = Release|x64
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Release-MinDep|Win32.ActiveCfg = Release|Win32
{7CA6A4EB-A11B-4975-8F3A-F633111C6213}.Release-MinDep|x64.ActiveCfg = Release|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|Win32.ActiveCfg = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|Win32.Build.0 = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|x64.ActiveCfg = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|x64.Build.0 = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|x64.ActiveCfg = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|x64.Build.0 = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|x64.ActiveCfg = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|x64.Build.0 = Debug|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|Win32.ActiveCfg = Release|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|Win32.Build.0 = Release|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|x64.ActiveCfg = Release|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|x64.Build.0 = Release|x64
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release-MinDep|Win32.ActiveCfg = Release|Win32
{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release-MinDep|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
Makefile
View file

@ -1,7 +1,7 @@
include Makefile.inc
SUBDIRS += \
vendor/lua \
vendor/luajit \
vendor/universalchardet \
vendor/luabins \
libaegisub \

7
Makefile.inc.in
View file

@ -86,6 +86,7 @@ CFLAGS_ICU = @ICU_I18N_CFLAGS@
CFLAGS_LIBASS = @LIBASS_CFLAGS@
CFLAGS_LIBCURL = @LIBCURL_CFLAGS@
CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
CFLAGS_LUA = -I../vendor/luajit/include
CFLAGS_OPENAL = @OPENAL_CFLAGS@
CFLAGS_OSS = @OSS_CFLAGS@
CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
@ -104,12 +105,16 @@ LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
LIBS_LIBASS = @LIBASS_LIBS@
LIBS_LIBCURL = @LIBCURL_LIBS@
LIBS_LIBPULSE = @LIBPULSE_LIBS@
LIBS_LUA = ../vendor/lua/liblua-aegisub.a
LIBS_LUA = ../vendor/luajit/src/libluajit.a
LIBS_OPENAL = @OPENAL_LIBS@
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
LIBS_PTHREAD = @PTHREAD_LIBS@
LIBS_UCHARDET ?= ../vendor/universalchardet/libuniversalchardet.a
ifeq (yes, $(BUILD_DARWIN))
LIBS_LUA = ../vendor/luajit/src/libluajit-aegisub.so
endif
#####################
# DEBUG / DEVELOPMENT
#####################

6
Makefile.target
View file

@ -21,7 +21,7 @@ DEP = $(addsuffix .d, $(basename $(SRC)))
ifeq (yes, $(BUILD_DARWIN))
CFLAGS += -mmacosx-version-min=10.7 -gfull
CXXFLAGS += -mmacosx-version-min=10.7 -gfull
LDFLAGS += -mmacosx-version-min=10.7 -Wl,-dead_strip
LDFLAGS += -mmacosx-version-min=10.7 -Wl,-dead_strip -pagezero_size 10000 -image_base 100000000
LIB_SHARED_LINK = $(LIB_SHARED_LINK_OSX)
endif
@ -139,8 +139,8 @@ $(SUBDIRS):
$(MAKE) -C $@ $(MAKECMDGOALS)
# Set relations to ensure dependencies are built before their targets during parallel builds.
automation: libaegisub vendor/lua
src: vendor/universalchardet vendor/lua tools libaegisub
automation: libaegisub vendor/luajit
src: vendor/universalchardet vendor/luajit tools libaegisub
tests: libaegisub
tools: libaegisub
reporter: src

6
automation/Makefile
View file

@ -4,10 +4,10 @@ PRECOMPILED_HEADER_NAME = ../libaegisub/lagi_pre.h
PROGRAM = aegisub-lua
CXXFLAGS += -I../libaegisub/include -I../src -I.. -I../vendor/lua/src $(CXXFLAGS_WX)
CPPFLAGS += $(CPPFLAGS_BOOST)
CXXFLAGS += -I../libaegisub/include -I../src -I.. $(CXXFLAGS_WX)
CPPFLAGS += $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
LIBS := -L../libaegisub -laegisub -L../vendor/lua -llua-aegisub $(LIBS)
LIBS := -L../libaegisub -laegisub $(LIBS_LUA) $(LIBS)
LIBS += ../vendor/luabins/libluabins.a
LIBS += $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)

1
automation/tests/aegisub.cpp
View file

@ -42,7 +42,6 @@ int main(int argc, char **argv) {
lua_State *L = lua_open();
agi::lua::preload_modules(L);
Install(L, {"include"});
push_value(L, luaopen_debug); lua_call(L, 0, 0);
// Build arg table for scripts
lua_createtable(L, argc - 1, 0);

6
build/Aegisub/Aegisub.vcxproj
View file

@ -78,12 +78,12 @@
<ProjectReference Include="..\libresrc\libresrc.vcxproj">
<Project>{bd00d65f-24da-4784-8860-3b972ea125fc}</Project>
</ProjectReference>
<ProjectReference Include="..\lua51\lua51.vcxproj">
<Project>{5391a8b1-9c70-4dc4-92ad-d3e34c6b803f}</Project>
</ProjectReference>
<ProjectReference Include="..\luabins\luabins.vcxproj">
<Project>{A7A30702-8162-4E1A-A010-EF51B590C121}</Project>
</ProjectReference>
<ProjectReference Include="..\luajit\luajit.vcxproj">
<Project>{5391a8b1-9c70-4dc4-92ad-d3e34c6b803f}</Project>
</ProjectReference>
<ProjectReference Include="..\universalchardet\universalchardet.vcxproj">
<Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project>
</ProjectReference>

89
build/lua51/lua51.vcxproj
View file

@ -1,89 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}</ProjectGuid>
<RootNamespace>lua51</RootNamespace>
</PropertyGroup>
<!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>lib</AegisubProjectType>
<SrcDir>..\..\vendor\lua\src\</SrcDir>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
<!-- Project specific configuration -->
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<!-- Source files -->
<ItemGroup>
<ClCompile Include="$(SrcDir)lapi.c" />
<ClCompile Include="$(SrcDir)lauxlib.c" />
<ClCompile Include="$(SrcDir)lbaselib.c" />
<ClCompile Include="$(SrcDir)lcode.c" />
<ClCompile Include="$(SrcDir)ldblib.c" />
<ClCompile Include="$(SrcDir)ldebug.c" />
<ClCompile Include="$(SrcDir)ldo.c" />
<ClCompile Include="$(SrcDir)ldump.c" />
<ClCompile Include="$(SrcDir)lfunc.c" />
<ClCompile Include="$(SrcDir)lgc.c" />
<ClCompile Include="$(SrcDir)linit.c" />
<ClCompile Include="$(SrcDir)liolib.c" />
<ClCompile Include="$(SrcDir)llex.c" />
<ClCompile Include="$(SrcDir)lmathlib.c" />
<ClCompile Include="$(SrcDir)lmem.c" />
<ClCompile Include="$(SrcDir)loadlib.c" />
<ClCompile Include="$(SrcDir)lobject.c" />
<ClCompile Include="$(SrcDir)lopcodes.c" />
<ClCompile Include="$(SrcDir)loslib.c" />
<ClCompile Include="$(SrcDir)lparser.c" />
<ClCompile Include="$(SrcDir)lstate.c" />
<ClCompile Include="$(SrcDir)lstring.c" />
<ClCompile Include="$(SrcDir)lstrlib.c" />
<ClCompile Include="$(SrcDir)ltable.c" />
<ClCompile Include="$(SrcDir)ltablib.c" />
<ClCompile Include="$(SrcDir)ltm.c" />
<ClCompile Include="$(SrcDir)lundump.c" />
<ClCompile Include="$(SrcDir)lvm.c" />
<ClCompile Include="$(SrcDir)lzio.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)lapi.h" />
<ClInclude Include="$(SrcDir)lauxlib.h" />
<ClInclude Include="$(SrcDir)lcode.h" />
<ClInclude Include="$(SrcDir)ldebug.h" />
<ClInclude Include="$(SrcDir)ldo.h" />
<ClInclude Include="$(SrcDir)lfunc.h" />
<ClInclude Include="$(SrcDir)lgc.h" />
<ClInclude Include="$(SrcDir)llex.h" />
<ClInclude Include="$(SrcDir)llimits.h" />
<ClInclude Include="$(SrcDir)lmem.h" />
<ClInclude Include="$(SrcDir)lobject.h" />
<ClInclude Include="$(SrcDir)lopcodes.h" />
<ClInclude Include="$(SrcDir)lparser.h" />
<ClInclude Include="$(SrcDir)lstate.h" />
<ClInclude Include="$(SrcDir)lstring.h" />
<ClInclude Include="$(SrcDir)ltable.h" />
<ClInclude Include="$(SrcDir)ltm.h" />
<ClInclude Include="$(SrcDir)lua.h" />
<ClInclude Include="$(SrcDir)luaconf.h" />
<ClInclude Include="$(SrcDir)lualib.h" />
<ClInclude Include="$(SrcDir)lundump.h" />
<ClInclude Include="$(SrcDir)lvm.h" />
<ClInclude Include="$(SrcDir)lzio.h" />
</ItemGroup>
<Target Name="CopyHeaders" BeforeTargets="Build">
<Copy
SourceFiles="$(SrcDir)lua.h;$(SrcDir)lualib.h;$(SrcDir)lauxlib.h;$(SrcDir)luaconf.h;$(SrcDir)lua.hpp"
DestinationFolder="$(AegisubSourceBase)include"
SkipUnchangedFiles="true"
/>
</Target>
</Project>

177
build/lua51/lua51.vcxproj.filters
View file

@ -1,177 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Internal headers">
<UniqueIdentifier>{dfbe0704-0805-42a9-b221-0eb02d38e473}</UniqueIdentifier>
</Filter>
<Filter Include="Headers">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
</Filter>
<Filter Include="Core">
<UniqueIdentifier>{46f51bca-6fac-4e83-b18b-5e8145f11f3c}</UniqueIdentifier>
</Filter>
<Filter Include="Standard library">
<UniqueIdentifier>{947aec3e-b05b-404f-bd0d-27dfec92f4d0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(SrcDir)lapi.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lcode.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)ldo.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)ldump.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lfunc.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lgc.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)linit.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)llex.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lmem.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lobject.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lopcodes.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lparser.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lstate.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lstring.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)ldebug.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)ltable.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)ltm.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lundump.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lvm.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lzio.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lbaselib.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)ltablib.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)ldblib.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)liolib.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lmathlib.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)loslib.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lstrlib.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)loadlib.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)lauxlib.c">
<Filter>Standard library</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)lauxlib.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lua.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)luaconf.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lualib.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lapi.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lcode.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)ldebug.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)ldo.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lfunc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lgc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)llex.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)llimits.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lmem.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lobject.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lopcodes.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lparser.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lstring.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lstate.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)ltable.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)ltm.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lundump.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lvm.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)lzio.h">
<Filter>Internal headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

76
build/luajit-buildvm/luajit-buildvm.vcxproj Normal file
View file

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{7CA6A4EB-A11B-4975-8F3A-F633111C6213}</ProjectGuid>
<RootNamespace>luajitbuildvm</RootNamespace>
</PropertyGroup>
<!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>exe</AegisubProjectType>
<SrcDir>..\..\vendor\luajit\</SrcDir>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
<!-- Project specific configuration -->
<PropertyGroup>
<OutDir>$(ProjectDir)</OutDir>
<TargetName>luajit-buildvm$(AegisubPlatformSuffix)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>
$(AegisubObjectDir);
$(SrcDir)dynasm;
$(SrcDir)src;
$(SrcDir)src/host;
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<!-- Build buildvm_arch.h -->
<PropertyGroup>
<MiniLuaCommand>$(AegisubBinaryDir)luajit-minilua$(AegisubPlatformSuffix)</MiniLuaCommand>
<MiniLuaPlat Condition="'$(Platform)'=='x64'">-D P64</MiniLuaPlat>
<MiniLuaPlat Condition="'$(Platform)'!='x64'"></MiniLuaPlat>
</PropertyGroup>
<Target
Name="MiniLua"
BeforeTargets="ClCompile"
DependsOnTargets="PrepareForBuild"
Inputs="$(SrcDir)dynasm\dynasm.lua"
Outputs="$(AegisubObjectDir)buildvm_arch.h"
>
<Exec
Command="$(MiniLuaCommand) ..\dynasm\dynasm.lua -LN -D WIN -D JIT -D FFI $(MiniLuaPlatform) -o $(AegisubObjectDir)buildvm_arch.h vm_x86.dasc"
WorkingDirectory="$(SrcDir)src"
/>
</Target>
<!-- Source files -->
<ItemGroup>
<ClCompile Include="$(SrcDir)src\host\buildvm.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_asm.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_fold.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_lib.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_peobj.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)src\host\buildvm.h" />
<ClInclude Include="$(AegisubObjectDir)buildvm_arch.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\luajit-minilua\luajit-minilua.vcxproj">
<Project>{fcaed410-90ef-4ef9-916c-4b86dc13a3cf}</Project>
</ProjectReference>
</ItemGroup>
</Project>

14
build/luajit-buildvm/luajit-buildvm.vcxproj.filters Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="$(SrcDir)src\host\buildvm.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_asm.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_fold.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_lib.c" />
<ClCompile Include="$(SrcDir)src\host\buildvm_peobj.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)src\host\buildvm.h" />
<ClInclude Include="$(SrcDir)src\host\buildvm_arch.h" />
</ItemGroup>
</Project>

35
build/luajit-minilua/luajit-minilua.vcxproj Normal file
View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{FCAED410-90EF-4EF9-916C-4B86DC13A3CF}</ProjectGuid>
<RootNamespace>luajitminilua</RootNamespace>
</PropertyGroup>
<!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>exe</AegisubProjectType>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
<!-- Project specific configuration -->
<PropertyGroup>
<OutDir>$(ProjectDir)</OutDir>
<TargetName>luajit-minilua$(AegisubPlatformSuffix)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<!-- Source file -->
<ItemGroup>
<ClCompile Include="..\..\vendor\luajit\src\host\minilua.c" />
</ItemGroup>
</Project>

6
build/luajit-minilua/luajit-minilua.vcxproj.filters Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\vendor\luajit\src\host\minilua.c" />
</ItemGroup>
</Project>

332
build/luajit/luajit.vcxproj Normal file
View file

@ -0,0 +1,332 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}</ProjectGuid>
<RootNamespace>luajit</RootNamespace>
</PropertyGroup>
<!-- Aegisub project configuration -->
<PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>lib</AegisubProjectType>
<SrcDir>..\..\vendor\luajit\</SrcDir>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
<!-- Project specific configuration -->
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(AegisubObjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<!-- BuildVM stuff -->
<PropertyGroup>
<BuildVMCommand>$(AegisubBinaryDir)luajit-buildvm$(AegisubPlatformSuffix)</BuildVMCommand>
<AllLib>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</AllLib>
</PropertyGroup>
<Target
Name="BuildVM" BeforeTargets="ClCompile" DependsOnTargets="PrepareForBuild"
Inputs="$(SrcDir)src\lib_base.c;$(SrcDir)src\lib_math.c;$(SrcDir)src\lib_bit.c;$(SrcDir)src\lib_string.c;$(SrcDir)src\lib_table.c;$(SrcDir)src\lib_io.c;$(SrcDir)src\lib_os.c;$(SrcDir)src\lib_package.c;$(SrcDir)src\lib_debug.c;$(SrcDir)src\lib_jit.c;$(SrcDir)src\lib_ffi.c;$(SrcDir)src\lj_opt_fold.c"
Outputs="$(AegisubObjectDir)lj_bcdef.h;$(AegisubObjectDir)lj_vm.obj"
>
<Exec Command="$(BuildVMCommand) -m peobj -o lj_vm.obj" WorkingDirectory="$(AegisubObjectDir)" />
<Exec Command="$(BuildVMCommand) -m bcdef -o $(AegisubObjectDir)lj_bcdef.h $(AllLib)" WorkingDirectory="$(SrcDir)src" />
<Exec Command="$(BuildVMCommand) -m ffdef -o $(AegisubObjectDir)lj_ffdef.h $(AllLib)" WorkingDirectory="$(SrcDir)src" />
<Exec Command="$(BuildVMCommand) -m libdef -o $(AegisubObjectDir)lj_libdef.h $(AllLib)" WorkingDirectory="$(SrcDir)src" />
<Exec Command="$(BuildVMCommand) -m recdef -o $(AegisubObjectDir)lj_recdef.h $(AllLib)" WorkingDirectory="$(SrcDir)src" />
<Exec Command="$(BuildVMCommand) -m folddef -o $(AegisubObjectDir)lj_folddef.h lj_opt_fold.c" WorkingDirectory="$(SrcDir)src" />
</Target>
<!-- Source files -->
<ItemGroup>
<InstallHeader Include="$(SrcDir)\include\*.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(SrcDir)src\ljamalg.c" />
<ClCompile Include="$(SrcDir)src\lib_aux.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_base.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_bit.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_debug.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_ffi.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_init.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_io.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_jit.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_math.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_os.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_package.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_string.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_table.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_alloc.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_api.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_asm.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_bc.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_bcread.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_bcwrite.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_carith.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ccall.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ccallback.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_cconv.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_cdata.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_char.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_clib.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_cparse.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_crecord.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ctype.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_debug.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_dispatch.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_err.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ffrecord.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_func.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_gc.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_gdbjit.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ir.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_lex.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_lib.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_load.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_mcode.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_meta.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_obj.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_dce.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_fold.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_loop.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_mem.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_narrow.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_sink.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_split.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_parse.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_record.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_snap.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_state.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_str.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_strscan.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_tab.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_trace.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_udata.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_vmevent.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_vmmath.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)include\lauxlib.h" />
<ClInclude Include="$(SrcDir)include\lua.h" />
<ClInclude Include="$(SrcDir)include\lua.hpp" />
<ClInclude Include="$(SrcDir)include\luaconf.h" />
<ClInclude Include="$(SrcDir)include\luajit.h" />
<ClInclude Include="$(SrcDir)include\lualib.h" />
<ClInclude Include="$(SrcDir)src\lj_alloc.h" />
<ClInclude Include="$(SrcDir)src\lj_arch.h" />
<ClInclude Include="$(SrcDir)src\lj_asm.h" />
<ClInclude Include="$(SrcDir)src\lj_asm_arm.h" />
<ClInclude Include="$(SrcDir)src\lj_asm_mips.h" />
<ClInclude Include="$(SrcDir)src\lj_asm_ppc.h" />
<ClInclude Include="$(SrcDir)src\lj_asm_x86.h" />
<ClInclude Include="$(SrcDir)src\lj_bc.h" />
<ClInclude Include="$(SrcDir)src\lj_bcdef.h" />
<ClInclude Include="$(SrcDir)src\lj_bcdump.h" />
<ClInclude Include="$(SrcDir)src\lj_carith.h" />
<ClInclude Include="$(SrcDir)src\lj_ccall.h" />
<ClInclude Include="$(SrcDir)src\lj_ccallback.h" />
<ClInclude Include="$(SrcDir)src\lj_cconv.h" />
<ClInclude Include="$(SrcDir)src\lj_cdata.h" />
<ClInclude Include="$(SrcDir)src\lj_char.h" />
<ClInclude Include="$(SrcDir)src\lj_clib.h" />
<ClInclude Include="$(SrcDir)src\lj_cparse.h" />
<ClInclude Include="$(SrcDir)src\lj_crecord.h" />
<ClInclude Include="$(SrcDir)src\lj_ctype.h" />
<ClInclude Include="$(SrcDir)src\lj_debug.h" />
<ClInclude Include="$(SrcDir)src\lj_def.h" />
<ClInclude Include="$(SrcDir)src\lj_dispatch.h" />
<ClInclude Include="$(SrcDir)src\lj_emit_arm.h" />
<ClInclude Include="$(SrcDir)src\lj_emit_mips.h" />
<ClInclude Include="$(SrcDir)src\lj_emit_ppc.h" />
<ClInclude Include="$(SrcDir)src\lj_emit_x86.h" />
<ClInclude Include="$(SrcDir)src\lj_err.h" />
<ClInclude Include="$(SrcDir)src\lj_errmsg.h" />
<ClInclude Include="$(SrcDir)src\lj_ff.h" />
<ClInclude Include="$(SrcDir)src\lj_ffdef.h" />
<ClInclude Include="$(SrcDir)src\lj_ffrecord.h" />
<ClInclude Include="$(SrcDir)src\lj_folddef.h" />
<ClInclude Include="$(SrcDir)src\lj_frame.h" />
<ClInclude Include="$(SrcDir)src\lj_func.h" />
<ClInclude Include="$(SrcDir)src\lj_gc.h" />
<ClInclude Include="$(SrcDir)src\lj_gdbjit.h" />
<ClInclude Include="$(SrcDir)src\lj_ir.h" />
<ClInclude Include="$(SrcDir)src\lj_ircall.h" />
<ClInclude Include="$(SrcDir)src\lj_iropt.h" />
<ClInclude Include="$(SrcDir)src\lj_jit.h" />
<ClInclude Include="$(SrcDir)src\lj_lex.h" />
<ClInclude Include="$(SrcDir)src\lj_lib.h" />
<ClInclude Include="$(SrcDir)src\lj_libdef.h" />
<ClInclude Include="$(SrcDir)src\lj_mcode.h" />
<ClInclude Include="$(SrcDir)src\lj_meta.h" />
<ClInclude Include="$(SrcDir)src\lj_obj.h" />
<ClInclude Include="$(SrcDir)src\lj_parse.h" />
<ClInclude Include="$(SrcDir)src\lj_recdef.h" />
<ClInclude Include="$(SrcDir)src\lj_record.h" />
<ClInclude Include="$(SrcDir)src\lj_snap.h" />
<ClInclude Include="$(SrcDir)src\lj_state.h" />
<ClInclude Include="$(SrcDir)src\lj_str.h" />
<ClInclude Include="$(SrcDir)src\lj_strscan.h" />
<ClInclude Include="$(SrcDir)src\lj_tab.h" />
<ClInclude Include="$(SrcDir)src\lj_target.h" />
<ClInclude Include="$(SrcDir)src\lj_target_arm.h" />
<ClInclude Include="$(SrcDir)src\lj_target_mips.h" />
<ClInclude Include="$(SrcDir)src\lj_target_ppc.h" />
<ClInclude Include="$(SrcDir)src\lj_target_x86.h" />
<ClInclude Include="$(SrcDir)src\lj_trace.h" />
<ClInclude Include="$(SrcDir)src\lj_traceerr.h" />
<ClInclude Include="$(SrcDir)src\lj_udata.h" />
<ClInclude Include="$(SrcDir)src\lj_vm.h" />
<ClInclude Include="$(SrcDir)src\lj_vmevent.h" />
</ItemGroup>
<ItemGroup>
<Lib Include="$(AegisubObjectDir)lj_vm.obj" />
</ItemGroup>
<ItemGroup>
<None Include="$(SrcDir)src\jit\bc.lua" />
<None Include="$(SrcDir)src\jit\bcsave.lua" />
<None Include="$(SrcDir)src\jit\dis_arm.lua" />
<None Include="$(SrcDir)src\jit\dis_mips.lua" />
<None Include="$(SrcDir)src\jit\dis_mipsel.lua" />
<None Include="$(SrcDir)src\jit\dis_ppc.lua" />
<None Include="$(SrcDir)src\jit\dis_x64.lua" />
<None Include="$(SrcDir)src\jit\dis_x86.lua" />
<None Include="$(SrcDir)src\jit\dump.lua" />
<None Include="$(SrcDir)src\jit\v.lua" />
<None Include="$(SrcDir)src\jit\vmdef.lua" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\luajit-buildvm\luajit-buildvm.vcxproj">
<Project>{7ca6a4eb-a11b-4975-8f3a-f633111c6213}</Project>
</ProjectReference>
</ItemGroup>
</Project>

456
build/luajit/luajit.vcxproj.filters Normal file
View file

@ -0,0 +1,456 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Internal headers">
<UniqueIdentifier>{dfbe0704-0805-42a9-b221-0eb02d38e473}</UniqueIdentifier>
</Filter>
<Filter Include="Headers">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
</Filter>
<Filter Include="Core">
<UniqueIdentifier>{46f51bca-6fac-4e83-b18b-5e8145f11f3c}</UniqueIdentifier>
</Filter>
<Filter Include="Standard library">
<UniqueIdentifier>{947aec3e-b05b-404f-bd0d-27dfec92f4d0}</UniqueIdentifier>
</Filter>
<Filter Include="JIT">
<UniqueIdentifier>{5877d6d7-abc5-4e4d-9c16-64ae7538072e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(SrcDir)src\ljamalg.c" />
<ClCompile Include="$(SrcDir)src\lib_aux.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_base.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_bit.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_debug.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_ffi.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_init.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_io.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_jit.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_math.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_os.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_package.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_string.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lib_table.c">
<Filter>Standard library</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_alloc.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_api.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_asm.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_bc.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_bcread.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_bcwrite.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_carith.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ccall.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ccallback.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_cconv.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_cdata.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_char.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_clib.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_cparse.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_crecord.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ctype.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_debug.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_dispatch.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_err.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ffrecord.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_func.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_gc.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_gdbjit.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_ir.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_lex.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_lib.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_load.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_mcode.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_meta.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_obj.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_dce.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_fold.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_loop.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_mem.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_narrow.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_sink.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_opt_split.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_parse.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_record.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_snap.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_state.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_str.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_strscan.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_tab.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_trace.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_udata.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_vmevent.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)src\lj_vmmath.c">
<Filter>Core</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SrcDir)include\lauxlib.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)include\lua.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)include\lua.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)include\luaconf.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)include\luajit.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)include\lualib.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_alloc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_arch.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_asm.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_asm_arm.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_asm_mips.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_asm_ppc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_asm_x86.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_bc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_bcdef.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_bcdump.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_carith.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ccall.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ccallback.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_cconv.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_cdata.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_char.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_clib.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_cparse.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_crecord.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ctype.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_debug.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_def.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_dispatch.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_emit_arm.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_emit_mips.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_emit_ppc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_emit_x86.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_err.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_errmsg.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ff.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ffdef.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ffrecord.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_folddef.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_frame.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_func.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_gc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_gdbjit.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ir.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_ircall.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_iropt.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_jit.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_lex.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_lib.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_libdef.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_mcode.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_meta.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_obj.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_parse.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_recdef.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_record.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_snap.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_state.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_str.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_strscan.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_tab.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_target.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_target_arm.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_target_mips.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_target_ppc.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_target_x86.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_trace.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_traceerr.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_udata.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_vm.h">
<Filter>Internal headers</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)src\lj_vmevent.h">
<Filter>Internal headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="$(SrcDir)src\jit\bc.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\bcsave.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\dis_arm.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\dis_mips.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\dis_mipsel.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\dis_ppc.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\dis_x64.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\dis_x86.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\dump.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\v.lua">
<Filter>JIT</Filter>
</None>
<None Include="$(SrcDir)src\jit\vmdef.lua">
<Filter>JIT</Filter>
</None>
</ItemGroup>
</Project>

1
configure.ac
View file

@ -187,6 +187,7 @@ AS_IF([test x$with_libc__ != xno], [
# Check Headers / Features / Libraries
######################################
AC_CHECK_LIB([m], [main])
AC_CHECK_LIB([dl], [dlclose])
AC_CHECK_HEADERS([sys/time.h])
AC_ARG_ENABLE(sanity-checks,

3
libaegisub/Makefile
View file

@ -3,7 +3,7 @@ include ../Makefile.inc
LIB = libaegisub.a
CXXFLAGS += -Iinclude -I../src -I.. -fPIC
CPPFLAGS += $(CPPFLAGS_BOOST)
CPPFLAGS += $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
PRECOMPILED_HEADER_NAME = lagi_pre.h
lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS)
@ -11,7 +11,6 @@ lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS)
common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV)
common/parser.o: CXXFLAGS += -ftemplate-depth=256
unix/path.o: CXXFLAGS += -DP_DATA=\"$(P_DATA)\" -DP_DOC=\"$(P_DOC)\" -DP_LOCALE=\"$(P_LOCALE)\"
lua/**/*.o: CPPFLAGS += -I../vendor/lua/src
SRC += \
common/parser.cpp \

8
libaegisub/lua/modules.cpp
View file

@ -27,13 +27,7 @@ namespace agi { namespace lua {
int regex_init(lua_State *L);
void preload_modules(lua_State *L) {
push_value(L, luaopen_base); lua_call(L, 0, 0);
push_value(L, luaopen_io); lua_call(L, 0, 0);
push_value(L, luaopen_math); lua_call(L, 0, 0);
push_value(L, luaopen_os); lua_call(L, 0, 0);
push_value(L, luaopen_package); lua_call(L, 0, 0);
push_value(L, luaopen_string); lua_call(L, 0, 0);
push_value(L, luaopen_table); lua_call(L, 0, 0);
luaL_openlibs(L);
lua_getglobal(L, "package");
lua_getfield(L, -1, "preload");

6
libaegisub/lua/script_reader.cpp
View file

@ -38,12 +38,6 @@ namespace agi { namespace lua {
auto buff = file.read();
size_t size = static_cast<size_t>(file.size());
// Discard the BOM if present
if (size >= 3 && buff[0] == -17 && buff[1] == -69 && buff[2] == -65) {
buff += 3;
size -= 3;
}
if (!agi::fs::HasExtension(filename, "moon"))
return luaL_loadbuffer(L, buff, size, filename.string().c_str()) == 0;

7
src/Makefile
View file

@ -10,11 +10,10 @@ AEGISUB_CFLAGS = -I. -I.. -Iinclude -I../libaegisub/include -I../build -DAEGISUB
CFLAGS += $(AEGISUB_CFLAGS)
CXXFLAGS += $(AEGISUB_CFLAGS) -D__STDC_FORMAT_MACROS $(CXXFLAGS_WX)
LIBS := -L../libaegisub -laegisub $(LIBS)
LIBS := -L../libaegisub -laegisub $(LIBS_LUA) $(LIBS)
LIBS += $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE)
LIBS += $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_UCHARDET) $(LIBS_BOOST)
LIBS += $(LIBS_ICU) $(LIBS_LUA)
LIBS += ../vendor/luabins/libluabins.a
LIBS += $(LIBS_ICU) ../vendor/luabins/libluabins.a
ifeq (yes, $(BUILD_DARWIN))
SRC += osx_utils.mm retina_helper.mm
@ -106,7 +105,7 @@ charset_detect.o: CXXFLAGS += -D_X86_
font_file_lister_fontconfig.o: CXXFLAGS += $(CFLAGS_FONTCONFIG)
text_file_reader.o: CXXFLAGS += -D_X86_
video_provider_manager.o: CXXFLAGS += $(CFLAGS_FFMS2)
auto4_lua.o auto4_lua_assfile.o auto4_lua_dialog.o auto4_lua_progresssink.o: CPPFLAGS += -I../vendor/lua/src
auto4_lua.o auto4_lua_assfile.o auto4_lua_dialog.o auto4_lua_progresssink.o: CPPFLAGS += -I../vendor/luajit/include