X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=04f0bf91674b8cffb99cba189f85c5e73d589ab7;hb=a14928fc505633d395e18db84ce7dbfd7386fa5f;hp=c60aee0a22231eb84f8a51e1294d84f05f847bd8;hpb=f2afa8e09dc46f89642a9cbbbc19250554c7ec5f;p=freeglut

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index c60aee0..04f0bf9 100644
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -29,8 +29,10 @@
 #include "freeglut_internal.h"
 
 #if defined(_WIN32_WCE)
-#include <aygshell.h>
-#pragma comment( lib, "Aygshell.lib" ) /* library pragmas are bad */
+#   include <Aygshell.h>
+#   ifdef FREEGLUT_LIB_PRAGMAS
+#       pragma comment( lib, "Aygshell.lib" )
+#   endif
 
 static wchar_t* fghWstrFromStr(const char* str)
 {
@@ -42,7 +44,6 @@ static wchar_t* fghWstrFromStr(const char* str)
     return wstr;
 }
 
-
 #endif /* defined(_WIN32_WCE) */
 
 /*
@@ -172,10 +173,10 @@ XVisualInfo* fgChooseVisual( void )
  * Setup the pixel format for a Win32 window
  */
 #if TARGET_HOST_MS_WINDOWS
-/* WRONG-- FIXME */
 /* The following include file is available from SGI but is not standard:
  *   #include <GL/wglext.h>
  * So we copy the necessary parts out of it.
+ * XXX: should local definitions for extensions be put in a separate include file?
  */
 typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
 
@@ -437,7 +438,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
         {
             fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
             window->Window.VisualInfo = fgChooseVisual( );
-            fgState.DisplayMode &= GLUT_MULTISAMPLE;
+            fgState.DisplayMode |= GLUT_MULTISAMPLE;
         }
     }