modify Borland makefile to include bc in library names

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 6d5477a9ff2c157923117662c11412bbccc50778..d873bb746d3b6df88ba75834f44635ef1e5b7440 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -165,7 +165,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mti import32 ole2w32 odbc32 zlib_$(DEBUG_SUFFIX) png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX) regex_$(DEBUG_SUFFIX)
+LIBS= cw32mti import32 ole2w32 odbc32 zlib_bc$(DEBUG_SUFFIX) png_bc$(DEBUG_SUFFIX) jpeg_bc$(DEBUG_SUFFIX) tiff_bc$(DEBUG_SUFFIX) regex_bc$(DEBUG_SUFFIX)
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -248,7 +248,7 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-        implib -c $(LIBTARGET) $(WXDLL)
+        implib -c -f $(LIBTARGET) $(WXDLL)
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h

diff --git a/src/makeb32.env b/src/makeb32.env
index 4daf2dfae70f8c2252e47b60e971d45863d2059c..21351f5b0113fee7b56114d6ae5c07d826aa4f4e 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -137,7 +137,7 @@ INCEXT=dll$(INCEXT)
 # final names determined here
 WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib
 WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).dll
-LIBTARGET=$(WXLIBDIR)\$(LIBTARGET)_$(DEBUG_SUFFIX).lib
+LIBTARGET=$(WXLIBDIR)\$(LIBTARGET)_bc$(DEBUG_SUFFIX).lib
 OBJ_PATH=$(OBJ_PATH)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX)
 
 !if "$(WXMAKINGDLL)" == "1"

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 6f941996ae9790afa762f18f2d2a826688e6beae..1d8d5f2629bad4bfb1a513ff5279825843e2c119 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -23,19 +23,19 @@ EXEDIR = BORL
 !if "$(wxUSE_GUI)" == "0"
 IMGLIBS=
 !else
-IMGLIBS= png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX)
+IMGLIBS= png_bc$(DEBUG_SUFFIX) jpeg_bc$(DEBUG_SUFFIX) tiff_bc$(DEBUG_SUFFIX)
 !endif
 
 !if "$(FINAL)" == "0"
-EX_LIBS=$(EXTRALIBS:.lib=_d.lib)
+EX_LIBS=$(EXTRALIBS:.lib=_bcd.lib)
 !else
-EX_LIBS=$(EXTRALIBS)
+EX_LIBS=$(EXTRALIBS:.lib=_bc.lib)
 !endif
 
 !if "$(WXUSINGDLL)" == "1"
-LIBS=$(WXLIB) $(EX_LIBS) cw32mti import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS) 
+LIBS=$(WXLIB) $(EX_LIBS) cw32mti import32 ole2w32 regex_bc$(DEBUG_SUFFIX) zlib_bc$(DEBUG_SUFFIX) $(IMGLIBS) 
 !else
-LIBS=$(WXLIB) $(EX_LIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
+LIBS=$(WXLIB) $(EX_LIBS) cw32mt import32 ole2w32 regex_bc$(DEBUG_SUFFIX) zlib_bc$(DEBUG_SUFFIX) $(IMGLIBS)
 !endif
 
 !if "$(wxUSE_ODBC)" == "1"

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index e704dc69084f4d1d40db8bd7445c79ba0cfc2327..33ce3400d238c7ea467c88852fb18938262cf8d2 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -56,7 +56,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mti import32 ole2w32 odbc32 zlib_$(DEBUG_SUFFIX) png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX) regex_$(DEBUG_SUFFIX)
+LIBS= cw32mti import32 ole2w32 odbc32 zlib_bc$(DEBUG_SUFFIX) png_bc$(DEBUG_SUFFIX) jpeg_bc$(DEBUG_SUFFIX) tiff_bc$(DEBUG_SUFFIX) regex_bc$(DEBUG_SUFFIX)
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -561,7 +561,7 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-        implib -c $(LIBTARGET) $(WXDLL)
+        implib -c -f $(LIBTARGET) $(WXDLL)
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h