X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ddfb726b256ccc58c9b4642ba233ef560cf6bdb..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/makeb32.env?ds=sidebyside diff --git a/src/makeb32.env b/src/makeb32.env index 4a498cf9ea..3d528c4a08 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. @@ -43,7 +43,7 @@ DLL=0 !if "$(WXMAKINGDLL)" == "1" DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL -WXLIB= $(WXLIBDIR)\wx230.lib +WXLIB= $(WXLIBDIR)\wx231.lib !else @@ -51,7 +51,7 @@ LINK_FLAGS= /aa /c !if "$(WXUSINGDLL)" == "1" DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL -WXLIB= $(WXLIBDIR)\wx230.lib +WXLIB= $(WXLIBDIR)\wx231.lib !else DLL_FLAGS= WXLIB= $(WXLIBDIR)\wx32.lib