Skip to content

Commit

Permalink
Fix compilation with latest vdpm packages.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rinnegatamante committed Aug 27, 2022
1 parent 571bdcd commit 332df67
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
TARGET := lpp-vita
SOURCES := source/include/ftp source/include source source/include/audiodec

INCLUDES := include $VITASDK/arm-vita-eabi/include/luajit-2.1
SOURCES := source/include/ftp source/include source source/include/audiodec

LIBS = -lcurl -lssl -lcrypto -lvorbisfile -lvorbis -logg -lsndfile -lvita2d -lSceLibKernel_stub -lScePvf_stub \
-limgui_vita2d -lSceJpegEnc_stub -lSceAppMgr_stub -lSceCtrl_stub -lSceTouch_stub -lSceMotion_stub \
-lScePromoterUtil_stub -lm -lSceNet_stub -lSceNetCtl_stub -lSceAppUtil_stub -lScePgf_stub \
-ljpeg -lfreetype -lc -lScePower_stub -lSceCommonDialog_stub -lpng16 -lz -lSceCamera_stub \
-lspeexdsp -lmpg123 -lSceAudio_stub -lSceGxm_stub -lSceDisplay_stub -lSceShellSvc_stub -limagequant \
-lopusfile -lFLAC -lvorbis -lvorbisenc -lopus -lSceHttp_stub -lSceAudioIn_stub -lluajit-5.1 -ldl \
-lopusfile -lFLAC -lvorbis -lvorbisenc -lopus -lSceHttp_stub -lSceAudioIn_stub -lluajit-5.1 -ldl \
-ltaihen_stub -lSceKernelModulemgr_stub -lSceSblSsMgr_stub -lSceSysmodule_stub -lSceShutterSound_stub \
-lSceSsl_stub -lSceVshBridge_stub -lSceAvPlayer_stub -lSceRegistryMgr_stub

Expand All @@ -24,7 +22,7 @@ CFLAGS = -fno-lto -g -Wl,-q -O3 -DWANT_FASTWAV -DHAVE_LIBSPEEXDSP \
-DHAVE_LIBSNDFILE -DHAVE_MPG123 -DWANT_FMMIDI=1 -DWANT_FASTAIFF \
-DUSE_AUDIO_RESAMPLER -DHAVE_OGGVORBIS -DHAVE_OPUSFILE \
-DSQLITE_OS_OTHER=1 -DSQLITE_TEMP_STORE=3 -DSQLITE_THREADSAFE=0 \
-I$(VITASDK)/$(PREFIX)/include/opus
-I$(VITASDK)/$(PREFIX)/include/opus -I$(VITASDK)/$(PREFIX)/include/luajit-2.1

ifeq ($(SYS_APP_MODE),1)
CFLAGS += -DSYS_APP_MODE
Expand Down
13 changes: 0 additions & 13 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,6 @@ steps:
- script: sudo apt-get install -qq -y libc6-dev-i386
displayName: 'Install 32 bit libraries'

- script: |
git clone https://github.com/hyln9/vita-luajit
cd vita-luajit/src
make HOST_CC="gcc -m32" CROSS=arm-vita-eabi- TARGET_SYS=PSP2 TARGET_FLAGS="-marm -fno-optimize-sibling-calls" PREFIX="ux0:/data/luajit"hi
sudo -E cp libluajit.a $VITASDK/arm-vita-eabi/lib/libluajit.a
sudo -E cp lua.h $VITASDK/arm-vita-eabi/include/lua.h
sudo -E cp lualib.h $VITASDK/arm-vita-eabi/include/lualib.h
sudo -E cp lauxlib.h $VITASDK/arm-vita-eabi/include/lauxlib.h
sudo -E cp luaconf.h $VITASDK/arm-vita-eabi/include/luaconf.h
sudo -E cp lua.hpp $VITASDK/arm-vita-eabi/include/lua.hpp
sudo -E cp luajit.h $VITASDK/arm-vita-eabi/include/luajit.h
displayName: 'Build LuaJIT'

- script: |
git clone https://github.com/xerpi/libvita2d
sudo -E cp libvita2d/libvita2d/include/utils.h $VITASDK/arm-vita-eabi/include/utils.h
Expand Down

0 comments on commit 332df67

Please sign in to comment.