[Gcblue-commits] gcb_wx/include/graphics tcGraphicsEngine.h,1.10,1.11
Status: Alpha
Brought to you by:
ddcforge
|
From: Xavi <xr...@us...> - 2004-04-11 22:05:37
|
Update of /cvsroot/gcblue/gcb_wx/include/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4022 Modified Files: tcGraphicsEngine.h Log Message: + added ifdef MSV for #pragma once instruction + corrected includes where path was set in windows-style (GL\glu.h) for standard path (GL/glu.h) + removed comma at the end of enum Index: tcGraphicsEngine.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcGraphicsEngine.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcGraphicsEngine.h 20 Mar 2004 18:46:46 -0000 1.10 --- tcGraphicsEngine.h 11 Apr 2004 21:51:53 -0000 1.11 *************** *** 23,35 **** #define _TCGRAPHICSENGINE_H_ #pragma once ! #include "wx/wx.h" #include "wx/msw/private.h" // for MS Windows specific definitions ! #include <GL\gl.h> // Header file for the OpenGL32 library ! #include <GL\glu.h> // Header file for the GLu32 library // had to remove (change name) GLAux.lib from SDK directory to avoid __ftol error // GLAux.lib from VC98 directory works ! #include <GL\glaux.h> // Header file for the GLaux library #include <string> #include "tc2DGraphicsSurface.h" --- 23,42 ---- #define _TCGRAPHICSENGINE_H_ + #if _MSC_VER > 1000 #pragma once + #endif ! #ifndef WX_PRECOMP ! #include "wx/wx.h" ! #ifdef WIN32 #include "wx/msw/private.h" // for MS Windows specific definitions ! #endif // WIN32 ! #endif // WX_PRECOMP ! ! #include <GL/gl.h> // Header file for the OpenGL32 library ! #include <GL/glu.h> // Header file for the GLu32 library // had to remove (change name) GLAux.lib from SDK directory to avoid __ftol error // GLAux.lib from VC98 directory works ! #include <GL/glaux.h> // Header file for the GLaux library #include <string> #include "tc2DGraphicsSurface.h" *************** *** 133,137 **** MODE_NONE, MODE_2D, ! MODE_TEXTURE2D, } meGraphicsMode; --- 140,144 ---- MODE_NONE, MODE_2D, ! MODE_TEXTURE2D } meGraphicsMode; |