ref: dba45f7d0f5b37c2a29171ce5960e1000f42a7e6
parent: a09f73f2eace8f62cad14efe27348548a729873c
author: Clownacy <Clownacy@users.noreply.github.com>
date: Wed Jan 15 02:54:05 EST 2020
Makefile: Specify file extensions This matches the portable branch's CMakeLists.txt, and make mixed C/C++ code less awkward-looking.
--- a/Makefile
+++ b/Makefile
@@ -65,75 +65,75 @@
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/Dialog \
- src/Draw \
- src/Ending \
- src/Escape \
- src/Fade \
- src/Flags \
- src/Flash \
- 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/SelStage \
- src/Shoot \
- src/Sound \
- src/Stage \
- src/Star \
- src/TextScr \
- src/Triangle \
- src/ValueView
+ src/ArmsItem.cpp \
+ src/Back.cpp \
+ src/Boss.cpp \
+ src/BossAlmo1.cpp \
+ src/BossAlmo2.cpp \
+ src/BossBallos.cpp \
+ src/BossFrog.cpp \
+ src/BossIronH.cpp \
+ src/BossLife.cpp \
+ src/BossOhm.cpp \
+ src/BossPress.cpp \
+ src/BossTwinD.cpp \
+ src/BossX.cpp \
+ src/BulHit.cpp \
+ src/Bullet.cpp \
+ src/Caret.cpp \
+ src/Config.cpp \
+ src/Dialog.cpp \
+ src/Draw.cpp \
+ src/Ending.cpp \
+ src/Escape.cpp \
+ src/Fade.cpp \
+ src/Flags.cpp \
+ src/Flash.cpp \
+ src/Frame.cpp \
+ src/Game.cpp \
+ src/Generic.cpp \
+ src/GenericLoad.cpp \
+ src/Input.cpp \
+ src/KeyControl.cpp \
+ src/Main.cpp \
+ src/Map.cpp \
+ src/MapName.cpp \
+ src/MiniMap.cpp \
+ src/MyChar.cpp \
+ src/MycHit.cpp \
+ src/MycParam.cpp \
+ src/NpcAct000.cpp \
+ src/NpcAct020.cpp \
+ src/NpcAct040.cpp \
+ src/NpcAct060.cpp \
+ src/NpcAct080.cpp \
+ src/NpcAct100.cpp \
+ src/NpcAct120.cpp \
+ src/NpcAct140.cpp \
+ src/NpcAct160.cpp \
+ src/NpcAct180.cpp \
+ src/NpcAct200.cpp \
+ src/NpcAct220.cpp \
+ src/NpcAct240.cpp \
+ src/NpcAct260.cpp \
+ src/NpcAct280.cpp \
+ src/NpcAct300.cpp \
+ src/NpcAct320.cpp \
+ src/NpcAct340.cpp \
+ src/NpChar.cpp \
+ src/NpcHit.cpp \
+ src/NpcTbl.cpp \
+ src/Organya.cpp \
+ src/PixTone.cpp \
+ src/Profile.cpp \
+ src/SelStage.cpp \
+ src/Shoot.cpp \
+ src/Sound.cpp \
+ src/Stage.cpp \
+ src/Star.cpp \
+ src/TextScr.cpp \
+ src/Triangle.cpp \
+ src/ValueView.cpp
RESOURCES = \
BITMAP/Credit01.bmp \
@@ -220,7 +220,7 @@
$(info Linking $@)
@$(CXX) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) $^ -o $@ $(ALL_LIBS)
-obj/$(FILENAME)/%.o: %.cpp
+obj/$(FILENAME)/%.cpp.o: %.cpp
@mkdir -p $(@D)
$(info Compiling $<)
@$(CXX) $(ALL_CXXFLAGS) $< -o $@ -c