# HG changeset patch
# User Matt Plumtree <matt.plumtree@nokia.com>
# Date 1287422653 -3600
# Node ID ca7e6949bf7a0d53e778feea7dee7ed2141c2567
# Parent  021dd2b9ee6aa9e1578671995cd5612c68eb4314
Add hostegl bld.inf info for building exporting and building the library.
Note: uses tools/x86tool extension from /sftools/dev/hostenv/cpptoolsplat/symport/flm, which doesn't quite work right yet. SYS_INCLUDES needs adding to .xml, for example.
Fixup warnings in hostegl when built using GCC.

diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/group/bld.inf
--- a/hostsupport/hostegl/group/bld.inf	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/group/bld.inf	Mon Oct 18 18:24:13 2010 +0100
@@ -0,0 +1,54 @@
+/* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and /or associated documentation files
+ * (the "Materials "), to deal in the Materials without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Materials,
+ * and to permit persons to whom the Materials are furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Materials.
+ *
+ * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR
+ * THE USE OR OTHER DEALINGS IN THE MATERIALS.
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ * Build information for host EGL
+ */
+
+PRJ_PLATFORMS
+TOOLS2
+
+PRJ_EXPORTS
+
+../inc/EGL/egl.h            OS_LAYER_PUBLIC_EXPORT_PATH(tools/EGL/egl.h)
+../inc/EGL/eglext.h         OS_LAYER_PUBLIC_EXPORT_PATH(tools/EGL/eglext.h)
+../inc/EGL/eglplatform.h    OS_LAYER_PUBLIC_EXPORT_PATH(tools/EGL/eglplatform.h)
+
+../inc/KHR/khrplatform.h    OS_LAYER_PUBLIC_EXPORT_PATH(tools/KHR/khrplatform.h)
+
+PRJ_EXTENSIONS
+
+// Dynamic library.
+start extension tools/x86tool
+option TARGET_NAME EGL
+option TARGET_TYPE dll
+option SOURCE_DIRS ../src ../src/win32
+option INCLUDES ../inc ../../../inc
+option SYS_INCLUDES OS_LAYER_PUBLIC_EXPORT_PATH(tools)
+option MACROS KHRONOS_APICALL_EXPORT EGLI_USE_SIMULATOR_EXTENSIONS
+option COMPILE_OPTIONS -msse2 -mfpmath=sse -march=pentium4
+option NO_STD_INCLUDE ON
+end
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLConfig.h
--- a/hostsupport/hostegl/inc/EGLConfig.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLConfig.h	Mon Oct 18 18:24:13 2010 +0100
@@ -117,4 +117,4 @@
 
     CTransparentColor  m_transparentColor;
 };
-#endif //_EGLCONFIG_H_
\ No newline at end of file
+#endif //_EGLCONFIG_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLContext.h
--- a/hostsupport/hostegl/inc/EGLContext.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLContext.h	Mon Oct 18 18:24:13 2010 +0100
@@ -73,4 +73,4 @@
     struct EGLINativeGLFunctions*   m_nativeGLFunctions;
 };
 
-#endif //_EGLCONTEXT_H_
\ No newline at end of file
+#endif //_EGLCONTEXT_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLDisplay.h
--- a/hostsupport/hostegl/inc/EGLDisplay.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLDisplay.h	Mon Oct 18 18:24:13 2010 +0100
@@ -79,4 +79,4 @@
     std::vector<CEGLImage*>     m_images;
     EGLint                      m_processId;
 };
-#endif //_EGLDISPLAY_H_
\ No newline at end of file
+#endif //_EGLDISPLAY_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLOs.h
--- a/hostsupport/hostegl/inc/EGLOs.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLOs.h	Mon Oct 18 18:24:13 2010 +0100
@@ -77,4 +77,4 @@
     static IEGLtoGLES2Interface* LoadGLES2Interface( EGLILibraryHandle& libraryHandle );
 };
 
-#endif //_EGLOS_H_
\ No newline at end of file
+#endif //_EGLOS_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLProcess.h
--- a/hostsupport/hostegl/inc/EGLProcess.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLProcess.h	Mon Oct 18 18:24:13 2010 +0100
@@ -59,4 +59,4 @@
     std::vector<CEGLThread*>    m_threads;
     CEGLThread*                 m_currentThread;
 };
