win32gui build fix (from <Someone>)
<Someone> wrote: > Using the MCVS IDE I couldn't compile NetHack any longer, due to a > misplaced #endif and a library not included in the DSP file. > Here's a patch for both problems for 3.5.0. > The 3.4.x verison only suffered from the first problem. Patch also > attached.
This commit is contained in:
@@ -198,7 +198,6 @@ return &szFullPath[0];
|
||||
|
||||
/* fatal error */
|
||||
/*VARARGS1*/
|
||||
|
||||
void
|
||||
error VA_DECL(const char *,s)
|
||||
VA_START(s);
|
||||
@@ -218,7 +217,6 @@ error VA_DECL(const char *,s)
|
||||
VA_END();
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
void Delay(int ms)
|
||||
{
|
||||
(void)Sleep(ms);
|
||||
@@ -231,9 +229,10 @@ extern void NDECL(backsp);
|
||||
void win32_abort()
|
||||
{
|
||||
#ifdef WIZARD
|
||||
int c, ci, ct;
|
||||
if (wizard) {
|
||||
# ifdef WIN32CON
|
||||
int c, ci, ct;
|
||||
|
||||
if (!iflags.window_inited)
|
||||
c = 'n';
|
||||
ct = 0;
|
||||
@@ -254,8 +253,8 @@ void win32_abort()
|
||||
}
|
||||
if (c == 'y')
|
||||
DebugBreak();
|
||||
}
|
||||
# endif
|
||||
}
|
||||
#endif
|
||||
abort();
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /map /debug /machine:I386 /MAPINFO:EXPORTS /MAPINFO:LINES
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib comdlg32.lib /nologo /subsystem:windows /map /debug /machine:I386 /MAPINFO:EXPORTS /MAPINFO:LINES
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
# Begin Special Build Tool
|
||||
OutDir=.\Release
|
||||
@@ -94,7 +94,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib comdlg32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# Begin Special Build Tool
|
||||
OutDir=.\Debug
|
||||
SOURCE="$(InputPath)"
|
||||
|
||||
Reference in New Issue
Block a user