From e6275f8d02f48a96918b4601b99a644ac0b4d4da Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Tue, 27 May 2003 13:43:30 +0000 Subject: [PATCH] Borland makefiles for contrib keeping output apart git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/animate/makefile.b32 | 7 +- contrib/src/gizmos/makefile.b32 | 17 +++- contrib/src/mmedia/makefile.b32 | 54 ++++++++++- contrib/src/net/makefile.b32 | 12 ++- contrib/src/ogl/makefile.b32 | 34 ++++++- contrib/src/plot/makefile.b32 | 11 ++- contrib/src/stc/makefile.b32 | 158 +++++++++++++------------------ contrib/src/svg/makefile.b32 | 8 +- src/makeprog.b32 | 10 +- src/stc/makefile.b32 | 158 +++++++++++++------------------ 10 files changed, 263 insertions(+), 206 deletions(-) diff --git a/contrib/src/animate/makefile.b32 b/contrib/src/animate/makefile.b32 index 12b6763bd0..ca8f92c9a3 100644 --- a/contrib/src/animate/makefile.b32 +++ b/contrib/src/animate/makefile.b32 @@ -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 diff --git a/contrib/src/gizmos/makefile.b32 b/contrib/src/gizmos/makefile.b32 index 1b5c09ee27..55ae2e4baa 100644 --- a/contrib/src/gizmos/makefile.b32 +++ b/contrib/src/gizmos/makefile.b32 @@ -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 + diff --git a/contrib/src/mmedia/makefile.b32 b/contrib/src/mmedia/makefile.b32 index 9120a5e490..bafda07d96 100644 --- a/contrib/src/mmedia/makefile.b32 +++ b/contrib/src/mmedia/makefile.b32 @@ -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 + + diff --git a/contrib/src/net/makefile.b32 b/contrib/src/net/makefile.b32 index 90ca71b55d..ca3238b936 100644 --- a/contrib/src/net/makefile.b32 +++ b/contrib/src/net/makefile.b32 @@ -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 diff --git a/contrib/src/ogl/makefile.b32 b/contrib/src/ogl/makefile.b32 index 0b5356ac42..f8352c54c7 100644 --- a/contrib/src/ogl/makefile.b32 +++ b/contrib/src/ogl/makefile.b32 @@ -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 + + + diff --git a/contrib/src/plot/makefile.b32 b/contrib/src/plot/makefile.b32 index 56e56b0145..d7339acc58 100644 --- a/contrib/src/plot/makefile.b32 +++ b/contrib/src/plot/makefile.b32 @@ -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 + + + diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32 index 345d659000..d3c3a21c1c 100644 --- a/contrib/src/stc/makefile.b32 +++ b/contrib/src/stc/makefile.b32 @@ -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 \ - - -STCCFG = stc.cfg -STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG) - -default: $(STCCFG) $(LIBTARGET) - -cleancfg: - del $(STCCFG) + $(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 \ + + +STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) $(EXTRASTCCPPFLAGS) + +.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)\$(