-#endif //_EGLPROCESS_H_
\ No newline at end of file
+#endif //_EGLPROCESS_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLStructs.h
--- a/hostsupport/hostegl/inc/EGLStructs.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLStructs.h	Mon Oct 18 18:24:13 2010 +0100
@@ -76,4 +76,4 @@
 	EGLContext	context;
 	};
 
-#endif // _EGLSTRUCTS_H_
\ No newline at end of file
+#endif // _EGLSTRUCTS_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLThread.h
--- a/hostsupport/hostegl/inc/EGLThread.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLThread.h	Mon Oct 18 18:24:13 2010 +0100
@@ -75,4 +75,4 @@
     // on thread specific API calls.
     EGLint          m_supportedApis; 
 };
-#endif //_EGLTHREAD_H_
\ No newline at end of file
+#endif //_EGLTHREAD_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLUtils.h
--- a/hostsupport/hostegl/inc/EGLUtils.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLUtils.h	Mon Oct 18 18:24:13 2010 +0100
@@ -73,4 +73,4 @@
 extern  void DestroyPointerVector( std::vector<T*>& vector );
 
 
-#endif //_EGLUTILS_H_
\ No newline at end of file
+#endif //_EGLUTILS_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/EGLWindowSurface.h
--- a/hostsupport/hostegl/inc/EGLWindowSurface.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/EGLWindowSurface.h	Mon Oct 18 18:24:13 2010 +0100
@@ -59,4 +59,4 @@
     EGLint              m_swapInterval;
     EGLIOsWindowContext* m_osContext;
 };
-#endif //_EGLWINDOWSURFACE_H_
\ No newline at end of file
+#endif //_EGLWINDOWSURFACE_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/TransparentColor.h
--- a/hostsupport/hostegl/inc/TransparentColor.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/TransparentColor.h	Mon Oct 18 18:24:13 2010 +0100
@@ -59,4 +59,4 @@
     EGLint  m_greenValue;
     EGLint  m_blueValue;
 };
-#endif // _TRANSPARENTCOLOR_H_
\ No newline at end of file
+#endif // _TRANSPARENTCOLOR_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/inc/eglDefinitions.h
--- a/hostsupport/hostegl/inc/eglDefinitions.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/inc/eglDefinitions.h	Mon Oct 18 18:24:13 2010 +0100
@@ -73,13 +73,13 @@
 #   if defined(_DEBUG)
 #       define EGLI_ASSERT assert
 #   else
-#      define EGLI_ASSERT
+#      define EGLI_ASSERT (void)
 #   endif //_DEBUG
 #else
 #   if !defined(NDEBUG)
 #       define EGLI_ASSERT assert
 #   else
-#       define EGLI_ASSERT
+#       define EGLI_ASSERT (void)
 #   endif
 #endif
 
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/EGLConfig.cpp
--- a/hostsupport/hostegl/src/EGLConfig.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/EGLConfig.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -37,7 +37,7 @@
 const int KPbufferPixels = KPbufferHeight * KPbufferWidth;
 
 CEGLConfig::CEGLConfig(void) :
-    m_nativeVisualId( NULL )
+    m_nativeVisualId( 0 )
     {
     }
 
@@ -72,7 +72,7 @@
     m_maxSwapInterval( maxSwapInterval ),
     m_minSwapInterval( minSwapInterval ),
     m_nativeRenderable( nativeRenderable ),
-    m_nativeVisualId( NULL ),
+    m_nativeVisualId( 0 ),
     m_nativeVisualType( nativeVisualType ),
     m_renderableType( renderableType ),
     m_sampleBuffers( samples > 1 ? 1 : 0 ),
@@ -814,9 +814,9 @@
     
     if( m_colorDescriptor.AlphaMaskSize() < filter.m_colorDescriptor.AlphaMaskSize() ) return false;
     
-    if( filter.m_bindToTexRGB != EGL_DONT_CARE && (m_bindToTexRGB != filter.m_bindToTexRGB) ) return false;
+    if( (EGLint)filter.m_bindToTexRGB != EGL_DONT_CARE && (m_bindToTexRGB != filter.m_bindToTexRGB) ) return false;
     
