From 6db8dd3bd7d8e1f42affdd2d74f590b17b51dff7 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 20 Jun 2010 07:33:47 +0000 Subject: [PATCH] zzogl-pg: Fix Windows again. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3247 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/Util.h | 6 +++++- plugins/zzogl-pg/opengl/ZZoglCreate.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/zzogl-pg/opengl/Util.h b/plugins/zzogl-pg/opengl/Util.h index c3f7f0ef4e..279883e1e9 100644 --- a/plugins/zzogl-pg/opengl/Util.h +++ b/plugins/zzogl-pg/opengl/Util.h @@ -24,18 +24,22 @@ #include #include +#include +#include +#include "glprocs.h" extern HWND GShwnd; #else // linux basic definitions -#include #include +#include #include #include #endif + #define GSdefs #include "PS2Edefs.h" #include "CRC.h" diff --git a/plugins/zzogl-pg/opengl/ZZoglCreate.cpp b/plugins/zzogl-pg/opengl/ZZoglCreate.cpp index 1af467ffc1..19ebc0cd32 100644 --- a/plugins/zzogl-pg/opengl/ZZoglCreate.cpp +++ b/plugins/zzogl-pg/opengl/ZZoglCreate.cpp @@ -587,7 +587,7 @@ bool ZeroGS::Create(int _width, int _height) PBITMAPINFO pinfo = (PBITMAPINFO)LockResource(hBitmapGlob); - GLEnum tempFmt = (pinfo->bmiHeader.biBitCount == 32) ? GL_RGBA : GL_RGB; + GLenum tempFmt = (pinfo->bmiHeader.biBitCount == 32) ? GL_RGBA : GL_RGB; TextureRect(4, pinfo->bmiHeader.biWidth, pinfo->bmiHeader.biHeight, tempFmt, GL_UNSIGNED_BYTE, (u8*)pinfo + pinfo->bmiHeader.biSize); nLogoWidth = pinfo->bmiHeader.biWidth;