Merge branch 'accurate' into portable

.gitignore

@@ -1,8 +1,25 @@
 # Exclude obj directory (object files for Makefile build)
 /obj
 
-# Exclude build output directory
+# Exclude executables (English)
-/game
+/game_english/CSE2_debug.exe
+/game_english/DoConfig_debug.exe
+/game_english/CSE2.exe
+/game_english/DoConfig.exe
+/game_english/CSE2_debug
+/game_english/DoConfig_debug
+/game_english/CSE2
+/game_english/DoConfig
+
+# Exclude executables (Japanese)
+/game_japanese/CSE2_debug.exe
+/game_japanese/DoConfig_debug.exe
+/game_japanese/CSE2.exe
+/game_japanese/DoConfig.exe
+/game_japanese/CSE2_debug
+/game_japanese/DoConfig_debug
+/game_japanese/CSE2
+/game_japanese/DoConfig
 
 ####
 # Accurate branch

CMakeLists.txt

@@ -8,7 +8,6 @@ if((${CMAKE_VERSION} VERSION_EQUAL 3.11) OR (${CMAKE_VERSION} VERSION_GREATER 3.
 	cmake_policy(SET CMP0072 NEW)
 endif()
 
-set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/game")
 set(ASSETS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 
 option(JAPANESE "Enable the Japanese-language build (instead of the unofficial Aeon Genesis English translation)" OFF)
@@ -269,11 +268,11 @@ set(RESOURCES
 
 # Handle options
 if(JAPANESE)
-	set(DATA_DIRECTORY "${ASSETS_DIRECTORY}/data_jp")
+	set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/game_japanese")
 	list(APPEND RESOURCES "BITMAP/pixel_jp.bmp" "FONT/NotoSansMonoCJKjp.otf")
 	target_compile_definitions(CSE2 PRIVATE JAPANESE)
 else()
-	set(DATA_DIRECTORY "${ASSETS_DIRECTORY}/data_en")
+	set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/game_english")
 	list(APPEND RESOURCES "BITMAP/pixel.bmp" "FONT/LiberationMono.ttf")
 endif()
 
@@ -438,12 +437,6 @@ set_target_properties(CSE2 PROPERTIES
 	RUNTIME_OUTPUT_DIRECTORY_DEBUG ${BUILD_DIRECTORY}
 )
 
-# Copy data folder to build directory
-add_custom_command(TARGET CSE2 POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E remove_directory "${BUILD_DIRECTORY}/data"
-	COMMAND ${CMAKE_COMMAND} -E copy_directory "${DATA_DIRECTORY}" "${BUILD_DIRECTORY}/data"
-)
-
 # Enable link-time optimisation if available
 if(LTO)
 	if((${CMAKE_VERSION} VERSION_EQUAL 3.9) OR (${CMAKE_VERSION} VERSION_GREATER 3.9))

Makefile

@@ -3,7 +3,6 @@ NATIVECXX ?= c++
 WINDRES ?= windres
 PKGCONFIG ?= pkg-config
 
-BUILD_DIRECTORY = game
 ASSETS_DIRECTORY = assets
 
 # Default options
@@ -37,11 +36,11 @@ ifeq ($(LTO), 1)
 endif
 
 ifeq ($(JAPANESE), 1)
-  DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_jp
+  BUILD_DIRECTORY = game_japanese
 
   DEFINES += -DJAPANESE
 else
-  DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_en
+  BUILD_DIRECTORY = game_english
 endif
 
 FILENAME ?= $(FILENAME_DEF)
@@ -273,14 +272,9 @@ ifeq ($(WINDOWS), 1)
   OBJECTS += obj/$(FILENAME)/windows_resources.o
 endif
 
-all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME)
+all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME)
 	$(info Finished)
 
-$(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY)
-	@mkdir -p $(@D)
-	@rm -rf $(BUILD_DIRECTORY)/data
-	@cp -r $(DATA_DIRECTORY) $(BUILD_DIRECTORY)/data
-
 $(BUILD_DIRECTORY)/$(FILENAME): $(OBJECTS)
 	@mkdir -p $(@D)
 	$(info Linking $@)

README.md

@@ -108,7 +108,7 @@ Name | Function
 `WARNINGS_ALL=1` | Enable ALL compiler warnings (Clang only)
 `WARNINGS_FATAL=1` | Make all compiler warnings errors
 
-Once built, the executables and assets can be found in the newly-generated `game` folder.
+Once built, the executables can be found in the `game_english`/`game_japanese` folder, depending on the selected language.
 
 ## Licensing