-    if( filter.m_bindToTexRGBA != EGL_DONT_CARE && (m_bindToTexRGBA != filter.m_bindToTexRGBA) ) return false;
+    if( (EGLint)filter.m_bindToTexRGBA != EGL_DONT_CARE && (m_bindToTexRGBA != filter.m_bindToTexRGBA) ) return false;
     
     if( filter.m_colorDescriptor.Format() != EGL_DONT_CARE )
         {
@@ -825,7 +825,7 @@
         if( thisBufType != filterBufType ) return false;
         }
 
-    if( filter.m_configCaveat != EGL_DONT_CARE && (m_configCaveat != filter.m_configCaveat) ) return false;
+    if( (EGLint)filter.m_configCaveat != EGL_DONT_CARE && (m_configCaveat != filter.m_configCaveat) ) return false;
 
     if( m_configId == filter.m_configId ) return false;
     
@@ -839,7 +839,7 @@
 
     if( filter.m_minSwapInterval != EGL_DONT_CARE && (m_minSwapInterval != filter.m_minSwapInterval) ) return false;
 
-    if( filter.m_nativeRenderable != EGL_DONT_CARE && (m_nativeRenderable != filter.m_nativeRenderable) ) return false;
+    if( (EGLint)filter.m_nativeRenderable != EGL_DONT_CARE && (m_nativeRenderable != filter.m_nativeRenderable) ) return false;
 
     if( filter.m_nativeVisualType != EGL_DONT_CARE && (m_nativeVisualType != filter.m_nativeVisualType) ) return false;
 
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/EGLDisplay.cpp
--- a/hostsupport/hostegl/src/EGLDisplay.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/EGLDisplay.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -38,7 +38,6 @@
 #include "ColorDescriptor.h"
 #include "EGLOs.h"
 #include "EGLUtils.h"
-#include "EGLState.h"
 #include "EGLProcess.h"
 #include "EGLThread.h"
 
@@ -186,8 +185,6 @@
     bool ret = true;
     std::vector<CEGLSurface*> boundSurfaces;
     std::vector<CEGLSurface*>::iterator sIter = m_surfaces.begin();
