diff --git a/.gitignore b/.gitignore
index 41cd57805..1e861266f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *~
 *.pref
 *.lua
+*.sh
 stdout.txt
 stderr.txt
 build*/*
diff --git a/SConscript b/SConscript
index a95cf43ce..842d6117f 100755
--- a/SConscript
+++ b/SConscript
@@ -287,7 +287,7 @@ if(GetOption('release')):
 	if GetOption('macosx'):
 		env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer'])
 	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
 # ++++++++++++++++++++++++++++++++
diff --git a/src/graphics/OpenGLDrawMethods.inl b/src/graphics/OpenGLDrawMethods.inl
index 4b20f4b81..0f5e37464 100644
--- a/src/graphics/OpenGLDrawMethods.inl
+++ b/src/graphics/OpenGLDrawMethods.inl
@@ -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);
 }
 
-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;
 	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
 }
 
-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
 }
 
-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
 }
diff --git a/src/graphics/RasterDrawMethods.inl b/src/graphics/RasterDrawMethods.inl
index 623f9ce14..96dfb91d3 100644
--- a/src/graphics/RasterDrawMethods.inl
+++ b/src/graphics/RasterDrawMethods.inl
@@ -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);
 }
 
-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;
 	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);
 }
 
-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;
 	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);
 }
 
-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;
 	if (x<0 || y<0 || x>=VIDXRES || y>=VIDYRES)