PS4/PS5: Fix build scripts.

Thanks to Mathias Westerdahl.

diff --git a/src/ps4build.bat b/src/ps4build.bat
index fdd09d812bde57aee3c73716fc2f4680304ed22b..034e2c8756b430d3fbaa01cc16ece5932da649cc 100644 (file)
--- a/src/ps4build.bat
+++ b/src/ps4build.bat
@@ -51,7 +51,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%\r
 @if errorlevel 1 goto :BAD\r
 \r
-%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_NO_UNWIND host\buildvm*.c\r
+%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -DLUAJIT_NO_UNWIND host\buildvm*.c\r
 @if errorlevel 1 goto :BAD\r
 %LJLINK% /out:buildvm.exe buildvm*.obj\r
 @if errorlevel 1 goto :BAD\r
@@ -78,7 +78,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @set LJLIB="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-ar" rcus\r
 @set INCLUDE=""\r
 \r
-orbis-as -o lj_vm.o lj_vm.s\r
+"%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-as" -o lj_vm.o lj_vm.s\r
 \r
 @if "%1" neq "debug" goto :NODEBUG\r
 @shift\r

diff --git a/src/ps5build.bat b/src/ps5build.bat
index 0b1ebd5b4986e58228e6dd5a96cf4507bc5cac00..56818c2eceb2ea96151409e0d95c658b26b59939 100644 (file)
--- a/src/ps5build.bat
+++ b/src/ps5build.bat
@@ -74,11 +74,11 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @if errorlevel 1 goto :BAD\r
 \r
 @rem ---- Cross compiler ----\r
-@set LJCOMPILE="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -Wall -DLUAJIT_DISABLE_FFI %GC64%\r
+@set LJCOMPILE="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -Wall -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC %GC64%\r
 @set LJLIB="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-llvm-ar" rcus\r
 @set INCLUDE=""\r
 \r
-%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-llvm-as -o lj_vm.o lj_vm.s\r
+"%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -o lj_vm.o lj_vm.s\r
 \r
 @if "%1" neq "debug" goto :NODEBUG\r
 @shift\r