# LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\lib
-WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;
WIN95FLAG = -D__WIN95__ -D__WINDOWS__
# This should be changed to tlink32 if ilink32 is not available.
#
!if "$(WXMAKINGDLL)" == "1"
-DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx231.lib
!else
-LINK_FLAGS= /Tpe /ap /c
+LINK_FLAGS= /aa /c
!if "$(WXUSINGDLL)" == "1"
-DLL_FLAGS= -DWXUSINGDLL=1
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx231.lib
!else
DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib
!endif
!if "$(WXBUILDDLL)" == "1"
-DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
-LINK_FLAGS= /Tpd /ap /c $(EXTRALINKFLAGS)
+LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
!endif
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)