Merge branch 'master' into no-dd-make

This commit is contained in:
James R 2020-11-22 15:29:37 -08:00
commit f39300ac74

View file

@ -56,8 +56,6 @@ ifndef GCC44
#OPTS+=-mms-bitfields #OPTS+=-mms-bitfields
endif endif
OPTS+=-D__USE_MINGW_ANSI_STDIO=0
LIBS+=-ladvapi32 -lkernel32 -lmsvcrt -luser32 LIBS+=-ladvapi32 -lkernel32 -lmsvcrt -luser32
ifdef MINGW64 ifdef MINGW64
LIBS+=-lws2_32 LIBS+=-lws2_32