issue with mingw resolved; resume mingw build in CI

This commit is contained in:
nhmall
2022-12-05 19:03:11 -05:00
parent b88ff70435
commit afef4bc781
2 changed files with 11 additions and 8 deletions

View File

@@ -32,10 +32,10 @@ strategy:
imageName: 'windows-latest'
toolchainName: vs
buildTargetName: all
# windows-mingw:
# imageName: 'windows-2019'
# toolchainName: mingw
# buildTargetName: all
windows-mingw:
imageName: 'windows-2019'
toolchainName: mingw
buildTargetName: all
linux_focal_cross_msdos:
imageName: 'ubuntu-20.04'
toolchainName: cross

View File

@@ -430,12 +430,15 @@ extern const char *known_restrictions[]; /* symbols.c */
* to help MinGW decide which entry point to choose. If both main and
* WinMain exist, the resulting executable won't work correctly.
*/
int
#ifndef __MINGW32__
main(int argc, char *argv[])
#if defined(__MINGW32__) && defined(MSWIN_GRAPHICS)
#define MAIN mingw_main
#else
mingw_main(int argc, char *argv[])
#define MAIN main
#endif
int
MAIN(int argc, char *argv[])
{
boolean resuming = FALSE; /* assume new game */
NHFILE *nhfp;