-    CEGLState* state = getState();
-    CEGLThread* thread = state->GetCurrentProcess()->CurrentThread();
     while( sIter != m_surfaces.end() )
         {
         if( (*sIter)->IsTerminated() || !((*sIter)->RemoveRef()) )
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/EGLImage.cpp
--- a/hostsupport/hostegl/src/EGLImage.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/EGLImage.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -38,8 +38,8 @@
 
 CEGLImage::CEGLImage( EGLenum target, EGLClientBuffer buffer, 
                       SurfaceDescriptor desc, void* data) :
+    m_target( target ),
     m_buffer( buffer ),
-    m_target( target ),
 	m_data(data)
     {
     m_siblings = EGLI_NEW EGLImageSibling;
@@ -115,8 +115,6 @@
             case EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR:
                 {
                 // GLES
-                IEGLtoGLES2Interface* iFace = (IEGLtoGLES2Interface*)state->GLESInterface(2);
-                //iFace->UpdateBuffers(
                 }
                 break;
             default:
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/EGLState.cpp
--- a/hostsupport/hostegl/src/EGLState.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/EGLState.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -53,7 +53,7 @@
     m_GLES2Interface( NULL ),
 	m_hostGL( NULL ),
     m_supportedApis( 0 ),
-	m_defaultDisplay( NULL ),
+	m_defaultDisplay( 0 ),
 	m_dummyWindow( NULL )
     {
 
@@ -446,9 +446,6 @@
 				{
 				if( surface != currentGLESReadSurface )
 					{
-					EGLINativeContextType glesCopyContext = NULL;
-                    EGLINativeDisplayType glesCopyDisplay = NULL;
-                    EGLINativeGLFunctions* funcs = NULL;
 					bool pbuffer = ( surface->Type() == CEGLSurface::PBUFFER_SURFACE );
 					if( pbuffer )
 						{
@@ -461,12 +458,7 @@
 						}
 					else if( surface->Type() == CEGLSurface::WINDOW_SURFACE )
 						{
-						// \todo Remove this or handle window surface sync properly
-						/*
-						funcs = thread->CurrentGLESContext()->NativeGLFunctions();
-						glesCopyContext = thread->CurrentGLESContext()->NativeContext();
-						glesCopyDisplay = ((CEGLWindowSurface*)surface)->OsContext()->glesDisplay;
-						*/
+						// \todo Handle window surface sync properly
 						}
 					if( !(GLESInterface(glesVersion)->CopyBuffers(surface->GLESColorBuffer(), surface->Descriptor())) )
 						{
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/EGLSurface.cpp
--- a/hostsupport/hostegl/src/EGLSurface.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/EGLSurface.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -108,7 +108,6 @@
     EGLint blueSize = colorDesc->BlueSize();
     EGLint greenSize = colorDesc->GreenSize();
     EGLint redSize = colorDesc->RedSize();
-    EGLint luminanceSize = colorDesc->LuminanceSize();
 
     if( colorDesc->isLuminance() )
         {
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/EGLThread.cpp
--- a/hostsupport/hostegl/src/EGLThread.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/EGLThread.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -123,4 +123,4 @@
     {
     if( read ) *read = m_currentGLESReadSurface;
     if( draw ) *draw = m_currentGLESDrawSurface;
-    }
\ No newline at end of file
+    }
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/eglapi.cpp
--- a/hostsupport/hostegl/src/eglapi.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/eglapi.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -57,7 +57,9 @@
 #endif
 
 static CEGLState* g_eglState = NULL;
+#if !defined(EGLI_USE_SIMULATOR_EXTENSIONS)
 static bool g_lockInitialized = false;
+#endif
 EGLI_LOCK g_eglLock;
 
 CEGLState* getState()
@@ -457,14 +459,14 @@
     colorDesc->SetAttribute( EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER );
     CEGLConfig* filter = EGLI_NEW CEGLConfig(
                     *colorDesc,
-                    EGL_DONT_CARE,  
-                    EGL_DONT_CARE,
-                    EGL_DONT_CARE,
+                    (EGLBoolean)EGL_DONT_CARE,  
+                    (EGLBoolean)EGL_DONT_CARE,
+                    (EGLenum)EGL_DONT_CARE,
                     EGL_DONT_CARE,
                     0, 0, 0,
                     EGL_DONT_CARE,
                     EGL_DONT_CARE,
-                    EGL_DONT_CARE,
+                    (EGLBoolean)EGL_DONT_CARE,
                     EGL_DONT_CARE,
                     EGL_OPENGL_ES_BIT,
                     0, 0, 0,
@@ -906,7 +908,6 @@
         }
 
     // \note EGLI_ENTER_RET macro will fail if thread allocation didn't succeed
-    CEGLThread* thread = getThread();
 
     surface->Lock();
     //TODO: client apis
@@ -1206,9 +1207,8 @@
         state->RemoveProcess( process->Id() );
         process = NULL;
         }
-#else
+#endif
     releaseState();
-#endif
     return EGL_TRUE;
     }
 
@@ -1940,8 +1940,8 @@
                         }
                     context->SetNativeGLFucntions( nativeFuncs );
                     }
-                EGLINativeDisplayType drawDC = NULL;
-                EGLINativeDisplayType readDC = NULL;
+                EGLINativeDisplayType drawDC = 0;
+                EGLINativeDisplayType readDC = 0;
                 if( drawSurface->Type() == CEGLSurface::PBUFFER_SURFACE ) 
                     {
                     drawDC = ((CEGLPbufferSurface*)drawSurface)->NativeDisplay();
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostegl/src/win32/EGLOs.cpp
--- a/hostsupport/hostegl/src/win32/EGLOs.cpp	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostegl/src/win32/EGLOs.cpp	Mon Oct 18 18:24:13 2010 +0100
@@ -184,8 +184,8 @@
 EGLINativeContextType CEGLOs::CreateNativeContext( const CEGLConfig& config, EGLINativeDisplayType display, EGLINativeContextType shareContext )
     {
     EGLINativeContextType ret = NULL;
+#if !defined(EGLI_USE_SIMULATOR_EXTENSIONS)
     DWORD error = ERROR_SUCCESS;
-#if !defined(EGLI_USE_SIMULATOR_EXTENSIONS)
     PIXELFORMATDESCRIPTOR pfd;
     memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR));
     CEGLOs::ConfigToNativePixelFormat( config, &pfd );
@@ -216,7 +216,11 @@
 
 EGLINativeContextType CEGLOs::CurrentNativeContext()
     {
+#if defined(EGLI_USE_SIMULATOR_EXTENSIONS)
+    return 0;
+#else
     return wglGetCurrentContext();
+#endif
     }
 
 EGLINativeDisplayType CEGLOs::CurrentNativeSurface()
@@ -224,7 +228,7 @@
 #if !defined(EGLI_USE_SIMULATOR_EXTENSIONS)
     return wglGetCurrentDC();
 #else
-    return NULL;
+    return 0;
 #endif
     }
 
@@ -277,8 +281,8 @@
 bool CEGLOs::InitializeNativeGLFunctions( struct EGLINativeGLFunctions* func, EGLINativeDisplayType display, EGLINativeContextType context )
     {
     bool ret = true;
+#if !defined(EGLI_USE_SIMULATOR_EXTENSIONS)
     DWORD error = ERROR_SUCCESS;
-#if !defined(EGLI_USE_SIMULATOR_EXTENSIONS)
     HDC currentDC = wglGetCurrentDC();
     HGLRC currentContext = wglGetCurrentContext();
     
@@ -490,7 +494,7 @@
     //return (EGLINativeDisplayType)CreateDC(TEXT("DISPLAY"), TEXT("DISPLAY")/*NULL*/, NULL, NULL);
     //return (EGLINativeDisplayType)GetDC(NULL);
     //return GetWindowDC(NULL);
-    return NULL;
+    return 0;
     }
 
 void CEGLOs::DestroyDefaultDisplay( EGLINativeDisplayType display )
@@ -504,11 +508,6 @@
 
 EGLINativeWindowType CEGLOs::CreateNativeWindow( int width, int height )
     {
-    int xBorder = GetSystemMetrics( SM_CXBORDER );
-    int yBorder = GetSystemMetrics( SM_CYBORDER );
-    int caption = GetSystemMetrics( SM_CYCAPTION );
-    
-
     WNDCLASS wndclass;
     wndclass.style		   = 0;
     wndclass.lpfnWndProc   = WndProc;
@@ -618,8 +617,8 @@
         return NULL;
         }
     ctx->window = wnd;
-    ctx->vgDisplay = NULL;
-    ctx->glesDisplay = NULL;
+    ctx->vgDisplay = 0;
+    ctx->glesDisplay = 0;
     ctx->pixmap = NULL;
     ctx->osBuffer = NULL;
     ctx->width = 0;
@@ -742,11 +741,13 @@
 
 void* CEGLOs::GetGLProcAddress(EGLILibraryHandle& libraryHandle, const char* proc)
     {
-    void* addr = GetProcAddress(libraryHandle, proc);
+    void* addr = (void*)GetProcAddress(libraryHandle, proc);
+#if !defined(EGLI_USE_SIMULATOR_EXTENSIONS)
 	if(!addr)
 		{
-		addr = wglGetProcAddress(proc);
+		addr = (void*)wglGetProcAddress(proc);
 		}
+#endif
 
 	return addr;
     }
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/EGLInterface.h
--- a/hostsupport/hostopengles11/inc/EGLInterface.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/EGLInterface.h	Mon Oct 18 18:24:13 2010 +0100
@@ -69,4 +69,4 @@
 	std::set<GLESContext*> m_contexts;
 };
 
