Skip to content

Commit acb9257

Browse files
nicolasnoblenicolasnoble
authored
Merge pull request #1852 from nicolasnoble/luajit-bump
Bumping LuaJIT to current latest.
2 parents faee806 + 54e32d5 commit acb9257

33 files changed

+55
-48
lines changed

‎Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ $(TARGET): $(OBJECTS)
259259
%.o: %.mm
260260
$(CC) -c -o $@ $< $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CFLAGS)
261261

262-
%.dep: %.c
262+
%.dep: third_party/luajit/src/luajit.h %.c
263263
$(CC) $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CFLAGS) -M -MT $(addsuffix .o, $(basename $@)) -MF $@ $<
264264

265-
%.dep: %.cc
265+
%.dep: third_party/luajit/src/luajit.h %.cc
266266
$(CXX) $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CXXFLAGS) -M -MT $(addsuffix .o, $(basename $@)) -MF $@ $<
267267

268-
%.dep: %.cpp
268+
%.dep: third_party/luajit/src/luajit.h %.cpp
269269
$(CXX) $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CXXFLAGS) -M -MT $(addsuffix .o, $(basename $@)) -MF $@ $<
270270

271271
clean:
@@ -329,3 +329,7 @@ endif
329329
endif
330330
endif
331331
endif
332+
333+
third_party/luajit/src/lua.hpp: third_party/luajit/src/luajit.h
334+
335+
third_party/luajit/src/luajit.h: third_party/luajit/src/libluajit.a

‎src/core/pcsxffi.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,5 +227,6 @@ PCSX = {
227227

228228
print = function(...) printLike(function(s) C.luaMessage(s, false) end, ...) end
229229
printError = function(...) printLike(function(s) C.luaMessage(s, true) end, ...) end
230+
bit.extract = function(x, n, w) return bit.rshift(bit.band(x, bit.lshift(1, w) - 1), n) end
230231

231232
-- )EOF"

‎third_party/luajit

Submodule luajit updated 221 files

‎vsprojects/Lua/Lua.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@
172172
</ItemDefinitionGroup>
173173
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
174174
<ImportGroup Label="ExtensionTargets">
175-
<Import Project="..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" />
176175
<Import Project="..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets" Condition="Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" />
176+
<Import Project="..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
177177
</ImportGroup>
178178
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
179179
<PropertyGroup>
180180
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
181181
</PropertyGroup>
182-
<Error Condition="!Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets'))" />
183182
<Error Condition="!Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets'))" />
183+
<Error Condition="!Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
184184
</Target>
185185
</Project>

‎vsprojects/Lua/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="libFFmpeg-lite.lgpl2.native" version="5.1.3" targetFramework="native" />
4-
<package id="luajit.native" version="2.1.0-beta3d" targetFramework="native" />
4+
<package id="luajit.native" version="2.1.1739213504" targetFramework="native" />
55
</packages>

‎vsprojects/SPU/SPU.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@
140140
</ItemGroup>
141141
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
142142
<ImportGroup Label="ExtensionTargets">
143-
<Import Project="..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" />
143+
<Import Project="..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
144144
</ImportGroup>
145145
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
146146
<PropertyGroup>
147147
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
148148
</PropertyGroup>
149-
<Error Condition="!Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets'))" />
149+
<Error Condition="!Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
150150
</Target>
151151
</Project>

‎vsprojects/SPU/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="luajit.native" version="2.1.0-beta3d" targetFramework="native" />
3+
<package id="luajit.native" version="2.1.1739213504" targetFramework="native" />
44
</packages>

‎vsprojects/cdrom/cdrom.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,14 @@
189189
</ItemGroup>
190190
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
191191
<ImportGroup Label="ExtensionTargets">
192-
<Import Project="..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" />
193192
<Import Project="..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets" Condition="Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" />
193+
<Import Project="..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
194194
</ImportGroup>
195195
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
196196
<PropertyGroup>
197197
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
198198
</PropertyGroup>
199-
<Error Condition="!Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets'))" />
200199
<Error Condition="!Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets'))" />
200+
<Error Condition="!Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
201201
</Target>
202202
</Project>

‎vsprojects/cdrom/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="libFFmpeg-lite.lgpl2.native" version="5.1.3" targetFramework="native" />
4-
<package id="luajit.native" version="2.1.0-beta3d" targetFramework="native" />
4+
<package id="luajit.native" version="2.1.1739213504" targetFramework="native" />
55
</packages>

‎vsprojects/core/core.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@
233233
</ItemGroup>
234234
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
235235
<ImportGroup Label="ExtensionTargets">
236-
<Import Project="..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" />
237236
<Import Project="..\packages\glfw.3.4.0\build\native\glfw.targets" Condition="Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" />
237+
<Import Project="..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
238238
</ImportGroup>
239239
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
240240
<PropertyGroup>
241241
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
242242
</PropertyGroup>
243-
<Error Condition="!Exists('..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.0-beta3d\build\native\luajit.native.targets'))" />
244243
<Error Condition="!Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glfw.3.4.0\build\native\glfw.targets'))" />
244+
<Error Condition="!Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
245245
</Target>
246246
</Project>

0 commit comments

Comments
 (0)