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

Improved Japanese build a little

Browse source
This commit is contained in:
Clownacy 2019-01-25 12:01:18 +00:00
parent 414fe76abc
commit b325efd981
4 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Makefile
View file

@ -1,22 +1,20 @@
RELEASE = 0 RELEASE = 0
ifeq ($(RELEASE), 0)
CXXFLAGS := -O0 -g -static -mconsole
FILENAME := debug
else
CXXFLAGS := -O3 -s -static
FILENAME := release
endif
ifeq ($(JAPANESE), 1) ifeq ($(JAPANESE), 1)
CXXFLAGS += -DJAPANESE
ifeq ($(RELEASE), 0) ifeq ($(RELEASE), 0)
CXXFLAGS := -DJAPANESE -O0 -g -static -mconsole
FILENAME := debugjp FILENAME := debugjp
else else
CXXFLAGS := -DJAPANESE -O3 -s -static
FILENAME := releasejp FILENAME := releasejp
endif endif
else
ifeq ($(RELEASE), 0)
CXXFLAGS := -O0 -g -static -mconsole
FILENAME := debug
else
CXXFLAGS := -O3 -s -static
FILENAME := release
endif
endif endif
ifeq ($(FIX_BUGS), 1) ifeq ($(FIX_BUGS), 1)
@ -76,8 +74,6 @@ RESOURCES = \
BITMAP/CREDIT16.bmp \ BITMAP/CREDIT16.bmp \
BITMAP/CREDIT17.bmp \ BITMAP/CREDIT17.bmp \
BITMAP/CREDIT18.bmp \ BITMAP/CREDIT18.bmp \
BITMAP/PIXEL.bmp \
BITMAP/PIXEL_JP.bmp \
ICON/4.bmp \ ICON/4.bmp \
ORG/ACCESS \ ORG/ACCESS \
ORG/ANZEN \ ORG/ANZEN \
@ -123,6 +119,12 @@ RESOURCES = \
ORG/ZONBIE \ ORG/ZONBIE \
WAVE/WAVE100 WAVE/WAVE100
ifeq ($(JAPANESE), 1)
RESOURCES += BITMAP/PIXEL_JP.bmp
else
RESOURCES += BITMAP/PIXEL.bmp
endif
OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES))) OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))
all: build/$(FILENAME).exe all: build/$(FILENAME).exe

2
src/Font.cpp
View file

@ -4,7 +4,9 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef JAPANESE
#include <iconv.h> #include <iconv.h>
#endif
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H

4
src/GenericLoad.cpp
View file

@ -3,11 +3,7 @@
bool LoadGenericData() bool LoadGenericData()
{ {
#ifdef JAPANESE
MakeSurface_Resource("PIXEL_JP", 1);
#else
MakeSurface_Resource("PIXEL", 1); MakeSurface_Resource("PIXEL", 1);
#endif
bool bError = false; bool bError = false;
if (!MakeSurface_File("MyChar", 16)) if (!MakeSurface_File("MyChar", 16))

15
src/Resource.cpp
View file

@ -64,8 +64,11 @@
#include "Resource/BITMAP/CREDIT16.bmp.h" #include "Resource/BITMAP/CREDIT16.bmp.h"
#include "Resource/BITMAP/CREDIT17.bmp.h" #include "Resource/BITMAP/CREDIT17.bmp.h"
#include "Resource/BITMAP/CREDIT18.bmp.h" #include "Resource/BITMAP/CREDIT18.bmp.h"
#include "Resource/BITMAP/PIXEL.bmp.h" #ifdef JAPANESE
#include "Resource/BITMAP/PIXEL_JP.bmp.h" #include "Resource/BITMAP/PIXEL_JP.bmp.h"
#else
#include "Resource/BITMAP/PIXEL.bmp.h"
#endif
#include "Resource/ICON/4.bmp.h" #include "Resource/ICON/4.bmp.h"
const unsigned char* GetResource(const char *name, size_t *size) const unsigned char* GetResource(const char *name, size_t *size)
@ -377,13 +380,13 @@ const unsigned char* GetResource(const char *name, size_t *size)
} }
if (!strcmp(name, "PIXEL")) if (!strcmp(name, "PIXEL"))
{ {
*size = sizeof(rPIXEL); #ifdef JAPANESE
return rPIXEL;
}
if (!strcmp(name, "PIXEL_JP"))
{
*size = sizeof(rPIXEL_JP); *size = sizeof(rPIXEL_JP);
return rPIXEL_JP; return rPIXEL_JP;
#else
*size = sizeof(rPIXEL);
return rPIXEL;
#endif
} }
//ICON //ICON