The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-27 13:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert makefile changes, update CI

Browse Source
This commit is contained in:
Daryl Borth 2020-10-25 11:57:36 -06:00
parent d1dd578f47
commit 684068bd91
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/continuous-integration-workflow.yml vendored
View File

@ -19,23 +19,25 @@ jobs:
- name: Copy files - name: Copy files
run: | run: |
cp -f hbc/* executables/Snes9xGX/apps/snes9xgx/ mkdir -p dist/Snes9xGX/apps/snes9xgx
cp -f hbc/* executables/Snes9xGX-GameCube/ mkdir -p dist/Snes9xGX/snes9xgx/roms
cp -f README.md executables/Snes9xGX/apps/snes9xgx/ mkdir dist/Snes9xGX/snes9xgx/cheats
cp -f README.md executables/Snes9xGX-GameCube/ mkdir dist/Snes9xGX/snes9xgx/saves
mkdir dist/Snes9xGX-GameCube/
cp hbc/* dist/Snes9xGX/apps/snes9xgx/
cp executables/snes9xgx-wii.dol dist/Snes9xGX/apps/snes9xgx/boot.dol
cp executables/snes9xgx-gc.dol dist/Snes9xGX-GameCube/
- name: Upload Wii Build Artifacts - name: Upload Wii Build Artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Snes9xGX-Nightly name: Snes9xGX
path: | path: |
executables/Snes9xGX/ dist/Snes9xGX/
!executables/Snes9xGX/apps/snes9xgx/*.elf
- name: Upload GameCube Build Artifacts - name: Upload GameCube Build Artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Snes9xGX-Nightly-GameCube name: Snes9xGX-GameCube
path: | path: |
executables/Snes9xGX-GameCube/ dist/Snes9xGX-GameCube/
!executables/Snes9xGX-GameCube/*.elf

2
.gitignore vendored
View File

@ -2,4 +2,4 @@
/snes9x-gx.pnproj /snes9x-gx.pnproj
/build_wii /build_wii
/build_gc /build_gc
/executables /package

7
Makefile.gc
View File

@ -11,13 +11,12 @@ include $(DEVKITPPC)/gamecube_rules
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
# TARGETDIR is the directory where the output files will be placed
# BUILD is the directory where object files & intermediate files will be placed # BUILD is the directory where object files & intermediate files will be placed
# SOURCES is a list of directories containing source code # SOURCES is a list of directories containing source code
# INCLUDES is a list of directories containing extra header files # INCLUDES is a list of directories containing extra header files
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
TARGET := boot TARGET := snes9xgx-gc
TARGETDIR := executables/Snes9xGX-GameCube TARGETDIR := executables
BUILD := build_gc BUILD := build_gc
SOURCES := source source/gui source/utils source/utils/sz source/utils/vm \ SOURCES := source source/gui source/utils source/utils/sz source/utils/vm \
source/snes9x source/snes9x/apu source/snes9x source/snes9x/apu
@ -117,7 +116,7 @@ $(BUILD):
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@echo clean ... @echo clean ...
@rm -fr $(BUILD) $(TARGETDIR) @rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
run: run:

13
Makefile.wii
View File

@ -11,17 +11,12 @@ include $(DEVKITPPC)/wii_rules
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
# TARGETDIR is the directory where the output files will be placed
# SUBDIR are the directories where the cheats, roms and saves need to be placed
# ROOTDIR is the root directory of the build
# BUILD is the directory where object files & intermediate files will be placed # BUILD is the directory where object files & intermediate files will be placed
# SOURCES is a list of directories containing source code # SOURCES is a list of directories containing source code
# INCLUDES is a list of directories containing extra header files # INCLUDES is a list of directories containing extra header files
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
TARGET := boot TARGET := snes9xgx-wii
TARGETDIR := executables/Snes9xGX/apps/snes9xgx TARGETDIR := executables
ROOTDIR := executables/Snes9xGX
SUBDIR := executables/Snes9xGX/snes9xgx/{cheats,roms,saves}
BUILD := build_wii BUILD := build_wii
SOURCES := source source/gui source/utils source/utils/sz \ SOURCES := source source/gui source/utils source/utils/sz \
source/snes9x source/snes9x/apu source/snes9x source/snes9x/apu
@ -115,13 +110,13 @@ export OUTPUT := $(CURDIR)/$(TARGETDIR)/$(TARGET)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
$(BUILD): $(BUILD):
@[ -d $@ ] || mkdir -p $@ @[ -d $@ ] || mkdir -p $@
@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR) $(SUBDIR) @[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@echo clean ... @echo clean ...
@rm -fr $(BUILD) $(ROOTDIR) @rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
run: run: