ref: fc68b772a81d9c9f40aa4dcda6b81aa92277eade
parent: fdae7f89a52c73050c337e23e0ddb48b012f3977
parent: 5985fceaeed7afbb60a5ccfae162bf2814029a35
author: Clownacy <Clownacy@users.noreply.github.com>
date: Thu Dec 5 10:50:56 EST 2019
Merge branch 'accurate' into portable
--- a/Makefile
+++ b/Makefile
@@ -13,26 +13,26 @@
ALL_LIBS = $(LIBS)
ifeq ($(WINDOWS), 1)
- EXE_EXTENSION = .exe
+ EXE_EXTENSION = .exe
endif
ifeq ($(RELEASE), 1)
- ALL_CXXFLAGS += -O3 -DNDEBUG
- ALL_LDFLAGS += -s
- FILENAME_DEF = CSE2$(EXE_EXTENSION)
- DOCONFIG_FILENAME_DEF = DoConfig$(EXE_EXTENSION)
+ ALL_CXXFLAGS += -O3 -DNDEBUG
+ ALL_LDFLAGS += -s
+ FILENAME_DEF = CSE2$(EXE_EXTENSION)
+ DOCONFIG_FILENAME_DEF = DoConfig$(EXE_EXTENSION)
else
- ALL_CXXFLAGS += -Og -ggdb3
- FILENAME_DEF = CSE2_debug$(EXE_EXTENSION)
- DOCONFIG_FILENAME_DEF = DoConfig_debug$(EXE_EXTENSION)
+ ALL_CXXFLAGS += -Og -ggdb3
+ FILENAME_DEF = CSE2_debug$(EXE_EXTENSION)
+ DOCONFIG_FILENAME_DEF = DoConfig_debug$(EXE_EXTENSION)
endif
ifeq ($(JAPANESE), 1)
- DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_jp
+ DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_jp
- CSE2_CXXFLAGS += -DJAPANESE
+ CSE2_CXXFLAGS += -DJAPANESE
else
- DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_en
+ DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_en
endif
FILENAME ?= $(FILENAME_DEF)
@@ -39,29 +39,28 @@
DOCONFIG_FILENAME ?= $(DOCONFIG_FILENAME_DEF)
ifeq ($(FIX_BUGS), 1)
- CSE2_CXXFLAGS += -DFIX_BUGS
+ CSE2_CXXFLAGS += -DFIX_BUGS
endif
ifeq ($(DEBUG_SAVE), 1)
- CSE2_CXXFLAGS += -DDEBUG_SAVE
+ CSE2_CXXFLAGS += -DDEBUG_SAVE
endif
ifeq ($(WARNINGS), 1)
- ALL_CXXFLAGS += -Wall -Wextra -pedantic
+ ALL_CXXFLAGS += -Wall -Wextra -pedantic
endif
ifeq ($(WARNINGS_ALL), 1)
- ifneq ($(findstring clang,$(CXX)),)
- # Use clang-specific flag -Weverything
- ALL_CXXFLAGS += -Weverything
- else
- # This is indented with spaces because otherwise it doesn't compile (make doesn't like tabs there for some reason)
- $(warning Couldn\'t activate all warnings (Unsupported compiler))
- endif
+ ifneq ($(findstring clang,$(CXX)),)
+ # Use clang-specific flag -Weverything
+ ALL_CXXFLAGS += -Weverything
+ else
+ $(warning Couldn\'t activate all warnings (Unsupported compiler))
+ endif
endif
ifeq ($(WARNINGS_FATAL), 1)
- ALL_CXXFLAGS += -Werror
+ ALL_CXXFLAGS += -Werror
endif
ALL_CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d
@@ -68,186 +67,186 @@
CSE2_CXXFLAGS += $(shell pkg-config sdl2 --cflags) $(shell pkg-config freetype2 --cflags)
ifeq ($(STATIC), 1)
- ALL_LDFLAGS += -static
- CSE2_LIBS += $(shell pkg-config sdl2 --libs --static) $(shell pkg-config freetype2 --libs --static) -lfreetype
- DOCONFIG_LIBS += $(shell fltk-config --cxxflags --libs --ldstaticflags)
+ ALL_LDFLAGS += -static
+ CSE2_LIBS += $(shell pkg-config sdl2 --libs --static) $(shell pkg-config freetype2 --libs --static) -lfreetype
+ DOCONFIG_LIBS += $(shell fltk-config --cxxflags --libs --ldstaticflags)
else
- CSE2_LIBS += $(shell pkg-config sdl2 --libs) $(shell pkg-config freetype2 --libs)
- DOCONFIG_LIBS += $(shell fltk-config --cxxflags --libs --ldflags)
+ CSE2_LIBS += $(shell pkg-config sdl2 --libs) $(shell pkg-config freetype2 --libs)
+ DOCONFIG_LIBS += $(shell fltk-config --cxxflags --libs --ldflags)
endif
SOURCES = \
- src/ArmsItem \
- src/Back \
- src/Boss \
- src/BossAlmo1 \
- src/BossAlmo2 \
- src/BossBallos \
- src/BossFrog \
- src/BossIronH \
- src/BossLife \
- src/BossOhm \
- src/BossPress \
- src/BossTwinD \
- src/BossX \
- src/BulHit \
- src/Bullet \
- src/Caret \
- src/Config \
- src/Draw \
- src/Ending \
- src/Escape \
- src/Fade \
- src/File \
- src/Flags \
- src/Flash \
- src/Font \
- src/Frame \
- src/Game \
- src/Generic \
- src/GenericLoad \
- src/Input \
- src/KeyControl \
- src/Main \
- src/Map \
- src/MapName \
- src/MiniMap \
- src/MyChar \
- src/MycHit \
- src/MycParam \
- src/NpcAct000 \
- src/NpcAct020 \
- src/NpcAct040 \
- src/NpcAct060 \
- src/NpcAct080 \
- src/NpcAct100 \
- src/NpcAct120 \
- src/NpcAct140 \
- src/NpcAct160 \
- src/NpcAct180 \
- src/NpcAct200 \
- src/NpcAct220 \
- src/NpcAct240 \
- src/NpcAct260 \
- src/NpcAct280 \
- src/NpcAct300 \
- src/NpcAct320 \
- src/NpcAct340 \
- src/NpChar \
- src/NpcHit \
- src/NpcTbl \
- src/Organya \
- src/PixTone \
- src/Profile \
- src/Random \
- src/Resource \
- src/SelStage \
- src/Shoot \
- src/Sound \
- src/Stage \
- src/Star \
- src/TextScr \
- src/Triangle \
- src/ValueView \
- src/Backends/Audio/SDL2
+ src/ArmsItem \
+ src/Back \
+ src/Boss \
+ src/BossAlmo1 \
+ src/BossAlmo2 \
+ src/BossBallos \
+ src/BossFrog \
+ src/BossIronH \
+ src/BossLife \
+ src/BossOhm \
+ src/BossPress \
+ src/BossTwinD \
+ src/BossX \
+ src/BulHit \
+ src/Bullet \
+ src/Caret \
+ src/Config \
+ src/Draw \
+ src/Ending \
+ src/Escape \
+ src/Fade \
+ src/File \
+ src/Flags \
+ src/Flash \
+ src/Font \
+ src/Frame \
+ src/Game \
+ src/Generic \
+ src/GenericLoad \
+ src/Input \
+ src/KeyControl \
+ src/Main \
+ src/Map \
+ src/MapName \
+ src/MiniMap \
+ src/MyChar \
+ src/MycHit \
+ src/MycParam \
+ src/NpcAct000 \
+ src/NpcAct020 \
+ src/NpcAct040 \
+ src/NpcAct060 \
+ src/NpcAct080 \
+ src/NpcAct100 \
+ src/NpcAct120 \
+ src/NpcAct140 \
+ src/NpcAct160 \
+ src/NpcAct180 \
+ src/NpcAct200 \
+ src/NpcAct220 \
+ src/NpcAct240 \
+ src/NpcAct260 \
+ src/NpcAct280 \
+ src/NpcAct300 \
+ src/NpcAct320 \
+ src/NpcAct340 \
+ src/NpChar \
+ src/NpcHit \
+ src/NpcTbl \
+ src/Organya \
+ src/PixTone \
+ src/Profile \
+ src/Random \
+ src/Resource \
+ src/SelStage \
+ src/Shoot \
+ src/Sound \
+ src/Stage \
+ src/Star \
+ src/TextScr \
+ src/Triangle \
+ src/ValueView \
+ src/Backends/Audio/SDL2
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 \
- CURSOR/CURSOR_IKA.bmp \
- CURSOR/CURSOR_NORMAL.bmp \
- ICON/ICON_MINI.bmp \
- 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
+ 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 \
+ CURSOR/CURSOR_IKA.bmp \
+ CURSOR/CURSOR_NORMAL.bmp \
+ ICON/ICON_MINI.bmp \
+ 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
ifeq ($(JAPANESE), 1)
- RESOURCES += BITMAP/pixel_jp.bmp
- RESOURCES += FONT/NotoSansMonoCJKjp.otf
+ RESOURCES += BITMAP/pixel_jp.bmp
+ RESOURCES += FONT/NotoSansMonoCJKjp.otf
else
- RESOURCES += BITMAP/pixel.bmp
- RESOURCES += FONT/LiberationMono.ttf
+ RESOURCES += BITMAP/pixel.bmp
+ RESOURCES += FONT/LiberationMono.ttf
endif
ifeq ($(RENDERER), OpenGL3)
- SOURCES += src/Backends/Rendering/OpenGL3
- CSE2_CXXFLAGS += $(shell pkg-config glew --cflags)
+ SOURCES += src/Backends/Rendering/OpenGL3
+ CSE2_CXXFLAGS += $(shell pkg-config glew --cflags)
- ifeq ($(STATIC), 1)
- CSE2_CXXFLAGS += -DGLEW_STATIC
- CSE2_LIBS += $(shell pkg-config glew --libs --static)
- else
- CSE2_LIBS += $(shell pkg-config glew --libs)
- endif
+ ifeq ($(STATIC), 1)
+ CSE2_CXXFLAGS += -DGLEW_STATIC
+ CSE2_LIBS += $(shell pkg-config glew --libs --static)
+ else
+ CSE2_LIBS += $(shell pkg-config glew --libs)
+ endif
- ifeq ($(WINDOWS), 1)
- CSE2_LIBS += -lopengl32
- else
- CSE2_LIBS += -lGL
- endif
+ ifeq ($(WINDOWS), 1)
+ CSE2_LIBS += -lopengl32
+ else
+ CSE2_LIBS += -lGL
+ endif
else ifeq ($(RENDERER), SDLTexture)
- SOURCES += src/Backends/Rendering/SDLTexture
+ SOURCES += src/Backends/Rendering/SDLTexture
else ifeq ($(RENDERER), SDLSurface)
- SOURCES += src/Backends/Rendering/SDLSurface
+ SOURCES += src/Backends/Rendering/SDLSurface
else ifeq ($(RENDERER), Software)
- SOURCES += src/Backends/Rendering/Software
+ SOURCES += src/Backends/Rendering/Software
else
- @echo Invalid RENDERER selected; this build will fail
+ @echo Invalid RENDERER selected; this build will fail
endif
OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))
@@ -254,7 +253,7 @@
DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))
ifeq ($(WINDOWS), 1)
- OBJECTS += obj/$(FILENAME)/windows_resources.o
+ OBJECTS += obj/$(FILENAME)/windows_resources.o
endif
all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME)
--
⑨