diff --git a/src/font.cpp b/src/font.cpp index 62ab3e8..3e9097b 100644 --- a/src/font.cpp +++ b/src/font.cpp @@ -36,13 +36,13 @@ #define BUNDLED_FONT liberation #define BUNDLED_FONT_DECL(FONT) \ - extern unsigned char assets_##FONT##_ttf[]; \ - extern unsigned int assets_##FONT##_ttf_len; + extern unsigned char mkxp_assets_##FONT##_ttf[]; \ + extern unsigned int mkxp_assets_##FONT##_ttf_len; BUNDLED_FONT_DECL(liberation) -#define BUNDLED_FONT_D(f) assets_## f ##_ttf -#define BUNDLED_FONT_L(f) assets_## f ##_ttf_len +#define BUNDLED_FONT_D(f) mkxp_assets_## f ##_ttf +#define BUNDLED_FONT_L(f) mkxp_assets_## f ##_ttf_len // Go fuck yourself CPP #define BNDL_F_D(f) BUNDLED_FONT_D(f) diff --git a/src/main.cpp b/src/main.cpp index 0b15d2f..2d565cb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -184,7 +184,7 @@ static void setupWindowIcon(const Config &conf, SDL_Window *win) SDL_RWops *iconSrc; 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 iconSrc = SDL_RWFromFile(conf.iconPath.c_str(), "rb"); diff --git a/src/shader.cpp b/src/shader.cpp index 824454d..006b98b 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -56,7 +56,7 @@ #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); \ } @@ -135,8 +135,8 @@ static void setupShaderSource(GLuint shader, GLenum type, ++i; } - shaderSrc[i] = (const GLchar*) shader_common_h; - shaderSrcSize[i] = shader_common_h_len; + shaderSrc[i] = (const GLchar*) mkxp_shader_common_h; + shaderSrcSize[i] = mkxp_shader_common_h_len; ++i; shaderSrc[i] = (const GLchar*) body;