X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2cf617cb8160a92696f1421675963aa00cb0c2b..748a3af8e74ce74fe143650af0b2da2534c70d45:/src/makeb32.env diff --git a/src/makeb32.env b/src/makeb32.env index b41cd100fa..28da42ee5f 100644 --- a/src/makeb32.env +++ b/src/makeb32.env @@ -42,16 +42,16 @@ DLL=0 # !if "$(WXMAKINGDLL)" == "1" -DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL -WXLIB= $(WXLIBDIR)\wx200.lib +DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL +WXLIB= $(WXLIBDIR)\wx220.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)\wx220.lib !else DLL_FLAGS= WXLIB= $(WXLIBDIR)\wx32.lib @@ -60,8 +60,7 @@ 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)