ref: 8c8ddd496d9c36dddfeeae9b51dcea30d829f438
parent: 18add3466c22a18ba76bceed692c947c3a573ab9
author: Clownacy <Clownacy@users.noreply.github.com>
date: Tue Oct 29 15:04:37 EDT 2019
Adjust merged commits to suit this branch
--- a/Makefile
+++ b/Makefile
@@ -243,73 +243,6 @@
@echo Invalid RENDERER selected; this build will fail
endif
-RESOURCES = \
- BITMAP/Credit01.bmp \
- BITMAP/Credit02.bmp \
- BITMAP/Credit03.bmp \
- BITMAP/Credit04.bmp \
- BITMAP/Credit05.bmp \
- BITMAP/Credit06.bmp \
- BITMAP/Credit07.bmp \
- BITMAP/Credit08.bmp \
- BITMAP/Credit09.bmp \
- BITMAP/Credit10.bmp \
- BITMAP/Credit11.bmp \
- BITMAP/Credit12.bmp \
- BITMAP/Credit14.bmp \
- BITMAP/Credit15.bmp \
- BITMAP/Credit16.bmp \
- BITMAP/Credit17.bmp \
- BITMAP/Credit18.bmp \
- BITMAP/pixel.bmp \
- CURSOR/CURSOR_IKA.cur \
- CURSOR/CURSOR_NORMAL.cur \
- ICON/0.ico \
- ICON/ICON_MINI.ico \
- ORG/Access.org \
- ORG/Anzen.org \
- ORG/Balcony.org \
- ORG/Ballos.org \
- ORG/BreakDown.org \
- ORG/Cemetery.org \
- ORG/Curly.org \
- ORG/Dr.org \
- ORG/Ending.org \
- ORG/Escape.org \
- ORG/Fanfale1.org \
- ORG/Fanfale2.org \
- ORG/Fanfale3.org \
- ORG/FireEye.org \
- ORG/Gameover.org \
- ORG/Ginsuke.org \
- ORG/Grand.org \
- ORG/Gravity.org \
- ORG/Hell.org \
- ORG/ironH.org \
- ORG/Jenka.org \
- ORG/Jenka2.org \
- ORG/Kodou.org \
- ORG/LastBtl3.org \
- ORG/LastBtl.org \
- ORG/LastCave.org \
- ORG/Marine.org \
- ORG/Maze.org \
- ORG/MDown2.org \
- ORG/Mura.org \
- ORG/Oside.org \
- ORG/Plant.org \
- ORG/quiet.org \
- ORG/Requiem.org \
- ORG/Toroko.org \
- ORG/Vivi.org \
- ORG/Wanpak2.org \
- ORG/Wanpaku.org \
- ORG/Weed.org \
- ORG/White.org \
- ORG/XXXX.org \
- ORG/Zonbie.org \
- WAVE/Wave.dat
-
OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))
DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))
@@ -352,7 +285,7 @@
include $(wildcard $(DEPENDENCIES))
-obj/$(FILENAME)/windows_resources.o: $(ASSETS_DIRECTORY)/resources/CSE2.rc $(ASSETS_DIRECTORY)/resources/resource1.h $(ASSETS_DIRECTORY)/resources/afxres.h $(addprefix $(ASSETS_DIRECTORY)/resources/, $(RESOURCES))
+obj/$(FILENAME)/windows_resources.o: $(ASSETS_DIRECTORY)/resources/CSE2.rc $(ASSETS_DIRECTORY)/resources/resource1.h $(ASSETS_DIRECTORY)/resources/afxres.h $(ASSETS_DIRECTORY)/resources/ICON/0.ico
@mkdir -p $(@D)
@echo Compiling Windows resource file $<
@$(WINDRES) $< $@
--
⑨