X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b50432abf11a0dbdab6b8d4136c3956ce4def1f..b6f5f27a330a5f3f05ee4824270e7dc692441d42:/src/makeb32.env diff --git a/src/makeb32.env b/src/makeb32.env index e6a4ba6b93..89cfffc358 100644 --- a/src/makeb32.env +++ b/src/makeb32.env @@ -6,6 +6,16 @@ RM= erase WXDIR = $(WXWIN) CFG = $(WXDIR)\src\msw\wxwin32.cfg + +BCCDIR=$(MAKEDIR)\.. + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4 +!endif + +ARCHINCDIR=$(WXDIR)\lib\msw +ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h + # Using a config file isn't compatible across all BC++ versions # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg WXLIBDIR = $(WXDIR)\lib @@ -48,7 +58,7 @@ DLL=0 !if "$(WXMAKINGDLL)" == "1" DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL -WXLIB= $(WXLIBDIR)\wx232.lib +WXLIB= $(WXLIBDIR)\wx233.lib !else @@ -56,7 +66,7 @@ LINK_FLAGS= /aa /c !if "$(WXUSINGDLL)" == "1" DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL -WXLIB= $(WXLIBDIR)\wx232.lib +WXLIB= $(WXLIBDIR)\wx233.lib !else DLL_FLAGS= WXLIB= $(WXLIBDIR)\wx32.lib