X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe164c3e2ea5453896cd63a5440a26365daec1bc..9818fdf902b06524e76966ca4676ca929f7c07c6:/contrib/build/stc/makefile.bcc

diff --git a/contrib/build/stc/makefile.bcc b/contrib/build/stc/makefile.bcc
index a1e739437c..d148ae000e 100644
--- a/contrib/build/stc/makefile.bcc
+++ b/contrib/build/stc/makefile.bcc
@@ -20,27 +20,127 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
+LIBDIRNAME = \
+	..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \
-	-I..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
+	$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(LIBDIRNAME) \
 	-I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \
 	-I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \
 	-I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \
 	-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
 	-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
 	-DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS)
-STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+STCDLL_OBJECTS =  \
+	$(OBJS)\stcdll_PlatWX.obj \
+	$(OBJS)\stcdll_ScintillaWX.obj \
+	$(OBJS)\stcdll_stc.obj \
+	$(OBJS)\stcdll_AutoComplete.obj \
+	$(OBJS)\stcdll_CallTip.obj \
+	$(OBJS)\stcdll_CellBuffer.obj \
+	$(OBJS)\stcdll_ContractionState.obj \
+	$(OBJS)\stcdll_Document.obj \
+	$(OBJS)\stcdll_DocumentAccessor.obj \
+	$(OBJS)\stcdll_Editor.obj \
+	$(OBJS)\stcdll_ExternalLexer.obj \
+	$(OBJS)\stcdll_Indicator.obj \
+	$(OBJS)\stcdll_KeyMap.obj \
+	$(OBJS)\stcdll_KeyWords.obj \
+	$(OBJS)\stcdll_LexAVE.obj \
+	$(OBJS)\stcdll_LexAda.obj \
+	$(OBJS)\stcdll_LexAsm.obj \
+	$(OBJS)\stcdll_LexBaan.obj \
+	$(OBJS)\stcdll_LexBullant.obj \
+	$(OBJS)\stcdll_LexCPP.obj \
+	$(OBJS)\stcdll_LexCSS.obj \
+	$(OBJS)\stcdll_LexConf.obj \
+	$(OBJS)\stcdll_LexCrontab.obj \
+	$(OBJS)\stcdll_LexEiffel.obj \
+	$(OBJS)\stcdll_LexEScript.obj \
+	$(OBJS)\stcdll_LexFortran.obj \
+	$(OBJS)\stcdll_LexHTML.obj \
+	$(OBJS)\stcdll_LexLisp.obj \
+	$(OBJS)\stcdll_LexLout.obj \
+	$(OBJS)\stcdll_LexLua.obj \
+	$(OBJS)\stcdll_LexMatlab.obj \
+	$(OBJS)\stcdll_LexOthers.obj \
+	$(OBJS)\stcdll_LexPOV.obj \
+	$(OBJS)\stcdll_LexPascal.obj \
+	$(OBJS)\stcdll_LexPerl.obj \
+	$(OBJS)\stcdll_LexPython.obj \
+	$(OBJS)\stcdll_LexRuby.obj \
+	$(OBJS)\stcdll_LexSQL.obj \
+	$(OBJS)\stcdll_LexVB.obj \
+	$(OBJS)\stcdll_LineMarker.obj \
+	$(OBJS)\stcdll_PropSet.obj \
+	$(OBJS)\stcdll_RESearch.obj \
+	$(OBJS)\stcdll_ScintillaBase.obj \
+	$(OBJS)\stcdll_Style.obj \
+	$(OBJS)\stcdll_StyleContext.obj \
+	$(OBJS)\stcdll_UniConversion.obj \
+	$(OBJS)\stcdll_ViewStyle.obj \
+	$(OBJS)\stcdll_WindowAccessor.obj \
+	$(OBJS)\stcdll_XPM.obj
+STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \
-	-I..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
+	$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(LIBDIRNAME) \
 	-I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \
 	-I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \
 	-I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \
 	-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
 	-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS)
