Fixed build errors thrown up under Feisty and when building with MinG…

…W under Win32. Thanks for the heads up yagisan.
skyjake · Jun 20, 2007 · 5637b7e · 5637b7e
1 parent ffb5996
commit 5637b7e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/doomsday/engine/portable/include/gl_main.h b/doomsday/engine/portable/include/gl_main.h
@@ -70,7 +70,7 @@ const char*     GL_ChooseVariableFont(glfontstyle_t style);
 unsigned char  *GL_GrabScreen(void);
 
 extern int      glScreenWidth, glScreenHeight, glScreenBits;
-extern boolean  glScreenFull;
+extern int      glScreenFull;
 extern int      numTexUnits;
 extern boolean  envModAdd;
 extern int      defResX, defResY, defBPP, defFullscreen;

diff --git a/doomsday/engine/portable/src/dd_dgl.c b/doomsday/engine/portable/src/dd_dgl.c
@@ -352,7 +352,7 @@ int DD_InitDGL(void)
 
     // Load the DLL.
 #ifdef WIN32
-    dglHandle = LoadLibrary(libName);
+    dglHandle = LoadLibrary((LPCTSTR) libName);
 #endif
 #ifdef UNIX
     dglHandle = lt_dlopenext(libName);

diff --git a/doomsday/engine/portable/src/dd_pinit.c b/doomsday/engine/portable/src/dd_pinit.c
@@ -93,8 +93,8 @@ void DD_ErrorBox(boolean error, char *format, ...)
     va_end(args);
 #ifdef WIN32
     suspendMsgPump = true;
-    MessageBox(NULL, buff, "Doomsday " DOOMSDAY_VERSION_TEXT,
-               MB_OK | (error ? MB_ICONERROR : MB_ICONWARNING));
+    MessageBox(NULL, (LPCTSTR) buff, (LPCTSTR) ("Doomsday " DOOMSDAY_VERSION_TEXT),
+               (UINT) (MB_OK | (error ? MB_ICONERROR : MB_ICONWARNING)));
     suspendMsgPump = false;
 #endif
 #ifdef UNIX

diff --git a/doomsday/engine/portable/src/gl_font.c b/doomsday/engine/portable/src/gl_font.c
@@ -273,7 +273,7 @@ int FR_PrepareFont(const char *name)
     struct {
         char   *name;
         int     gdires;
-        char   *winfontname;
+        char    winfontname[32]; // limit including terminator.
         int     pointsize;
     } fontmapper[] = {
         {"Fixed", SYSTEM_FIXED_FONT},
@@ -321,7 +321,7 @@ int FR_PrepareFont(const char *name)
                                    CLIP_DEFAULT_PRECIS,
                                    DEFAULT_QUALITY,
                                    VARIABLE_PITCH | FF_SWISS,
-                                   fontmapper[i].winfontname);
+                                   (LPCTSTR) fontmapper[i].winfontname);
 
                     FR_PrepareGDIFont(uifont);
                     DeleteObject(uifont);
@@ -550,7 +550,7 @@ int FR_PrepareGDIFont(HFONT hfont)
         ch[0] = i;
         ch[1] = 0;
 
-        GetTextExtentPoint32(hdc, ch, 1, &size);
+        GetTextExtentPoint32(hdc, (LPCTSTR) ch, 1, &size);
         fc->w = size.cx;
         fc->h = size.cy;
         maxh = max(maxh, fc->h);

diff --git a/doomsday/plugins/opengl/win32/src/main.c b/doomsday/plugins/opengl/win32/src/main.c
@@ -278,7 +278,7 @@ int DG_Init(int width, int height, int bpp, int mode)
         0, 0, 0, 0, 0,
         32,                     // Depth bits.
         0, 0,
-        0,                      // Layer type.
+        PFD_MAIN_PLANE,         // Layer type.
         0, 0, 0, 0
     };
 #else