Borland makefiles for contrib keeping output apart

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-05-27 13:43:30 +00:00
parent dc3b0532ee
commit e6275f8d02
10 changed files with 258 additions and 201 deletions

View File

@@ -9,9 +9,12 @@
WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\lib\anim.lib
LIBTARGET=anim
OBJECTS = animate.obj
!include $(WXDIR)\src\makeb32.env
OBJECTS = $(OBJ_PATH)\animate.obj
!include $(WXDIR)\src\makelib.b32
$(OBJ_PATH)\animate.obj : animate.cpp

View File

@@ -9,9 +9,22 @@
WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\lib\gizmos.lib
LIBTARGET=gizmos
OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
!include $(WXDIR)\src\makeb32.env
OBJECTS = \
$(OBJ_PATH)\multicell.obj \
$(OBJ_PATH)\splittree.obj \
$(OBJ_PATH)\editlbox.obj \
$(OBJ_PATH)\dynamicsash.obj \
$(OBJ_PATH)\ledctrl.obj \
!include $(WXDIR)\src\makelib.b32
$(OBJ_PATH)\multicell.obj : multicell.cpp
$(OBJ_PATH)\splittree.obj : splittree.cpp
$(OBJ_PATH)\editlbox.obj : editlbox.cpp
$(OBJ_PATH)\dynamicsash.obj : dynamicsash.cpp
$(OBJ_PATH)\ledctrl.obj : ledctrl.cpp

View File

@@ -9,12 +9,56 @@
WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib
LIBTARGET=mmedia
!include $(WXDIR)\src\makeb32.env
OBJECTS = \
$(OBJ_PATH)\cdbase.obj \
$(OBJ_PATH)\cdwin.obj \
$(OBJ_PATH)\g711.obj \
$(OBJ_PATH)\g721.obj \
$(OBJ_PATH)\g723_24.obj \
$(OBJ_PATH)\g723_40.obj \
$(OBJ_PATH)\g72x.obj \
$(OBJ_PATH)\sndaiff.obj \
$(OBJ_PATH)\sndbase.obj \
$(OBJ_PATH)\sndcodec.obj \
$(OBJ_PATH)\sndcpcm.obj \
$(OBJ_PATH)\sndfile.obj \
$(OBJ_PATH)\sndg72x.obj \
$(OBJ_PATH)\sndmsad.obj \
$(OBJ_PATH)\sndpcm.obj \
$(OBJ_PATH)\sndulaw.obj \
$(OBJ_PATH)\sndwav.obj \
$(OBJ_PATH)\sndwin.obj \
$(OBJ_PATH)\vidbase.obj \
$(OBJ_PATH)\vidwin.obj
OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj \
g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj \
sndcpcm.obj sndfile.obj sndg72x.obj sndmsad.obj sndpcm.obj sndulaw.obj \
sndwav.obj sndwin.obj vidbase.obj vidwin.obj
!include $(WXDIR)\src\makelib.b32
$(OBJ_PATH)\cdbase.obj : cdbase.cpp
$(OBJ_PATH)\cdwin.obj : cdwin.cpp
$(OBJ_PATH)\g711.obj : g711.cpp
$(OBJ_PATH)\g721.obj : g721.cpp
$(OBJ_PATH)\g723_24.obj : g723_24.cpp
$(OBJ_PATH)\g723_40.obj: g723_40.cpp
$(OBJ_PATH)\g72x.obj : g72x.cpp
$(OBJ_PATH)\sndaiff.obj : sndaiff.cpp
$(OBJ_PATH)\sndbase.obj : sndbase.cpp
$(OBJ_PATH)\sndcodec.obj : sndcodec.cpp
$(OBJ_PATH)\sndcpcm.obj : sndcpcm.cpp
$(OBJ_PATH)\sndfile.obj : sndfile.cpp
$(OBJ_PATH)\sndg72x.obj : sndg72x.cpp
$(OBJ_PATH)\sndmsad.obj : sndmsad.cpp
$(OBJ_PATH)\sndpcm.obj : sndpcm.cpp
$(OBJ_PATH)\sndulaw.obj : sndulaw.cpp
$(OBJ_PATH)\sndwav.obj : sndwav.cpp
$(OBJ_PATH)\sndwin.obj : sndwin.cpp
$(OBJ_PATH)\vidbase.obj : vidbase.cpp
$(OBJ_PATH)\vidwin.obj : vidwin.cpp

