MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Fixed compilation

Browse source
This commit is contained in:
RadialApps 2017-08-11 02:53:55 +05:30
parent e4ca2c4e66
commit eef8e2c24c
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/font.cpp
View file

@ -36,13 +36,13 @@
#define BUNDLED_FONT liberation #define BUNDLED_FONT liberation
#define BUNDLED_FONT_DECL(FONT) \ #define BUNDLED_FONT_DECL(FONT) \
extern unsigned char assets_##FONT##_ttf[]; \ extern unsigned char mkxp_assets_##FONT##_ttf[]; \
extern unsigned int assets_##FONT##_ttf_len; extern unsigned int mkxp_assets_##FONT##_ttf_len;
BUNDLED_FONT_DECL(liberation) BUNDLED_FONT_DECL(liberation)
#define BUNDLED_FONT_D(f) assets_## f ##_ttf #define BUNDLED_FONT_D(f) mkxp_assets_## f ##_ttf
#define BUNDLED_FONT_L(f) assets_## f ##_ttf_len #define BUNDLED_FONT_L(f) mkxp_assets_## f ##_ttf_len
// Go fuck yourself CPP // Go fuck yourself CPP
#define BNDL_F_D(f) BUNDLED_FONT_D(f) #define BNDL_F_D(f) BUNDLED_FONT_D(f)

2
src/main.cpp
View file

@ -184,7 +184,7 @@ static void setupWindowIcon(const Config &conf, SDL_Window *win)
SDL_RWops *iconSrc; SDL_RWops *iconSrc;
if (conf.iconPath.empty()) if (conf.iconPath.empty())
iconSrc = SDL_RWFromConstMem(assets_icon_png, assets_icon_png_len); iconSrc = SDL_RWFromConstMem(mkxp_assets_icon_png, mkxp_assets_icon_png_len);
else else
iconSrc = SDL_RWFromFile(conf.iconPath.c_str(), "rb"); iconSrc = SDL_RWFromFile(conf.iconPath.c_str(), "rb");

6
src/shader.cpp
View file

@ -56,7 +56,7 @@
#define INIT_SHADER(vert, frag, name) \ #define INIT_SHADER(vert, frag, name) \
{ \ { \
Shader::init(shader_##vert##_vert, shader_##vert##_vert_len, shader_##frag##_frag, shader_##frag##_frag_len, \ Shader::init(mkxp_shader_##vert##_vert, mkxp_shader_##vert##_vert_len, mkxp_shader_##frag##_frag, mkxp_shader_##frag##_frag_len, \
#vert, #frag, #name); \ #vert, #frag, #name); \
} }
@ -135,8 +135,8 @@ static void setupShaderSource(GLuint shader, GLenum type,
++i; ++i;
} }
shaderSrc[i] = (const GLchar*) shader_common_h; shaderSrc[i] = (const GLchar*) mkxp_shader_common_h;
shaderSrcSize[i] = shader_common_h_len; shaderSrcSize[i] = mkxp_shader_common_h_len;
++i; ++i;
shaderSrc[i] = (const GLchar*) body; shaderSrc[i] = (const GLchar*) body;