The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2024-12-04 22:34:14 +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 12:26:08 -06:00
parent 88cd22b8c4
commit c96e193f02
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,23 +19,21 @@ jobs:
- name: Copy files
run: |
cp -f hbc/* executables/FCEUltraGX/apps/fceugx/
cp -f hbc/* executables/FCEUltraGX-GameCube/
cp -f README.md executables/FCEUltraGX/apps/fceugx/
cp -f README.md executables/FCEUltraGX-GameCube/
cp -f hbc/* package/FCEUltraGX/apps/fceugx/
cp -f hbc/* package/FCEUltraGX-GameCube/
- name: Upload Wii Build Artifacts
uses: actions/upload-artifact@v2
with:
name: FCEUltraGX-Nightly
path: |
executables/FCEUltraGX/
!executables/FCEUltraGX/apps/fceugx/*.elf
package/FCEUltraGX/
!package/FCEUltraGX/apps/fceugx/*.elf
- name: Upload GameCube Build Artifacts
uses: actions/upload-artifact@v2
with:
name: FCEUltraGX-Nightly-GameCube
path: |
executables/FCEUltraGX-GameCube/
!executables/FCEUltraGX-GameCube/*.elf
package/FCEUltraGX-GameCube/
!package/FCEUltraGX-GameCube/*.elf

7
Makefile.gc
View File

@ -11,13 +11,12 @@ include $(DEVKITPPC)/gamecube_rules
#---------------------------------------------------------------------------------
# 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
# SOURCES is a list of directories containing source code
# INCLUDES is a list of directories containing extra header files
#---------------------------------------------------------------------------------
TARGET := boot
TARGETDIR := executables/FCEUltraGX-GameCube
TARGET := fceugx-gc
TARGETDIR := executables
BUILD := build_gc
SOURCES := source source/gui source/utils source/utils/unzip source/utils/sz \
source/fceultra source/fceultra/boards source/fceultra/input \
@ -118,7 +117,7 @@ $(BUILD):
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGETDIR)
@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
#---------------------------------------------------------------------------------
run:

15
Makefile.wii
View File

@ -11,18 +11,13 @@ include $(DEVKITPPC)/wii_rules
#---------------------------------------------------------------------------------
# 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
# SOURCES is a list of directories containing source code
# INCLUDES is a list of directories containing extra header files
#---------------------------------------------------------------------------------
TARGET := boot
TARGETDIR := executables/FCEUltraGX/apps/fceugx
ROOTDIR := executables/FCEUltraGX
SUBDIR := executables/FCEUltraGX/fceugx/{cheats,roms,saves}
BUILD := build_wii
TARGET := fceugx-wii
TARGETDIR := executables
BUILD := build_wii
SOURCES := source source/gui source/utils source/utils/sz source/utils/unzip \
source/fceultra source/fceultra/boards source/fceultra/input \
source/fceultra/utils source/fceultra/mbshare \
@ -117,13 +112,13 @@ export OUTPUT := $(CURDIR)/$(TARGETDIR)/$(TARGET)
#---------------------------------------------------------------------------------
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR) $(SUBDIR)
@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) $(ROOTDIR)
@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
#---------------------------------------------------------------------------------
run: