diff --git a/src/Makefile.mingw b/src/Makefile.mingw index d6cef3cfe..6264531cf 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -8,7 +8,7 @@ # # Modified Makefile for Win32 MinGW 32-bit environment. # -# Version: @(#)Makefile.mingw 1.0.17 2017/05/26 +# Version: @(#)Makefile.mingw 1.0.18 2017/05/28 # # Authors: Kotori, # Fred N. van Kempen, @@ -207,9 +207,9 @@ SLIRPOBJ= bootp.o ip_icmp.o misc.o socket.o tcp_timer.o cksum.o \ ip_input.o queue.o tcp_input.o debug.o ip_output.o \ sbuf.o tcp_output.o udp.o if.o mbuf.o slirp.o tcp_subr.o -LIBS = -mwindows -lcomctl32 -lwinmm -lopenal.dll -lopenal -lddraw \ - -ldinput8 -ldxguid -ld3d9 -ld3dx9 -lwsock32 -liphlpapi \ - -lstdc++ -lpsapi -static-libstdc++ -static-libgcc +LIBS = -lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 -lopenal.dll \ + -mwindows -lcomctl32 -lwinmm -lwsock32 -liphlpapi -lpsapi \ + -static-libstdc++ -static -lstdc++ -static-libgcc -static -lgcc # Build rules. diff --git a/src/config.c b/src/config.c index 6bb2f46e2..1a9941217 100644 --- a/src/config.c +++ b/src/config.c @@ -1942,7 +1942,7 @@ static void saveconfig_network(void) } else { - config_set_string(cat, "net_type", (network_type == NET_TYPE_SLIRP) ? "pcap" : "slirp"); + config_set_string(cat, "net_type", (network_type == NET_TYPE_SLIRP) ? "slirp" : "pcap"); } if (network_pcap[0] != '\0')