diff --git a/Jenkinsfile b/Jenkinsfile index 0cdc7c1bd2..f05c0808c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,13 +24,13 @@ pipeline { sh 'python3 tools/check_format.py --verbose --compare-to origin/main' } } - stage('Setup') { + stage('Setup gc-eu-mq-dbg') { steps { - sh 'cp /usr/local/etc/roms/baserom_oot.z64 baseroms/gc-eu-mq-dbg/baserom.z64' + sh 'cp /usr/local/etc/roms/oot-gc-eu-mq-dbg.z64 baseroms/gc-eu-mq-dbg/baserom.z64' sh 'make -j setup' } } - stage('Build (qemu-irix)') { + stage('Build gc-eu-mq-dbg (qemu-irix)') { when { branch 'main' } @@ -38,7 +38,7 @@ pipeline { sh 'make -j ORIG_COMPILER=1' } } - stage('Build') { + stage('Build gc-eu-mq-dbg') { when { not { branch 'main' @@ -48,6 +48,30 @@ pipeline { sh 'make -j RUN_CC_CHECK=0' } } + stage('Setup gc-eu-mq') { + steps { + sh 'cp /usr/local/etc/roms/oot-gc-eu-mq.z64 baseroms/gc-eu-mq/baserom.z64' + sh 'make -j setup VERSION=gc-eu-mq' + } + } + stage('Build gc-eu-mq (qemu-irix)') { + when { + branch 'main' + } + steps { + sh 'make -j VERSION=gc-eu-mq ORIG_COMPILER=1' + } + } + stage('Build gc-eu-mq') { + when { + not { + branch 'main' + } + } + steps { + sh 'make -j VERSION=gc-eu-mq RUN_CC_CHECK=0' + } + } stage('Report Progress') { when { branch 'main' diff --git a/Makefile b/Makefile index b60aad6c57..5cefd6257a 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,11 @@ NON_MATCHING := 0 ORIG_COMPILER := 0 # If COMPILER is "gcc", compile with GCC instead of IDO. COMPILER := ido -# Target game version. Currently only the following version is supported: +# Target game version. Currently the following versions are supported: +# gc-eu-mq GameCube Europe/PAL Master Quest # gc-eu-mq-dbg GameCube Europe/PAL Master Quest Debug (default) # The following versions are work-in-progress and not yet matching: # gc-eu GameCube Europe/PAL -# gc-eu-mq GameCube Europe/PAL Master Quest VERSION := gc-eu-mq-dbg # Number of threads to extract and compress with N_THREADS := $(shell nproc)