X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/741f371c68fcb2d18d8cb726b656ceb2d1961de3..36bd690299dc72d49c4a945fa467ac7ce2342019:/src/makeb32.env?ds=sidebyside diff --git a/src/makeb32.env b/src/makeb32.env index fec3d1afce..754fb261ef 100644 --- a/src/makeb32.env +++ b/src/makeb32.env @@ -6,7 +6,7 @@ CFG = $(WXDIR)\src\msw\wxwin32.cfg # 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. @@ -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)\wx230.lib !else LINK_FLAGS= /aa /c !if "$(WXUSINGDLL)" == "1" -DLL_FLAGS= -DWXUSINGDLL=1 -WXLIB= $(WXLIBDIR)\wx200.lib +DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL +WXLIB= $(WXLIBDIR)\wx230.lib !else DLL_FLAGS= WXLIB= $(WXLIBDIR)\wx32.lib @@ -60,7 +60,6 @@ WXLIB= $(WXLIBDIR)\wx32.lib !endif !if "$(WXBUILDDLL)" == "1" -DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS) !endif