diff --git a/src/cube.h b/src/cube.h index 465f9ce..6c7d618 100644 --- a/src/cube.h +++ b/src/cube.h @@ -2,9 +2,7 @@ #import -#define gamma gamma__ #include -#undef gamma #include "tools.h" diff --git a/src/rendergl.m b/src/rendergl.m index 4168914..1e65b73 100644 --- a/src/rendergl.m +++ b/src/rendergl.m @@ -1,5 +1,7 @@ // rendergl.cpp: core opengl rendering stuff +#define gamma math_gamma + #include "cube.h" #import "Command.h" @@ -324,6 +326,8 @@ addstrip(int tex, int start, int n) [strips addItem:&s]; } +#undef gamma + VARFP(gamma, 30, 100, 300, { float f = gamma / 100.0f; Uint16 ramp[256]; diff --git a/src/tools.h b/src/tools.h index a11849f..37e2a54 100644 --- a/src/tools.h +++ b/src/tools.h @@ -3,16 +3,8 @@ #ifndef _TOOLS_H #define _TOOLS_H -#ifdef __GNUC__ -# define gamma __gamma -#endif - #include -#ifdef __GNUC__ -# undef gamma -#endif - #include #include #include