-#endif // _EGLINTERFACE_H_
\ No newline at end of file
+#endif // _EGLINTERFACE_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/GLES/glextplatform.h
--- a/hostsupport/hostopengles11/inc/GLES/glextplatform.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/GLES/glextplatform.h	Mon Oct 18 18:24:13 2010 +0100
@@ -121,4 +121,4 @@
 }
 #endif
 
-#endif /* glextplatform_h */
\ No newline at end of file
+#endif /* glextplatform_h */
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/GLESArray.h
--- a/hostsupport/hostopengles11/inc/GLESArray.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/GLESArray.h	Mon Oct 18 18:24:13 2010 +0100
@@ -84,4 +84,4 @@
 	const GLESBuffer* m_buffer;
 };
 
-#endif // _GLESARRAY_H_
\ No newline at end of file
+#endif // _GLESARRAY_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/GLESContext.h
--- a/hostsupport/hostopengles11/inc/GLESContext.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/GLESContext.h	Mon Oct 18 18:24:13 2010 +0100
@@ -202,4 +202,4 @@
 #define GLES_ERROR_RET(ERROR, RETVAL) GLES_ERROR_IF_RET(true, ERROR, RETVAL)
 #define GLES_ERROR(ERROR) GLES_ERROR_IF(true, ERROR)
 