View File

@@ -9,9 +9,17 @@
WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\lib\net.lib
LIBTARGET=net
OBJECTS = smapi.obj email.obj web.obj
!include $(WXDIR)\src\makeb32.env
OBJECTS = \
$(OBJ_PATH)\smapi.obj \
$(OBJ_PATH)\email.obj \
$(OBJ_PATH)\web.obj
!include $(WXDIR)\src\makelib.b32
$(OBJ_PATH)\smapi.obj : smapi.cpp
$(OBJ_PATH)\email.obj : email.cpp
$(OBJ_PATH)\web.obj : web.cpp

View File

@@ -9,10 +9,38 @@
WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\lib\ogl.lib
LIBTARGET=ogl
OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
composit.obj drawn.obj bmpshape.obj mfutils.obj
!include $(WXDIR)\src\makeb32.env
OBJECTS = \
$(OBJ_PATH)\basic.obj \
$(OBJ_PATH)\basic2.obj \
$(OBJ_PATH)\canvas.obj \
$(OBJ_PATH)\ogldiag.obj \
$(OBJ_PATH)\lines.obj \
$(OBJ_PATH)\misc.obj \
$(OBJ_PATH)\divided.obj \
$(OBJ_PATH)\constrnt.obj\
$(OBJ_PATH)\composit.obj \
$(OBJ_PATH)\drawn.obj \
$(OBJ_PATH)\bmpshape.obj \
$(OBJ_PATH)\mfutils.obj
!include $(WXDIR)\src\makelib.b32
$(OBJ_PATH)\basic.obj : basic.cpp
$(OBJ_PATH)\basic2.obj : basic2.cpp
$(OBJ_PATH)\canvas.obj : canvas.cpp
$(OBJ_PATH)\ogldiag.obj : ogldiag.cpp
$(OBJ_PATH)\lines.obj : lines.cpp
$(OBJ_PATH)\misc.obj : misc.cpp
$(OBJ_PATH)\divided.obj : divided.cpp
$(OBJ_PATH)\constrnt.obj: constrnt.cpp
$(OBJ_PATH)\composit.obj : composit.cpp
$(OBJ_PATH)\drawn.obj : drawn.cpp
$(OBJ_PATH)\bmpshape.obj : bmpshape.cpp
$(OBJ_PATH)\mfutils.obj : mfutils.cpp

View File

@@ -9,9 +9,16 @@
WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\lib\plot.lib
LIBTARGET=plot
OBJECTS = plot.obj
!include $(WXDIR)\src\makeb32.env
OBJECTS = $(OBJ_PATH)\plot.obj
!include $(WXDIR)\src\makelib.b32
$(OBJ_PATH)\plot.obj : plot.cpp

View File

@@ -13,111 +13,83 @@
WXDIR = $(WXWIN)
LIBTARGET=stc
!include $(WXDIR)\src\makeb32.env
SCINTILLA=.\scintilla
S=$(SCINTILLA)\src
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
EXTRASTCCPPFLAGS = -D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
OBJECTS = \
AutoComplete.obj \
CallTip.obj \
CellBuffer.obj \
ContractionState.obj \
Document.obj \
DocumentAccessor.obj \
Editor.obj \
Indicator.obj \
KeyMap.obj \
KeyWords.obj \
LexAVE.obj \
LexAda.obj \
LexAsm.obj \
LexBaan.obj \
LexBullant.obj \
LexMatlab.obj \
LexCPP.obj \
LexConf.obj \
LexCrontab.obj \
LexCSS.obj \
LexEiffel.obj \
LexFortran.obj \
LexHTML.obj \
LexLisp.obj \
LexLua.obj \
LexOthers.obj \
LexPOV.obj \
LexPascal.obj \
LexPerl.obj \
LexPython.obj \
LexRuby.obj \
LexSQL.obj \
LexVB.obj \
LineMarker.obj \
PropSet.obj \
RESearch.obj \
ScintillaBase.obj \
Style.obj \
StyleContext.obj \
UniConversion.obj \
ViewStyle.obj \
WindowAccessor.obj \
XPM.obj \
\
PlatWX.obj \
ScintillaWX.obj \
stc.obj \
$(OBJ_PATH)\AutoComplete.obj \
$(OBJ_PATH)\CallTip.obj \
$(OBJ_PATH)\CellBuffer.obj \
$(OBJ_PATH)\ContractionState.obj \
$(OBJ_PATH)\Document.obj \
$(OBJ_PATH)\DocumentAccessor.obj \
$(OBJ_PATH)\Editor.obj \
$(OBJ_PATH)\Indicator.obj \
$(OBJ_PATH)\KeyMap.obj \
$(OBJ_PATH)\KeyWords.obj \
$(OBJ_PATH)\LexAVE.obj \
$(OBJ_PATH)\LexAda.obj \
$(OBJ_PATH)\LexAsm.obj \
$(OBJ_PATH)\LexBaan.obj \
$(OBJ_PATH)\LexBullant.obj \
$(OBJ_PATH)\LexMatlab.obj \
$(OBJ_PATH)\LexCPP.obj \
$(OBJ_PATH)\LexConf.obj \
$(OBJ_PATH)\LexCrontab.obj \
$(OBJ_PATH)\LexCSS.obj \
$(OBJ_PATH)\LexEiffel.obj \
$(OBJ_PATH)\LexFortran.obj \
$(OBJ_PATH)\LexHTML.obj \
$(OBJ_PATH)\LexLisp.obj \
$(OBJ_PATH)\LexLua.obj \
$(OBJ_PATH)\LexOthers.obj \
$(OBJ_PATH)\LexPOV.obj \
$(OBJ_PATH)\LexPascal.obj \
$(OBJ_PATH)\LexPerl.obj \
$(OBJ_PATH)\LexPython.obj \
$(OBJ_PATH)\LexRuby.obj \
$(OBJ_PATH)\LexSQL.obj \
$(OBJ_PATH)\LexVB.obj \
$(OBJ_PATH)\LineMarker.obj \
$(OBJ_PATH)\PropSet.obj \
$(OBJ_PATH)\RESearch.obj \
$(OBJ_PATH)\ScintillaBase.obj \
$(OBJ_PATH)\Style.obj \
$(OBJ_PATH)\StyleContext.obj \
$(OBJ_PATH)\UniConversion.obj \
$(OBJ_PATH)\ViewStyle.obj \
$(OBJ_PATH)\WindowAccessor.obj \
$(OBJ_PATH)\XPM.obj \
\
$(OBJ_PATH)\PlatWX.obj \
$(OBJ_PATH)\ScintillaWX.obj \
$(OBJ_PATH)\stc.obj \
STCCFG = stc.cfg
STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) $(EXTRASTCCPPFLAGS)
default: $(STCCFG) $(LIBTARGET)
cleancfg:
del $(STCCFG)
.path.obj = $(OBJ_PATH)
{$(S)}.cxx.obj:
bcc32 $(STCCPPFLAGS) -P -c {$< }
$(STCCFG): makefile.b32
copy &&!
-H=$(WXDIR)\src\msw\wx32.csm
-3
-d
-a1 # byte alignment
-R-
-X
-w-par
-w-aus
-w-hid # virtual function A hides virtual function B
-tWM
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32;$(ARCHINCDIR)
-L$(BCCDIR)\lib
-D__WXWIN__
-D__WXMSW__
-D__WINDOWS__
-DWIN32
$(OPT)
$(DEBUG_FLAGS)
$(WIN95FLAG)
$(STCEXTRACPPFLAGS)
! $(STCCFG)
bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -o$(OBJ_PATH)\$(<B).obj {$< }
.cpp.obj:
bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -o$(OBJ_PATH)\$(<B).obj {$< }
!include $(WXDIR)\src\makelib.b32
{$(S)}.cpp.obj:
bcc32 $(STCCPPFLAGS) -P -c {$< }
$(OBJ_PATH)\PlatWX.obj : PlatWX.cpp
.$(SRCSUFF).obj:
bcc32 $(STCCPPFLAGS) -c {$< }
$(OBJ_PATH)\ScintillaWX.obj : ScintillaWX.cpp
$(OBJ_PATH)\stc.obj : stc.cpp

View File

@@ -11,9 +11,13 @@ WXDIR = $(WXWIN)
EXTRACPPFLAGS=-Icontrib/include
LIBTARGET=$(WXDIR)\lib\dcsvg.lib
LIBTARGET=dcsvg
OBJECTS = dcsvg.obj
!include $(WXDIR)\src\makeb32.env
OBJECTS = $(OBJ_PATH)\dcsvg.obj
!include $(WXDIR)\src\makelib.b32
$(OBJ_PATH)\dcsvg.obj : dcsvg.cpp

View File

@@ -26,10 +26,16 @@ IMGLIBS=
IMGLIBS= png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX)
!endif
!if "$(WXUSINGDLL)" == "1"
LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
!if "$(FINAL)" == "0"
EX_LIBS=$(EXTRALIBS:.lib=_d.lib)
!else
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
EX_LIBS=$(EXTRALIBS)
!endif
!if "$(WXUSINGDLL)" == "1"
LIBS=$(WXLIB) $(EX_LIBS) cw32mti import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
!else
LIBS=$(WXLIB) $(EX_LIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
!endif
!if "$(wxUSE_ODBC)" == "1"

View File

@@ -13,111 +13,83 @@
WXDIR = $(WXWIN)
LIBTARGET=stc
!include $(WXDIR)\src\makeb32.env
SCINTILLA=.\scintilla
S=$(SCINTILLA)\src
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
EXTRASTCCPPFLAGS = -D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
OBJECTS = \
AutoComplete.obj \
CallTip.obj \
CellBuffer.obj \
ContractionState.obj \
Document.obj \
DocumentAccessor.obj \
Editor.obj \
Indicator.obj \
KeyMap.obj \
KeyWords.obj \
LexAVE.obj \
LexAda.obj \
LexAsm.obj \
LexBaan.obj \
LexBullant.obj \
LexMatlab.obj \
LexCPP.obj \
LexConf.obj \
LexCrontab.obj \
LexCSS.obj \
LexEiffel.obj \
LexFortran.obj \
LexHTML.obj \
LexLisp.obj \
LexLua.obj \
LexOthers.obj \
LexPOV.obj \
LexPascal.obj \
LexPerl.obj \
LexPython.obj \
LexRuby.obj \
LexSQL.obj \
LexVB.obj \
LineMarker.obj \
PropSet.obj \
RESearch.obj \
ScintillaBase.obj \
Style.obj \
StyleContext.obj \
UniConversion.obj \
ViewStyle.obj \
WindowAccessor.obj \
XPM.obj \
\
PlatWX.obj \
ScintillaWX.obj \
stc.obj \
$(OBJ_PATH)\AutoComplete.obj \
$(OBJ_PATH)\CallTip.obj \
$(OBJ_PATH)\CellBuffer.obj \
$(OBJ_PATH)\ContractionState.obj \
$(OBJ_PATH)\Document.obj \
$(OBJ_PATH)\DocumentAccessor.obj \
$(OBJ_PATH)\Editor.obj \
$(OBJ_PATH)\Indicator.obj \
$(OBJ_PATH)\KeyMap.obj \
$(OBJ_PATH)\KeyWords.obj \
$(OBJ_PATH)\LexAVE.obj \
$(OBJ_PATH)\LexAda.obj \
$(OBJ_PATH)\LexAsm.obj \
$(OBJ_PATH)\LexBaan.obj \
$(OBJ_PATH)\LexBullant.obj \
$(OBJ_PATH)\LexMatlab.obj \
$(OBJ_PATH)\LexCPP.obj \
$(OBJ_PATH)\LexConf.obj \
$(OBJ_PATH)\LexCrontab.obj \
$(OBJ_PATH)\LexCSS.obj \
$(OBJ_PATH)\LexEiffel.obj \
$(OBJ_PATH)\LexFortran.obj \
$(OBJ_PATH)\LexHTML.obj \
$(OBJ_PATH)\LexLisp.obj \
$(OBJ_PATH)\LexLua.obj \
$(OBJ_PATH)\LexOthers.obj \
$(OBJ_PATH)\LexPOV.obj \
$(OBJ_PATH)\LexPascal.obj \
$(OBJ_PATH)\LexPerl.obj \
$(OBJ_PATH)\LexPython.obj \
$(OBJ_PATH)\LexRuby.obj \
$(OBJ_PATH)\LexSQL.obj \
$(OBJ_PATH)\LexVB.obj \
$(OBJ_PATH)\LineMarker.obj \
$(OBJ_PATH)\PropSet.obj \
$(OBJ_PATH)\RESearch.obj \
$(OBJ_PATH)\ScintillaBase.obj \
$(OBJ_PATH)\Style.obj \
$(OBJ_PATH)\StyleContext.obj \
$(OBJ_PATH)\UniConversion.obj \
$(OBJ_PATH)\ViewStyle.obj \
$(OBJ_PATH)\WindowAccessor.obj \
$(OBJ_PATH)\XPM.obj \
\
$(OBJ_PATH)\PlatWX.obj \
$(OBJ_PATH)\ScintillaWX.obj \
$(OBJ_PATH)\stc.obj \
STCCFG = stc.cfg
STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) $(EXTRASTCCPPFLAGS)
default: $(STCCFG) $(LIBTARGET)
cleancfg:
del $(STCCFG)
.path.obj = $(OBJ_PATH)
{$(S)}.cxx.obj:
bcc32 $(STCCPPFLAGS) -P -c {$< }
$(STCCFG): makefile.b32
copy &&!
-H=$(WXDIR)\src\msw\wx32.csm
-3
-d
-a1 # byte alignment
-R-
-X
-w-par
-w-aus
-w-hid # virtual function A hides virtual function B
-tWM
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32;$(ARCHINCDIR)
-L$(BCCDIR)\lib
-D__WXWIN__
-D__WXMSW__
-D__WINDOWS__
-DWIN32
$(OPT)
$(DEBUG_FLAGS)
$(WIN95FLAG)
$(STCEXTRACPPFLAGS)
! $(STCCFG)
bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -o$(OBJ_PATH)\$(<B).obj {$< }
.cpp.obj:
bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -o$(OBJ_PATH)\$(<B).obj {$< }
!include $(WXDIR)\src\makelib.b32
{$(S)}.cpp.obj:
bcc32 $(STCCPPFLAGS) -P -c {$< }
$(OBJ_PATH)\PlatWX.obj : PlatWX.cpp
.$(SRCSUFF).obj:
bcc32 $(STCCPPFLAGS) -c {$< }
$(OBJ_PATH)\ScintillaWX.obj : ScintillaWX.cpp
$(OBJ_PATH)\stc.obj : stc.cpp