+STCLIB_OBJECTS =  \
+	$(OBJS)\stclib_PlatWX.obj \
+	$(OBJS)\stclib_ScintillaWX.obj \
+	$(OBJS)\stclib_stc.obj \
+	$(OBJS)\stclib_AutoComplete.obj \
+	$(OBJS)\stclib_CallTip.obj \
+	$(OBJS)\stclib_CellBuffer.obj \
+	$(OBJS)\stclib_ContractionState.obj \
+	$(OBJS)\stclib_Document.obj \
+	$(OBJS)\stclib_DocumentAccessor.obj \
+	$(OBJS)\stclib_Editor.obj \
+	$(OBJS)\stclib_ExternalLexer.obj \
+	$(OBJS)\stclib_Indicator.obj \
+	$(OBJS)\stclib_KeyMap.obj \
+	$(OBJS)\stclib_KeyWords.obj \
+	$(OBJS)\stclib_LexAVE.obj \
+	$(OBJS)\stclib_LexAda.obj \
+	$(OBJS)\stclib_LexAsm.obj \
+	$(OBJS)\stclib_LexBaan.obj \
+	$(OBJS)\stclib_LexBullant.obj \
+	$(OBJS)\stclib_LexCPP.obj \
+	$(OBJS)\stclib_LexCSS.obj \
+	$(OBJS)\stclib_LexConf.obj \
+	$(OBJS)\stclib_LexCrontab.obj \
+	$(OBJS)\stclib_LexEiffel.obj \
+	$(OBJS)\stclib_LexEScript.obj \
+	$(OBJS)\stclib_LexFortran.obj \
+	$(OBJS)\stclib_LexHTML.obj \
+	$(OBJS)\stclib_LexLisp.obj \
+	$(OBJS)\stclib_LexLout.obj \
+	$(OBJS)\stclib_LexLua.obj \
+	$(OBJS)\stclib_LexMatlab.obj \
+	$(OBJS)\stclib_LexOthers.obj \
+	$(OBJS)\stclib_LexPOV.obj \
+	$(OBJS)\stclib_LexPascal.obj \
+	$(OBJS)\stclib_LexPerl.obj \
+	$(OBJS)\stclib_LexPython.obj \
+	$(OBJS)\stclib_LexRuby.obj \
+	$(OBJS)\stclib_LexSQL.obj \
+	$(OBJS)\stclib_LexVB.obj \
+	$(OBJS)\stclib_LineMarker.obj \
+	$(OBJS)\stclib_PropSet.obj \
+	$(OBJS)\stclib_RESearch.obj \
+	$(OBJS)\stclib_ScintillaBase.obj \
+	$(OBJS)\stclib_Style.obj \
+	$(OBJS)\stclib_StyleContext.obj \
+	$(OBJS)\stclib_UniConversion.obj \
+	$(OBJS)\stclib_ViewStyle.obj \
+	$(OBJS)\stclib_WindowAccessor.obj \
+	$(OBJS)\stclib_XPM.obj
 
 ### Conditionally set variables: ###
 
@@ -56,7 +156,10 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"
@@ -68,15 +171,33 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = -v
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
 !endif
-!if "$(BUILD)" == "release"
-__DEBUGFLAG = -v-
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
 !endif
-!if "$(BUILD)" == "debug"
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od
 !endif
@@ -114,11 +235,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 !if "$(SHARED)" == "1"
 __stcdll___depname = \
-	..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll
 !endif
 !if "$(SHARED)" == "0"
 __stclib___depname = \
-	..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
 !endif
 
 
@@ -427,22 +548,22 @@ $(OBJS)\stclib_stc.obj: ../../src/stc\stc.cpp
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll
-	-if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
-	-if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
 
 !if "$(SHARED)" == "1"
-..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj
-	ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-	c0d32.obj  $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,,
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
+	ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+	c0d32.obj $(STCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,,
 |
-	implib -f ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@
+	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@
 !endif
 
 !if "$(SHARED)" == "0"
-..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(STCLIB_OBJECTS)
 	if exist $@ del $@
 	tlib /a /p2048 $@ @&&|
-	$(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj
+	$(STCLIB_OBJECTS)
 |
 !endif