-#endif // _GLESCONTEXT_H_
\ No newline at end of file
+#endif // _GLESCONTEXT_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/GLESTexture.h
--- a/hostsupport/hostopengles11/inc/GLESTexture.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/GLESTexture.h	Mon Oct 18 18:24:13 2010 +0100
@@ -64,4 +64,4 @@
 GLenum glesMapCompressedToBaseFormat(GLenum format);
 void* glesUncompressImage(int level, GLenum format, int width, int height, int imageSize, const void* data);
 
-#endif // _GLES_TEXTURE_H_
\ No newline at end of file
+#endif // _GLES_TEXTURE_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/glDefinitions.h
--- a/hostsupport/hostopengles11/inc/glDefinitions.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/glDefinitions.h	Mon Oct 18 18:24:13 2010 +0100
@@ -34,4 +34,4 @@
 #define GL_VERSION_MAJOR 1
 #define GL_VERSION_MINOR 1
 
-#endif // _gldefinitions_h_
\ No newline at end of file
+#endif // _gldefinitions_h_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/glesGet.h
--- a/hostsupport/hostopengles11/inc/glesGet.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/glesGet.h	Mon Oct 18 18:24:13 2010 +0100
@@ -48,4 +48,4 @@
 
 bool glesGetParameter(const GLESContext& context, const GLESDesktopGL &dgl, GLenum pname, GLESGetType dstType, void* params);
 
-#endif // _GLESGET_H_
\ No newline at end of file
+#endif // _GLESGET_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a hostsupport/hostopengles11/inc/glesInternal.h
--- a/hostsupport/hostopengles11/inc/glesInternal.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/hostsupport/hostopengles11/inc/glesInternal.h	Mon Oct 18 18:24:13 2010 +0100
@@ -133,4 +133,4 @@
 	return r;
 }
 
-#endif // _GLINTERNAL_H_
\ No newline at end of file
+#endif // _GLINTERNAL_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a inc/BufferContainer.h
--- a/inc/BufferContainer.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/inc/BufferContainer.h	Mon Oct 18 18:24:13 2010 +0100
@@ -41,4 +41,4 @@
     void*   m_maskBuffer;
 };
 
-#endif //_BUFFERCONTAINER_H_
\ No newline at end of file
+#endif //_BUFFERCONTAINER_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a inc/GLES2Interface.h
--- a/inc/GLES2Interface.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/inc/GLES2Interface.h	Mon Oct 18 18:24:13 2010 +0100
@@ -55,4 +55,4 @@
 typedef IEGLtoGLES2Interface* (*fpGetGLES2Interface)(void);
 IEGLtoGLES2Interface* LoadGLES2Interface( void*& libraryHandle );
 
-#endif // _GLES2INTERFACE_H_
\ No newline at end of file
+#endif // _GLES2INTERFACE_H_
diff -r 021dd2b9ee6a -r ca7e6949bf7a inc/ImageTarget.h
--- a/inc/ImageTarget.h	Thu Oct 07 18:48:18 2010 +0100
+++ b/inc/ImageTarget.h	Mon Oct 18 18:24:13 2010 +0100
@@ -42,4 +42,4 @@
 	IMAGE_TARGET_RENDERBUFFER
 };
 
-#endif // _IMAGETARGET_H_
\ No newline at end of file
+#endif // _IMAGETARGET_H_