Move the data folder back to the game folder
The whole 'copy data folder from assets folder to the game folder when Makefile is ran' thing just made modding annoying.
21
.gitignore
vendored
|
@ -1,8 +1,25 @@
|
|||
# Exclude obj directory (object files for Makefile build)
|
||||
/obj
|
||||
|
||||
# Exclude build output directory
|
||||
/game
|
||||
# Exclude executables (English)
|
||||
/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
|
||||
|
|
12
Makefile
|
@ -1,6 +1,5 @@
|
|||
WINDRES ?= windres
|
||||
|
||||
BUILD_DIRECTORY = game
|
||||
ASSETS_DIRECTORY = assets
|
||||
|
||||
ALL_CXXFLAGS = $(CXXFLAGS)
|
||||
|
@ -21,11 +20,11 @@ ifeq ($(LTO), 1)
|
|||
endif
|
||||
|
||||
ifeq ($(JAPANESE), 1)
|
||||
DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_jp
|
||||
BUILD_DIRECTORY = game_japanese
|
||||
|
||||
ALL_CXXFLAGS += -DJAPANESE
|
||||
else
|
||||
DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_en
|
||||
BUILD_DIRECTORY = game_english
|
||||
endif
|
||||
|
||||
FILENAME ?= $(FILENAME_DEF)
|
||||
|
@ -211,14 +210,9 @@ DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))
|
|||
|
||||
OBJECTS += obj/$(FILENAME)/windows_resources.o
|
||||
|
||||
all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data
|
||||
all: $(BUILD_DIRECTORY)/$(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 $@)
|
||||
|
|
|
@ -62,7 +62,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 executable can be found in the `game_english`/`game_japanese` folder, depending on the selected language.
|
||||
|
||||
## Licensing
|
||||
|
||||
|
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 134 B After Width: | Height: | Size: 134 B |
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 638 B After Width: | Height: | Size: 638 B |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 59 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |