Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify Borland makefile to include bc in library names

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-06-17 13:22:34 +00:00
parent d9a41dfe5a
commit 7a9f270ffc
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/msw/tmake/b32.t
View File

@@ -165,7 +165,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll 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 !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@@ -248,7 +248,7 @@ nul
$(PERIPH_LIBS) $(LIBS) $(PERIPH_LIBS) $(LIBS)
wxb32 wxb32
! !
implib -c $(LIBTARGET) $(WXDLL) implib -c -f $(LIBTARGET) $(WXDLL)
!endif !endif
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h

2
src/makeb32.env
View File

@@ -137,7 +137,7 @@ INCEXT=dll$(INCEXT)
# final names determined here # final names determined here
WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib
WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).dll 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) OBJ_PATH=$(OBJ_PATH)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX)
!if "$(WXMAKINGDLL)" == "1" !if "$(WXMAKINGDLL)" == "1"

10
src/makeprog.b32
View File

@@ -23,19 +23,19 @@ EXEDIR = BORL
!if "$(wxUSE_GUI)" == "0" !if "$(wxUSE_GUI)" == "0"
IMGLIBS= IMGLIBS=
!else !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 !endif
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
EX_LIBS=$(EXTRALIBS:.lib=_d.lib) EX_LIBS=$(EXTRALIBS:.lib=_bcd.lib)
!else !else
EX_LIBS=$(EXTRALIBS) EX_LIBS=$(EXTRALIBS:.lib=_bc.lib)
!endif !endif
!if "$(WXUSINGDLL)" == "1" !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 !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 !endif
!if "$(wxUSE_ODBC)" == "1" !if "$(wxUSE_ODBC)" == "1"

4
src/msw/makefile.b32
View File

@@ -56,7 +56,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll 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 !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@@ -561,7 +561,7 @@ nul
$(PERIPH_LIBS) $(LIBS) $(PERIPH_LIBS) $(LIBS)
wxb32 wxb32
! !
implib -c $(LIBTARGET) $(WXDLL) implib -c -f $(LIBTARGET) $(WXDLL)
!endif !endif
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h