diff --git a/.github/workflows/build_ds.yml b/.github/workflows/build_ds.yml index 24a4e19..02d90e3 100644 --- a/.github/workflows/build_ds.yml +++ b/.github/workflows/build_ds.yml @@ -23,7 +23,7 @@ jobs: # otherwise notify_failure doesn't work - name: Install curl when necessary if: ${{ always() && steps.compile.outcome == 'failure' }} - run: apt install curl + run: apt-get install -y curl - uses: ./.github/actions/notify_failure if: ${{ always() && steps.compile.outcome == 'failure' }} diff --git a/.github/workflows/build_ps3.yml b/.github/workflows/build_ps3.yml index d4678a7..d59b256 100644 --- a/.github/workflows/build_ps3.yml +++ b/.github/workflows/build_ps3.yml @@ -26,7 +26,7 @@ jobs: # otherwise notify_failure doesn't work - name: Install curl when necessary if: ${{ always() && steps.compile.outcome == 'failure' }} - run: apt install curl + run: apt-get install -y curl - uses: ./.github/actions/notify_failure if: ${{ always() && steps.compile.outcome == 'failure' }} with: diff --git a/misc/ps3/ICON0.png b/misc/ps3/ICON0.png new file mode 100644 index 0000000..f6446f9 Binary files /dev/null and b/misc/ps3/ICON0.png differ diff --git a/misc/ps3/Makefile b/misc/ps3/Makefile index e859df9..e28411b 100644 --- a/misc/ps3/Makefile +++ b/misc/ps3/Makefile @@ -6,6 +6,9 @@ ifeq ($(strip $(PS3DEV)),) $(error "Please set PS3DEV in your environment. export PS3DEV=") endif +ifeq ($(strip $(PSL1GHT)),) +$(error "Please set PSL1GHT in your environment. export PSL1GHT=") +endif include $(PS3DEV)/ppu_rules @@ -17,13 +20,14 @@ include $(PS3DEV)/ppu_rules #--------------------------------------------------------------------------------- TARGET := ClassiCube-PS3 BUILD := build-ps3 -SOURCES := src -INCLUDES := +SOURCES := src third_party/bearssl/src +INCLUDES := third_party/bearssl/inc SHADERS := misc/ps3 TITLE := ClassiCube APPID := CUBE00200 CONTENTID := UP0001-$(APPID)_00-0000000000000000 +ICON0 := ../misc/ps3/ICON0.png #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- @@ -31,7 +35,7 @@ CONTENTID := UP0001-$(APPID)_00-0000000000000000 CFLAGS = -O2 -DPLAT_PS3 -Wall -mcpu=cell -fno-math-errno $(MACHDEP) $(INCLUDE) CXXFLAGS = $(CFLAGS) -LDFLAGS = $(MACHDEP) -Wl,-Map,$(notdir $@).map +LDFLAGS = $(MACHDEP) -Wl,-Map,$(notdir $@).map -fno-use-linker-plugin #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project @@ -115,6 +119,7 @@ DEPENDS := $(OFILES:.o=.d) #--------------------------------------------------------------------------------- # main targets #--------------------------------------------------------------------------------- +$(OUTPUT).pkg: $(OUTPUT).self $(OUTPUT).self: $(OUTPUT).elf $(OUTPUT).elf: $(OFILES) @@ -136,4 +141,4 @@ $(OUTPUT).elf: $(OFILES) #--------------------------------------------------------------------------------- endif -#--------------------------------------------------------------------------------- \ No newline at end of file +#---------------------------------------------------------------------------------