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

More portability improvements

Browse source 
Now this actually compile on Linux, but it doesn't run.
This commit is contained in:
Clownacy 2019-09-04 13:51:49 +00:00
parent a3bb651194
commit 0424c3e275
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -34,12 +34,6 @@ ifeq ($(FIX_BUGS), 1)
CXXFLAGS += -DFIX_BUGS CXXFLAGS += -DFIX_BUGS
endif endif
ifeq ($(CONSOLE), 1)
CXXFLAGS += -mconsole
else
CXXFLAGS += -mwindows
endif
ifeq ($(DEBUG_SAVE), 1) ifeq ($(DEBUG_SAVE), 1)
CXXFLAGS += -DDEBUG_SAVE CXXFLAGS += -DDEBUG_SAVE
endif endif
@ -207,11 +201,11 @@ ifeq ($(RENDERER), OpenGL3)
LIBS += `pkg-config glew --libs` LIBS += `pkg-config glew --libs`
endif endif
# ifeq ($(WINDOWS), 1) ifeq ($(WINDOWS), 1)
LIBS += -lopengl32 LIBS += -lopengl32
# else else
# LIBS += -lGL LIBS += -lGL
# endif endif
else ifeq ($(RENDERER), Texture) else ifeq ($(RENDERER), Texture)
SOURCES += src/Backends/Rendering/SDLTexture SOURCES += src/Backends/Rendering/SDLTexture
else ifeq ($(RENDERER), Surface) else ifeq ($(RENDERER), Surface)
@ -225,7 +219,9 @@ endif
OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES))) OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))
DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES))) DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))
OBJECTS += obj/$(FILENAME)/windows_resources.o ifeq ($(WINDOWS), 1)
OBJECTS += obj/$(FILENAME)/windows_resources.o
endif
all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME) all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME)
@echo Finished @echo Finished

1
README.md
View file

@ -25,6 +25,7 @@ Run 'make' in this folder, preferably with some of the following settings:
* `STATIC=1` - Produce a statically-linked executable (so you don't need to bundle DLL files) * `STATIC=1` - Produce a statically-linked executable (so you don't need to bundle DLL files)
* `JAPANESE=1` - Enable the Japanese-language build (instead of the unofficial Aeon Genesis English translation) * `JAPANESE=1` - Enable the Japanese-language build (instead of the unofficial Aeon Genesis English translation)
* `FIX_BUGS=1` - Fix bugs in the game (see [src/Bug Fixes.txt](src/Bug%20Fixes.txt)) * `FIX_BUGS=1` - Fix bugs in the game (see [src/Bug Fixes.txt](src/Bug%20Fixes.txt))
* `WINDOWS=1` - Build for Windows
* `DEBUG_SAVE=1` - Re-enable the ability to drag-and-drop save files onto the window * `DEBUG_SAVE=1` - Re-enable the ability to drag-and-drop save files onto the window
* `RENDERER=OpenGL3` - Use the hardware-accelerated OpenGL 3.2 renderer * `RENDERER=OpenGL3` - Use the hardware-accelerated OpenGL 3.2 renderer
* `RENDERER=Texture` - Use the hardware-accelerated SDL2 Texture API renderer (default) * `RENDERER=Texture` - Use the hardware-accelerated SDL2 Texture API renderer (default)

6
src/Organya.cpp
View file

@ -397,9 +397,6 @@ void OrgData::InitOrgData(void)
// 曲情報を設定。flagはアイテムを指定 (Set song information. flag specifies an item) // 曲情報を設定。flagはアイテムを指定 (Set song information. flag specifies an item)
BOOL OrgData::SetMusicInfo(MUSICINFO *mi, unsigned long flag) BOOL OrgData::SetMusicInfo(MUSICINFO *mi, unsigned long flag)
{ {
#ifndef FIX_BUGS // Leftover debug junk
char str[32];
#endif
int i; int i;
if (flag & SETGRID) // グリッドを有効に (Enable grid) if (flag & SETGRID) // グリッドを有効に (Enable grid)
@ -411,9 +408,6 @@ BOOL OrgData::SetMusicInfo(MUSICINFO *mi, unsigned long flag)
if (flag & SETWAIT) if (flag & SETWAIT)
{ {
info.wait = mi->wait; info.wait = mi->wait;
#ifndef FIX_BUGS
itoa(mi->wait, str, 10);
#endif
} }
if (flag & SETREPEAT) if (flag & SETREPEAT)