diff --git a/main/source/cl_dll/hud_crosshairs.cpp b/main/source/cl_dll/hud_crosshairs.cpp index f54f7aef..adcfd396 100644 --- a/main/source/cl_dll/hud_crosshairs.cpp +++ b/main/source/cl_dll/hud_crosshairs.cpp @@ -185,6 +185,9 @@ int CHudCrosshairs::Draw(float time) gl.line(Vector2D(center.x + gap + size, center.y), Vector2D(center.x + gap, center.y)); } +#ifdef __APPLE__ + //Remove when OSX builds with c++11 +#else // Draw the circle. if (cl_cross_circle_radius->value > 0.0f) { gl.line_width(1.0f); @@ -198,6 +201,7 @@ int CHudCrosshairs::Draw(float time) gl.circle(center, circle_points); } +#endif // Draw the dot. if (cl_cross_dot_size->value > 0.0f) { diff --git a/main/source/cl_dll/hud_crosshairs.h b/main/source/cl_dll/hud_crosshairs.h index 7c84f4c5..a313ddb4 100644 --- a/main/source/cl_dll/hud_crosshairs.h +++ b/main/source/cl_dll/hud_crosshairs.h @@ -24,8 +24,12 @@ class CHudCrosshairs : public CHudBase cvar_t* cl_cross_line_left; cvar_t* cl_cross_line_right; +#ifdef __APPLE__ + //Remove when OSX builds with c++11 +#else float old_circle_radius; std::vector circle_points; +#endif public: virtual int Init(); diff --git a/main/source/cl_dll/hudgl.cpp b/main/source/cl_dll/hudgl.cpp index 0d44a6c8..2b43e27e 100644 --- a/main/source/cl_dll/hudgl.cpp +++ b/main/source/cl_dll/hudgl.cpp @@ -52,6 +52,9 @@ void HudGL::line(const Vector2D& start, const Vector2D& end) const { glEnd(); } +#ifdef __APPLE__ +//Remove when OSX builds with c++11 +#else void HudGL::circle(const Vector2D& center, const std::vector& points) const { glBegin(GL_LINE_STRIP); @@ -61,6 +64,7 @@ void HudGL::circle(const Vector2D& center, const std::vector& points) glVertex2f(center.x + points[0].x, center.y + points[0].y); glEnd(); } +#endif void HudGL::rectangle(const Vector2D& corner_a, const Vector2D& corner_b) const { glBegin(GL_QUADS); @@ -71,6 +75,9 @@ void HudGL::rectangle(const Vector2D& corner_a, const Vector2D& corner_b) const glEnd(); } +#ifdef __APPLE__ +//Remove when OSX builds with c++11 +#else std::vector HudGL::compute_circle(float radius) { // Maximum allowed distance between the circle and the rendered line segment. const float MAX_ERROR = 0.1f; @@ -87,3 +94,4 @@ std::vector HudGL::compute_circle(float radius) { return points; } +#endif \ No newline at end of file diff --git a/main/source/cl_dll/hudgl.h b/main/source/cl_dll/hudgl.h index 253b8bf4..49ad88cc 100644 --- a/main/source/cl_dll/hudgl.h +++ b/main/source/cl_dll/hudgl.h @@ -9,8 +9,16 @@ public: void color(unsigned char r, unsigned char g, unsigned char b, unsigned char a) const; void line_width(float width) const; void line(const Vector2D& start, const Vector2D& end) const; +#ifdef __APPLE__ + //Remove when OSX builds with c++11 +#else void circle(const Vector2D& center, const std::vector& points) const; +#endif void rectangle(const Vector2D& corner_a, const Vector2D& corner_b) const; +#ifdef __APPLE__ + //Remove when OSX builds with c++11 +#else static std::vector compute_circle(float radius); +#endif };