matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix remaining warnings, fix compiling errors when using --release

Browse Source
This commit is contained in:
jacob1 2013-10-29 23:55:10 -04:00
parent 45bf0dfcdb
commit 0180c9b15a
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@
*~ *~
*.pref *.pref
*.lua *.lua
*.sh
stdout.txt stdout.txt
stderr.txt stderr.txt
build*/* build*/*

2
SConscript
View File

@ -287,7 +287,7 @@ if(GetOption('release')):
if GetOption('macosx'): if GetOption('macosx'):
env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer']) env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer'])
else: else:
env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer', '-funsafe-loop-optimizations', '-Wunsafe-loop-optimizations']) env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer', '-funsafe-loop-optimizations', '-Wno-invalid-offsetof'])
# rpi specific enviroment settings # rpi specific enviroment settings
# ++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++

6
src/graphics/OpenGLDrawMethods.inl
View File

@ -133,7 +133,7 @@ int PIXELMETHODS_CLASS::drawtext(int x, int y, std::string s, int r, int g, int
return drawtext(x, y, s.c_str(), r, g, b, a); return drawtext(x, y, s.c_str(), r, g, b, a);
} }
TPT_INLINE int PIXELMETHODS_CLASS::drawchar(int x, int y, int c, int r, int g, int b, int a) int PIXELMETHODS_CLASS::drawchar(int x, int y, int c, int r, int g, int b, int a)
{ {
int i, j, w, bn = 0, ba = 0; int i, j, w, bn = 0, ba = 0;
char *rp = font_data + font_ptrs[c]; char *rp = font_data + font_ptrs[c];
@ -200,12 +200,12 @@ TPT_INLINE void PIXELMETHODS_CLASS::xor_pixel(int x, int y)
//OpenGL doesn't support single pixel manipulation, there are ways around it, but with poor performance //OpenGL doesn't support single pixel manipulation, there are ways around it, but with poor performance
} }
TPT_INLINE void PIXELMETHODS_CLASS::blendpixel(int x, int y, int r, int g, int b, int a) void PIXELMETHODS_CLASS::blendpixel(int x, int y, int r, int g, int b, int a)
{ {
//OpenGL doesn't support single pixel manipulation, there are ways around it, but with poor performance //OpenGL doesn't support single pixel manipulation, there are ways around it, but with poor performance
} }
TPT_INLINE void PIXELMETHODS_CLASS::addpixel(int x, int y, int r, int g, int b, int a) void PIXELMETHODS_CLASS::addpixel(int x, int y, int r, int g, int b, int a)
{ {
//OpenGL doesn't support single pixel manipulation, there are ways around it, but with poor performance //OpenGL doesn't support single pixel manipulation, there are ways around it, but with poor performance
} }

6
src/graphics/RasterDrawMethods.inl
View File

@ -108,7 +108,7 @@ int PIXELMETHODS_CLASS::drawtext(int x, int y, std::string s, int r, int g, int
return drawtext(x, y, s.c_str(), r, g, b, a); return drawtext(x, y, s.c_str(), r, g, b, a);
} }
TPT_INLINE int PIXELMETHODS_CLASS::drawchar(int x, int y, int c, int r, int g, int b, int a) int PIXELMETHODS_CLASS::drawchar(int x, int y, int c, int r, int g, int b, int a)
{ {
int i, j, w, bn = 0, ba = 0; int i, j, w, bn = 0, ba = 0;
char *rp = font_data + font_ptrs[c]; char *rp = font_data + font_ptrs[c];
@ -163,7 +163,7 @@ TPT_INLINE void PIXELMETHODS_CLASS::xor_pixel(int x, int y)
vid[y*(VIDXRES)+x] = PIXPACK(0x404040); vid[y*(VIDXRES)+x] = PIXPACK(0x404040);
} }
TPT_INLINE void PIXELMETHODS_CLASS::blendpixel(int x, int y, int r, int g, int b, int a) void PIXELMETHODS_CLASS::blendpixel(int x, int y, int r, int g, int b, int a)
{ {
pixel t; pixel t;
if (x<0 || y<0 || x>=VIDXRES || y>=VIDYRES) if (x<0 || y<0 || x>=VIDXRES || y>=VIDYRES)
@ -178,7 +178,7 @@ TPT_INLINE void PIXELMETHODS_CLASS::blendpixel(int x, int y, int r, int g, int b
vid[y*(VIDXRES)+x] = PIXRGB(r,g,b); vid[y*(VIDXRES)+x] = PIXRGB(r,g,b);
} }
TPT_INLINE void PIXELMETHODS_CLASS::addpixel(int x, int y, int r, int g, int b, int a) void PIXELMETHODS_CLASS::addpixel(int x, int y, int r, int g, int b, int a)
{ {
pixel t; pixel t;
if (x<0 || y<0 || x>=VIDXRES || y>=VIDYRES) if (x<0 || y<0 || x>=VIDXRES || y>=VIDYRES)