Skip to content

Commit

Permalink
More build improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacoby6000 committed Jul 24, 2024
1 parent 7d3bda3 commit 68f6f93
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ ENV DEVKITPPC=/devkitpro/devkitPPC
# Now we have a container that has the dev environment set up.
# Copy current folder into container, then compile
COPY . /projectroot/
RUN cd /projectroot && make clean && make -j8 package
RUN cd /projectroot && make clean && make -j8 dist


# Copy the DOL and ELF out of the container
FROM scratch AS export-stage
COPY --from=usbloader /projectroot/boot.* /
COPY --from=usbloader /projectroot/usbloader_gx /
COPY --from=usbloader /projectroot/usbloader_gx.zip /
COPY --from=usbloader /projectroot/usbloadergx_r*.zip /
17 changes: 12 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,24 @@ clean:
package:
$(MAKE)
@echo Packaging...
@[ -d usbloader_gx ] || mkdir -p usbloader_gx
@cp $(TARGET).dol usbloader_gx/
@cp HBC/icon.png usbloader_gx/
@cp HBC/meta.xml usbloader_gx/
@zip usbloader_gx.zip usbloader_gx/*
@[ -d $(PROJECTDIR)/usbloader_gx ] || mkdir -p $(PROJECTDIR)/usbloader_gx
@cp $(TARGET).dol $(PROJECTDIR)/usbloader_gx/
@cp $(PROJECTDIR)/HBC/icon.png $(PROJECTDIR)/usbloader_gx/
@cp $(PROJECTDIR)/HBC/meta.xml $(PROJECTDIR)/usbloader_gx/

#---------------------------------------------------------------------------------
dist:
$(MAKE) package
@mkdir -p $(PROJECTDIR)/dist/apps
@cp -r $(PROJECTDIR)/usbloader_gx $(PROJECTDIR)/dist/apps/
@cd $(PROJECTDIR)/dist && zip "../usbloadergx_r`cat $(PROJECTDIR)/version.txt`" -r .

#---------------------------------------------------------------------------------

deploy:
$(MAKE) package
@echo Deploying...
@zip usbloader_gx.zip usbloader_gx/*
wiiload usbloader_gx.zip

#---------------------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion source/utils/sjis.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "sjis.h"
#include <cstdint>

unsigned char convTable[25088] = {
0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05,
Expand Down

0 comments on commit 68f6f93

Please sign in to comment.