From c1a5924e162fe4807e17c7ebc15493bc9bbed24d Mon Sep 17 00:00:00 2001 From: Alex Pensinger Date: Sat, 5 Dec 2020 13:29:16 -0500 Subject: Add German rev1 target --- Makefile | 8 +++++++- config.mk | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index befd85598..d4fcffb80 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ endif #### Main Rules #### -ALL_BUILDS := ruby ruby_debug ruby_rev1 ruby_rev2 sapphire sapphire_debug sapphire_rev1 sapphire_rev2 ruby_de ruby_de_debug sapphire_de sapphire_de_debug +ALL_BUILDS := ruby ruby_debug ruby_rev1 ruby_rev2 sapphire sapphire_debug sapphire_rev1 sapphire_rev2 ruby_de ruby_de_debug ruby_de_rev1 sapphire_de sapphire_de_debug sapphire_de_rev1 MODERN_BUILDS := $(ALL_BUILDS:%=%_modern) # Available targets @@ -226,8 +226,10 @@ sapphire_rev1: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=1 sapphire_rev2: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=2 ruby_de: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN ruby_de_debug: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1 +ruby_de_rev1: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN GAME_REVISION=1 sapphire_de: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN sapphire_de_debug: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN DEBUG=1 +sapphire_de_rev1: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN GAME_REVISION=1 modern: ; @$(MAKE) GAME_VERSION=RUBY MODERN=1 ruby_modern: ; @$(MAKE) GAME_VERSION=RUBY MODERN=1 @@ -240,8 +242,10 @@ sapphire_rev1_modern: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=1 MODER sapphire_rev2_modern: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=2 MODERN=1 ruby_de_modern: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN MODERN=1 ruby_de_debug_modern: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1 MODERN=1 +ruby_de_rev1_modern: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN GAME_REVISION=1 MODERN=1 sapphire_de_modern: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN MODERN=1 sapphire_de_debug_modern: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN DEBUG=1 MODERN=1 +sapphire_de_rev1_modern: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN GAME_REVISION=1 MODERN=1 compare_ruby: ; @$(MAKE) GAME_VERSION=RUBY COMPARE=1 compare_ruby_debug: ; @$(MAKE) GAME_VERSION=RUBY DEBUG=1 COMPARE=1 @@ -253,8 +257,10 @@ compare_sapphire_rev1: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=1 COMP compare_sapphire_rev2: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=2 COMPARE=1 compare_ruby_de: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN COMPARE=1 compare_ruby_de_debug: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1 COMPARE=1 +compare_ruby_de_rev1: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN GAME_REVISION=1 COMPARE=1 compare_sapphire_de: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN COMPARE=1 compare_sapphire_de_debug: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN DEBUG=1 COMPARE=1 +compare_sapphire_de_rev1: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN GAME_REVISION=1 COMPARE=1 #### Graphics Rules #### diff --git a/config.mk b/config.mk index fb5b79ee7..81e90dd41 100644 --- a/config.mk +++ b/config.mk @@ -27,6 +27,19 @@ else endif endif +# Language +ifeq ($(GAME_LANGUAGE), ENGLISH) + BUILD_NAME := $(BUILD_NAME) + GAME_CODE := $(GAME_CODE)E +else +ifeq ($(GAME_LANGUAGE), GERMAN) + BUILD_NAME := $(BUILD_NAME)_de + GAME_CODE := $(GAME_CODE)D +else + $(error unknown language $(GAME_LANGUAGE)) +endif +endif + # Revision ifeq ($(GAME_REVISION), 0) BUILD_NAME := $(BUILD_NAME) @@ -42,19 +55,6 @@ endif endif endif -# Language -ifeq ($(GAME_LANGUAGE), ENGLISH) - BUILD_NAME := $(BUILD_NAME) - GAME_CODE := $(GAME_CODE)E -else -ifeq ($(GAME_LANGUAGE), GERMAN) - BUILD_NAME := $(BUILD_NAME)_de - GAME_CODE := $(GAME_CODE)D -else - $(error unknown language $(GAME_LANGUAGE)) -endif -endif - # Debug fixes (always nonmatching) ifeq ($(DEBUG_FIX), 1) COMPARE := 0 -- cgit v1.2.3