win32/msvc: Fix build

Nicolas Hake 2011-04-05 18:03:27 +02:00
parent 25f41d6e9f
commit ab2be9b53f
2 changed files with 6 additions and 6 deletions

View File

@ -59,11 +59,11 @@
#endif
#ifdef C4VERSIONBUILDNAME
#define C4ENGINEINFOLONG C4ENGINENAME " " C4VERSIONBUILDNAME C4VERSIONEX
#define C4ENGINECAPTION C4ENGINENAME " " C4VERSIONBUILDNAME
#define C4ENGINEINFOLONG "@C4ENGINENAME@ @C4VERSIONBUILDNAME@ @C4VERSIONEXTRA@"
#define C4ENGINECAPTION "@C4ENGINENAME@ @C4VERSIONBUILDNAME@"
#else
#define C4ENGINEINFOLONG C4ENGINENAME C4VERSIONEX
#define C4ENGINECAPTION C4ENGINENAME
#define C4ENGINEINFOLONG "@C4ENGINENAME@ @C4VERSIONEX@"
#define C4ENGINECAPTION "@C4ENGINENAME@"
#endif
#if C4XVER4 < 10

View File

@ -325,7 +325,7 @@ public:
#ifdef USE_GL
CStdGLCtx* pGLCtx;
#endif
friend BOOL CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
friend INT_PTR CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
HBITMAP hbmBrush,hbmBrush2;
HBITMAP hbmLine,hbmLine2;
HBITMAP hbmRect,hbmRect2;
@ -402,7 +402,7 @@ public:
};
#include <commctrl.h>
BOOL CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
INT_PTR CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
{
int32_t iValue;
switch (Msg)