mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-17 13:51:09 +02:00
Code Issues Projects Releases Wiki Activity

Revert "OpenGL Windows"

Browse Source 
This reverts commit 59cfce567f.
This commit is contained in:
Simon Robertshaw
2011-11-01 19:16:46 +00:00
parent 59cfce567f
commit 91f4a156df
1 changed files with 128 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/graphics.c
View File

@@ -6,10 +6,6 @@
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#elif defined(WIN32)
#include <GL/glew.h>
#include <GL/gl.h>
#include <GL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
@@ -3663,7 +3659,6 @@ void render_cursor(pixel *vid, int x, int y, int t, int rx, int ry)
int sdl_open(void) int sdl_open(void)
{ {
int status;
if (SDL_Init(SDL_INIT_VIDEO)<0) if (SDL_Init(SDL_INIT_VIDEO)<0)
{ {
fprintf(stderr, "Initializing SDL: %s\n", SDL_GetError()); fprintf(stderr, "Initializing SDL: %s\n", SDL_GetError());
@@ -3674,15 +3669,6 @@ int sdl_open(void)
sdl_scrn=SDL_SetVideoMode(XRES*sdl_scale + BARSIZE*sdl_scale,YRES*sdl_scale + MENUSIZE*sdl_scale,32,SDL_OPENGL); sdl_scrn=SDL_SetVideoMode(XRES*sdl_scale + BARSIZE*sdl_scale,YRES*sdl_scale + MENUSIZE*sdl_scale,32,SDL_OPENGL);
SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
#ifdef WIN32
status = glewInit();
if(status != GLEW_OK)
{
fprintf(stderr, "Initializing GLEW: %d\n", status);
return 0;
}
#endif
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();