duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2020-01-15 08:01:23 +00:00
commit c7bd555eef
2 changed files with 82 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

158
Makefile
View file

@ -85,79 +85,79 @@ else
endif endif
SOURCES = \ SOURCES = \
src/ArmsItem \ src/ArmsItem.cpp \
src/Back \ src/Back.cpp \
src/Boss \ src/Boss.cpp \
src/BossAlmo1 \ src/BossAlmo1.cpp \
src/BossAlmo2 \ src/BossAlmo2.cpp \
src/BossBallos \ src/BossBallos.cpp \
src/BossFrog \ src/BossFrog.cpp \
src/BossIronH \ src/BossIronH.cpp \
src/BossLife \ src/BossLife.cpp \
src/BossOhm \ src/BossOhm.cpp \
src/BossPress \ src/BossPress.cpp \
src/BossTwinD \ src/BossTwinD.cpp \
src/BossX \ src/BossX.cpp \
src/BulHit \ src/BulHit.cpp \
src/Bullet \ src/Bullet.cpp \
src/Caret \ src/Caret.cpp \
src/Config \ src/Config.cpp \
src/Draw \ src/Draw.cpp \
src/Ending \ src/Ending.cpp \
src/Escape \ src/Escape.cpp \
src/Fade \ src/Fade.cpp \
src/File \ src/File.cpp \
src/Flags \ src/Flags.cpp \
src/Flash \ src/Flash.cpp \
src/Font \ src/Font.cpp \
src/Frame \ src/Frame.cpp \
src/Game \ src/Game.cpp \
src/Generic \ src/Generic.cpp \
src/GenericLoad \ src/GenericLoad.cpp \
src/Input \ src/Input.cpp \
src/KeyControl \ src/KeyControl.cpp \
src/Main \ src/Main.cpp \
src/Map \ src/Map.cpp \
src/MapName \ src/MapName.cpp \
src/MiniMap \ src/MiniMap.cpp \
src/MyChar \ src/MyChar.cpp \
src/MycHit \ src/MycHit.cpp \
src/MycParam \ src/MycParam.cpp \
src/NpcAct000 \ src/NpcAct000.cpp \
src/NpcAct020 \ src/NpcAct020.cpp \
src/NpcAct040 \ src/NpcAct040.cpp \
src/NpcAct060 \ src/NpcAct060.cpp \
src/NpcAct080 \ src/NpcAct080.cpp \
src/NpcAct100 \ src/NpcAct100.cpp \
src/NpcAct120 \ src/NpcAct120.cpp \
src/NpcAct140 \ src/NpcAct140.cpp \
src/NpcAct160 \ src/NpcAct160.cpp \
src/NpcAct180 \ src/NpcAct180.cpp \
src/NpcAct200 \ src/NpcAct200.cpp \
src/NpcAct220 \ src/NpcAct220.cpp \
src/NpcAct240 \ src/NpcAct240.cpp \
src/NpcAct260 \ src/NpcAct260.cpp \
src/NpcAct280 \ src/NpcAct280.cpp \
src/NpcAct300 \ src/NpcAct300.cpp \
src/NpcAct320 \ src/NpcAct320.cpp \
src/NpcAct340 \ src/NpcAct340.cpp \
src/NpChar \ src/NpChar.cpp \
src/NpcHit \ src/NpcHit.cpp \
src/NpcTbl \ src/NpcTbl.cpp \
src/Organya \ src/Organya.cpp \
src/PixTone \ src/PixTone.cpp \
src/Profile \ src/Profile.cpp \
src/Random \ src/Random.cpp \
src/Resource \ src/Resource.cpp \
src/SelStage \ src/SelStage.cpp \
src/Shoot \ src/Shoot.cpp \
src/Sound \ src/Sound.cpp \
src/Stage \ src/Stage.cpp \
src/Star \ src/Star.cpp \
src/TextScr \ src/TextScr.cpp \
src/Triangle \ src/Triangle.cpp \
src/ValueView \ src/ValueView.cpp \
src/Backends/Audio/SDL2 src/Backends/Audio/SDL2.cpp
RESOURCES = \ RESOURCES = \
BITMAP/Credit01.bmp \ BITMAP/Credit01.bmp \
@ -233,7 +233,7 @@ else
endif endif
ifeq ($(RENDERER), OpenGL3) ifeq ($(RENDERER), OpenGL3)
SOURCES += src/Backends/Rendering/OpenGL3 external/glad/src/glad SOURCES += src/Backends/Rendering/OpenGL3.cpp external/glad/src/glad.c
CSE2_CFLAGS += -Iexternal/glad/include CSE2_CFLAGS += -Iexternal/glad/include
CSE2_CXXFLAGS += -Iexternal/glad/include CSE2_CXXFLAGS += -Iexternal/glad/include
@ -243,11 +243,11 @@ ifeq ($(RENDERER), OpenGL3)
CSE2_LIBS += -lGL -ldl CSE2_LIBS += -lGL -ldl
endif endif
else ifeq ($(RENDERER), SDLTexture) else ifeq ($(RENDERER), SDLTexture)
SOURCES += src/Backends/Rendering/SDLTexture SOURCES += src/Backends/Rendering/SDLTexture.cpp
else ifeq ($(RENDERER), SDLSurface) else ifeq ($(RENDERER), SDLSurface)
SOURCES += src/Backends/Rendering/SDLSurface SOURCES += src/Backends/Rendering/SDLSurface.cpp
else ifeq ($(RENDERER), Software) else ifeq ($(RENDERER), Software)
SOURCES += src/Backends/Rendering/Software SOURCES += src/Backends/Rendering/Software.cpp
else else
$(error Invalid RENDERER selected) $(error Invalid RENDERER selected)
endif endif
@ -272,12 +272,12 @@ $(BUILD_DIRECTORY)/$(FILENAME): $(OBJECTS)
$(info Linking $@) $(info Linking $@)
@$(CXX) $(ALL_CXXFLAGS) $(CSE2_CXXFLAGS) $(ALL_LDFLAGS) $^ -o $@ $(ALL_LIBS) $(CSE2_LIBS) @$(CXX) $(ALL_CXXFLAGS) $(CSE2_CXXFLAGS) $(ALL_LDFLAGS) $^ -o $@ $(ALL_LIBS) $(CSE2_LIBS)
obj/$(FILENAME)/%.o: %.c obj/$(FILENAME)/%.c.o: %.c
@mkdir -p $(@D) @mkdir -p $(@D)
$(info Compiling $<) $(info Compiling $<)
@$(CC) $(ALL_CFLAGS) $(CSE2_CFLAGS) $(DEFINES) $< -o $@ -c @$(CC) $(ALL_CFLAGS) $(CSE2_CFLAGS) $(DEFINES) $< -o $@ -c
obj/$(FILENAME)/%.o: %.cpp obj/$(FILENAME)/%.cpp.o: %.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
$(info Compiling $<) $(info Compiling $<)
@$(CXX) $(ALL_CXXFLAGS) $(CSE2_CXXFLAGS) $(DEFINES) $< -o $@ -c @$(CXX) $(ALL_CXXFLAGS) $(CSE2_CXXFLAGS) $(DEFINES) $< -o $@ -c

6
README.md
View file

@ -101,9 +101,9 @@ Name | Function
`RENDERER=SDLTexture` | Use the hardware-accelerated SDL2 Texture API renderer (default) `RENDERER=SDLTexture` | Use the hardware-accelerated SDL2 Texture API renderer (default)
`RENDERER=SDLSurface` | Use the software-rendered SDL2 Surface API renderer `RENDERER=SDLSurface` | Use the software-rendered SDL2 Surface API renderer
`RENDERER=Software` | Use the hand-written software renderer `RENDERER=Software` | Use the hand-written software renderer
`WARNINGS=1` | Enable common warnings `WARNINGS=1` | Enable common compiler warnings
`WARNINGS_ALL=1` | Enable ALL warnings (clang/MSVC only) `WARNINGS_ALL=1` | Enable ALL compiler warnings (clang/MSVC only)
`WARNINGS_FATAL=1` | Make all warnings errors `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 and assets can be found in the newly-generated `game` folder.