Skip to content
This repository has been archived by the owner on Aug 31, 2024. It is now read-only.

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
citronalco committed Sep 10, 2023
1 parent a696d11 commit 54c35ab
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 5 deletions.
27 changes: 24 additions & 3 deletions .github/workflows/compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:
- name: git checkout
uses: actions/checkout@v3

- run: git fetch --prune --unshallow
- run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git fetch --prune --unshallow
- name: Compile -> make clean release
run: make --trace clean release
Expand Down Expand Up @@ -56,7 +58,9 @@ jobs:
- name: git checkout
uses: actions/checkout@v3

- run: git fetch --prune --unshallow
- run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git fetch --prune --unshallow
- name: Get version
run: |
Expand Down Expand Up @@ -112,7 +116,9 @@ jobs:
- name: git checkout
uses: actions/checkout@v3

- run: git fetch --prune --unshallow
- run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git fetch --prune --unshallow
- name: Get version
run: |
Expand All @@ -133,6 +139,9 @@ jobs:
needs: [build, build-variants, build-lang]
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'
env:
USERNAME: ${{ secrets.USERNAME }}
PASSWORD: ${{ secrets.PASSWORD }}
steps:
- name: git checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -188,3 +197,15 @@ jobs:
OPNPS2LD.7z
OPNPS2LD-VARIANTS.7z
OPNPS2LD-LANGS.7z
- name: Upload pre-release to Mega
if: github.ref == 'refs/heads/master' && env.USERNAME != null
uses: Difegue/action-megacmd@master
with:
args: put -c OPNPS2LD.7z /OPL/Pre-Release/${{ env.OPL_VERSION }}/run_${{ github.run_number }}/

- name: Upload release to Mega
if: startsWith(github.ref, 'refs/tags/v') && env.USERNAME != null
uses: Difegue/action-megacmd@master
with:
args: put -c OPNPS2LD.7z /OPL/Release/${{ env.OPL_VERSION }}/
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ PNG_ASSETS = load0 load1 load2 load3 load4 load5 load6 load7 usb usb_bd ilk_bd \
Rating_1 Rating_2 Rating_3 Rating_4 Rating_5 Scan_240p Scan_240p1 Scan_480i Scan_480p \
Scan_480p1 Scan_480p2 Scan_480p3 Scan_480p4 Scan_480p5 Scan_576i Scan_576p Scan_720p \
Scan_1080i Scan_1080i2 Scan_1080p Vmode_multi Vmode_ntsc Vmode_pal logo case \
background2 # OPL_DB tweak
background2 elm # OPL_DB tweak

GFX_OBJS = $(PNG_ASSETS:%=%_png.o) poeveticanew.o icon_sys.o icon_icn.o

Expand Down
3 changes: 2 additions & 1 deletion elfldr/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ EE_OBJS = elfldr.o crt0.o

EE_INCS := -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -I.
EE_CFLAGS := -D_EE -O2 -mgpopt -G8192 -Wall $(EE_INCS)
#EE_CFLAGS := -D_EE -O2 -mgpopt -G0 -Wall $(EE_INCS)

EE_LDFLAGS = -nostartfiles -Tlinkfile -L$(PS2SDK)/ee/lib -s
EE_LIBS += -lkernel-nopatch
EE_LIBS += -lkernel

%.o : %.c
$(EE_CC) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@
Expand Down
1 change: 1 addition & 0 deletions include/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ void sysLaunchLoaderElf(const char *filename, const char *mode_str, int size_cdv
//START of OPL_DB tweaks
int sysExecElfWithParam(char *path, char *param);
//END of OPL_DB tweaks
int sysExecElf(const char *path);
int sysLoadModuleBuffer(void *buffer, int size, int argc, char *argv);
int sysCheckMC(void);
int sysCheckVMC(const char *prefix, const char *sep, char *name, int createSize, vmc_superblock_t *vmc_superblock);
Expand Down
1 change: 1 addition & 0 deletions src/opl.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ int gHDDStartMode;
int gETHStartMode;
int gAPPStartMode;
int gELMStartMode; // OPL_DB tweaks
int bdmCacheSize;
int hddCacheSize;
int smbCacheSize;
int gEnableILK;
Expand Down

0 comments on commit 54c35ab

Please sign in to comment.