The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-25 12:06:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert makefiles, update CI

Browse Source
This commit is contained in:
Daryl Borth 2020-10-25 12:31:39 -06:00
parent eb2f8e66a6
commit c41c577bb6
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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 := vbagx-gc
TARGETDIR := executables/VisualBoyAdvanceGX-GameCube TARGETDIR := executables
BUILD := build_gc BUILD := build_gc
SOURCES := source source/gui source/utils source/utils/sz \ SOURCES := source source/gui source/utils source/utils/sz \
source/vba source/vba/apu source/vba/common \ source/vba source/vba/apu source/vba/common \
@ -120,7 +119,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 := vbagx-wii
TARGETDIR := executables/VisualBoyAdvanceGX/apps/vbagx TARGETDIR := executables
ROOTDIR := executables/VisualBoyAdvanceGX
SUBDIR := executables/VisualBoyAdvanceGX/vbagx/{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/vba source/vba/apu source/vba/common \ source/vba source/vba/apu source/vba/common \
@ -119,13 +114,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: