X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3b177ae6310ed80f054ae227513ef681f9c3dad..31c8af3abb1150658652f506e76af7fa1bb86898:/src/makeb32.env diff --git a/src/makeb32.env b/src/makeb32.env index 16f2b3f469..e6a4ba6b93 100644 --- a/src/makeb32.env +++ b/src/makeb32.env @@ -1,13 +1,26 @@ # Common settings for Borland 32-bit compilation (makefile.b32 files) +!if "$(RM)" == "" +RM= erase +!endif + WXDIR = $(WXWIN) CFG = $(WXDIR)\src\msw\wxwin32.cfg +# Using a config file isn't compatible across all BC++ versions +# LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg WXLIBDIR = $(WXDIR)\lib -WXINC = $(WXDIR)\include;$(WXDIR)\src\iodbc +WXLIBDIR2 = $(WXDIR)\contrib\lib +WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;$(WXDIR)\src\regex; WIN95FLAG = -D__WIN95__ -D__WINDOWS__ - -# This should be changed to ilink32 for C++Builder 4 and above -LINK=tlink32 +RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src + +# This should be changed to tlink32 if ilink32 is not available. +# Ilink32 is available on BC++ 5.02 and above, and all +# versions of C++ Builder. +!ifndef LINK +LINK=ilink32 +#LINK=tlink32 +!endif !ifndef FINAL FINAL=0 @@ -34,16 +47,16 @@ DLL=0 # !if "$(WXMAKINGDLL)" == "1" -DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL -WXLIB= $(WXLIBDIR)\wx200.lib +DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL +WXLIB= $(WXLIBDIR)\wx232.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)\wx232.lib !else DLL_FLAGS= WXLIB= $(WXLIBDIR)\wx32.lib @@ -52,8 +65,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)