From 9d646ac50420aea0525d40d94149996a14b59fc9 Mon Sep 17 00:00:00 2001 From: sezero Date: Tue, 14 Aug 2018 11:35:55 +0300 Subject: [PATCH] cvg, sst1, Makefile.mingw: undefine WINNT for consistency. --- glide3x/cvg/glide3/src/Makefile.mingw | 3 +++ glide3x/sst1/glide3/src/Makefile.mingw | 3 +++ 2 files changed, 6 insertions(+) diff --git a/glide3x/cvg/glide3/src/Makefile.mingw b/glide3x/cvg/glide3/src/Makefile.mingw index 4865be1..779b6c3 100644 --- a/glide3x/cvg/glide3/src/Makefile.mingw +++ b/glide3x/cvg/glide3/src/Makefile.mingw @@ -73,6 +73,9 @@ UNLINK = $(RM) $(1) # platform CDEFS = -D__WIN32__ -DDIRECTX -DFX_DLL_ENABLE -D__3Dfx_PCI_CFG__ +# MSVC doesn't define WINNT, but MinGW does. The Glide +# source uses WINNT for its own purposes, so undefine it. +CDEFS += -UWINNT # general CDEFS += -DGLIDE3 -DGLIDE3_ALPHA -DGLIDE3_VERTEX_LAYOUT=1 -DGLIDE_HW_TRI_SETUP=1 -DGLIDE_PACKED_RGB=0 -DGLIDE_PACKET3_TRI_SETUP=1 -DGLIDE_TRI_CULLING=1 -DUSE_PACKET_FIFO=1 diff --git a/glide3x/sst1/glide3/src/Makefile.mingw b/glide3x/sst1/glide3/src/Makefile.mingw index 5d7b380..32cc2df 100644 --- a/glide3x/sst1/glide3/src/Makefile.mingw +++ b/glide3x/sst1/glide3/src/Makefile.mingw @@ -68,6 +68,9 @@ UNLINK = $(RM) $(1) # platform CDEFS = -D__WIN32__ -DDIRECTX -DFX_DLL_ENABLE -DINIT_ACCESS_DDRAW +# MSVC doesn't define WINNT, but MinGW does. The Glide +# source uses WINNT for its own purposes, so undefine it. +CDEFS += -UWINNT # general CDEFS += -DGLIDE3 -DGLIDE3_ALPHA -DGLIDE_HARDWARE