diff --git a/src/configure.c b/src/configure.c index 0b7e961..9bc0ac9 100644 --- a/src/configure.c +++ b/src/configure.c @@ -46,6 +46,7 @@ const String * sHostOS[HO_COUNT] = "MacOSX", "FreeBSD", "NetBSD", "OpenBSD", "SunOS", + "MINGW32_NT-5.0", "unknown" }; const struct HostKernel sHostKernel[] = diff --git a/src/configure.h b/src/configure.h index ecd1457..df4f332 100644 --- a/src/configure.h +++ b/src/configure.h @@ -42,6 +42,7 @@ typedef enum _HostOS HO_MACOSX, HO_FREEBSD, HO_NETBSD, HO_OPENBSD, HO_SUNOS, + HO_WIN32, HO_UNKNOWN } HostOS; # define HO_LAST HO_UNKNOWN diff --git a/src/makefile.c b/src/makefile.c index b30aa77..141d2cf 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -517,12 +517,17 @@ static void _binary_ldflags(Configure * configure, FILE * fp, String const * ldflags) { char const * libs_bsd[] = { "dl", "resolv", "ossaudio", "socket", + "ws2_32", NULL }; + char const * libs_deforaos[] = { "ossaudio", "resolv", "ssl", "ws2_32", NULL }; - char const * libs_deforaos[] = { "ossaudio", "resolv", "ssl", NULL }; - char const * libs_gnu[] = { "ossaudio", "resolv", "socket", NULL }; - char const * libs_macosx[] = { "crypt", "ossaudio", "socket", NULL }; - char const * libs_netbsd[] = { "dl", "resolv", "socket", NULL }; - char const * libs_sunos[] = { "dl", "ossaudio", NULL }; + char const * libs_gnu[] = { "ossaudio", "resolv", "socket", "ws2_32", + NULL }; + char const * libs_macosx[] = { "crypt", "ossaudio", "socket", "ws2_32", + NULL }; + char const * libs_netbsd[] = { "dl", "resolv", "socket", "ws2_32", + NULL }; + char const * libs_sunos[] = { "dl", "ossaudio", "ws2_32", NULL }; + char const * libs_win32[] = { "dl", "ossaudio", NULL }; char buf[10]; char const ** libs; String * p; @@ -536,13 +541,16 @@ static void _binary_ldflags(Configure * configure, FILE * fp, } switch(configure->os) { - case HO_GNU_LINUX: - libs = libs_gnu; + case HO_DEFORAOS: + libs = libs_deforaos; break; case HO_FREEBSD: case HO_OPENBSD: libs = libs_bsd; break; + case HO_GNU_LINUX: + libs = libs_gnu; + break; case HO_MACOSX: libs = libs_macosx; break; @@ -552,8 +560,8 @@ static void _binary_ldflags(Configure * configure, FILE * fp, case HO_SUNOS: libs = libs_sunos; break; - case HO_DEFORAOS: - libs = libs_deforaos; + case HO_WIN32: + libs = libs_win32; break; default: libs = libs_gnu;