Initial Makefile sync

config.mk

@@ -3,49 +3,50 @@
 GAME_VERSION  ?= FIRERED
 GAME_REVISION ?= 0
 GAME_LANGUAGE ?= ENGLISH
+
+# Builds the ROM using a modern compiler
 MODERN        ?= 0
+# Compares the ROM to a checksum of the original - only makes sense using when non-modern
 COMPARE       ?= 0
 
+ifeq (modern,$(MAKECMDGOALS))
+  MODERN := 1
+endif
+ifeq (compare,$(MAKECMDGOALS))
+  COMPARE := 1
+endif
+
 # For gbafix
-MAKER_CODE  := 01
+MAKER_CODE := 01
+
+BUILD_DIR := build
 
 # Version
 ifeq ($(GAME_VERSION),FIRERED)
-TITLE       := POKEMON FIRE
-GAME_CODE   := BPR
-BUILD_NAME  := firered
+  TITLE       := POKEMON FIRE
+  GAME_CODE   := BPR
+  BUILD_NAME   := firered
 else
 ifeq ($(GAME_VERSION),LEAFGREEN)
-TITLE       := POKEMON LEAF
-GAME_CODE   := BPG
-BUILD_NAME  := leafgreen
+  TITLE       := POKEMON LEAF
+  GAME_CODE   := BPG
+  BUILD_NAME   := leafgreen
 else
-$(error unknown version $(GAME_VERSION))
+  $(error unknown version $(GAME_VERSION))
 endif
 endif
 
 # Revision
-ifeq ($(GAME_REVISION),0)
-BUILD_NAME  := $(BUILD_NAME)
-else
 ifeq ($(GAME_REVISION),1)
-BUILD_NAME  := $(BUILD_NAME)_rev1
-else
-$(error unknown revision $(GAME_REVISION))
+  BUILD_NAME  := $(BUILD_NAME)_rev1
 endif
+
+# Modern GCC
+ifeq ($(MODERN),1)
+  BUILD_NAME := $(BUILD_NAME)_modern
 endif
 
 # Language
 ifeq ($(GAME_LANGUAGE),ENGLISH)
-BUILD_NAME  := $(BUILD_NAME)
-GAME_CODE   := $(GAME_CODE)E
-else
-$(error unknown language $(GAME_LANGUAGE))
-endif
-
-# Modern GCC
-ifeq ($(MODERN), 0)
-  BUILD_NAME := $(BUILD_NAME)
-else
-  BUILD_NAME := $(BUILD_NAME)_modern
+  GAME_CODE  := $(GAME_CODE)E
 endif