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

Merge branch 'master' of https://github.com/cuckydev/Cave-Story-Engine-2

Browse source
This commit is contained in:
Clownacy 2019-02-06 22:46:56 +00:00
commit f1beb30e70
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -4,7 +4,7 @@
# Misc # Misc
/obj /obj
Config.dat Config.dat
Profile.dat *rofile.dat
build.7z build.7z
build.zip build.zip

15
Makefile
View file

@ -1,18 +1,18 @@
ifeq ($(RELEASE), 1) ifeq ($(RELEASE), 1)
CXXFLAGS := -O3 -s CXXFLAGS := -O3 -s
FILENAME := release FILENAME ?= release
else else
CXXFLAGS := -O0 -g CXXFLAGS := -O0 -g
FILENAME := debug FILENAME ?= debug
endif endif
ifeq ($(JAPANESE), 1) ifeq ($(JAPANESE), 1)
CXXFLAGS += -DJAPANESE CXXFLAGS += -DJAPANESE
LIBS += -liconv LIBS += -liconv
ifeq ($(RELEASE), 1) ifeq ($(RELEASE), 1)
FILENAME := releasejp FILENAME ?= releasejp
else else
FILENAME := debugjp FILENAME ?= debugjp
endif endif
endif endif
@ -21,14 +21,13 @@ CXXFLAGS += -DFIX_BUGS
endif endif
ifeq ($(WINDOWS), 1) ifeq ($(WINDOWS), 1)
ifeq ($(CONSOLE), 1)
CXXFLAGS += -mconsole
endif
CXXFLAGS += -DWINDOWS CXXFLAGS += -DWINDOWS
LIBS += -lkernel32 LIBS += -lkernel32
endif endif
ifeq ($(CONSOLE), 1)
CXXFLAGS += -mconsole
endif
CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags` CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags`
LIBS += `sdl2-config --static-libs` `pkg-config freetype2 --libs` LIBS += `sdl2-config --static-libs` `pkg-config freetype2 --libs`

4
src/CommonDefines.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#define PATH_LENGTH 260 //Pixel had the path size locked to 260 (dangerously low), if you tried to open the executable in a path with more than around 220 characters, it'd crash. #define PATH_LENGTH 260 //Pixel had the path size locked to 260 (dangerously low), if you tried to open the executable in a path with more than around 220 characters, it'd crash.
#define WINDOW_WIDTH ((320*16)/9) #define WINDOW_WIDTH 320
#define WINDOW_HEIGHT 320 #define WINDOW_HEIGHT 240