Applied updated patch [ 731719 ] Owner draw font leak/overuse

[wxWidgets.git] / src / stc / makefile.wat

diff --git a/src/stc/makefile.wat b/src/stc/makefile.wat
index 764841827ae2b5908381c94668a9a91093ddb875..76a2985a3bcd5afbfddfc0b312568b8d688bc57a 100644 (file)
--- a/src/stc/makefile.wat
+++ b/src/stc/makefile.wat
@@ -1,20 +1,19 @@
-# Gizmos makefile for Watcom C++
+# STC makefile for Watcom C++
 
 WXDIR = ..\..\..
 
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-!include $(WXDIR)\src\makewat.env
-
 SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla
-
 S=$(SCINTILLA)\src
-
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S)
 
-STCLIB = $(WXDIR)\lib\stc.lib
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
+!include $(WXDIR)\src\makewat.env
+
+STCLIB = $(WXDIR)\lib\stc_w.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
 
 NAME = stc
 LNK = $(name).lnk
@@ -32,17 +31,21 @@ OBJECTS = &
     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               &
@@ -58,9 +61,10 @@ OBJECTS = &
        UniConversion.obj           &
     ViewStyle.obj                  &
        WindowAccessor.obj          &
+       XPM.obj                     &
        PlatWX.obj              &
        ScintillaWX.obj         &
-       stc.obj     
+       stc.obj
 
 all: $(STCLIB) .SYMBOLIC
 
@@ -68,12 +72,17 @@ $(STCLIB): $(OBJECTS)
        *wlib /b /c /n /P=256 $(STCLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(STCLIB) *.lbc
+    -erase *.obj
+    -erase *.bak
+    -erase *.err
+    -erase *.pch
+    -erase $(STCLIB)
+    -erase *.lbc
 
 .EXTENSIONS: .cxx
 .cxx: $(S)
 
 .cxx.obj:
-    wpp386 $[*.cxx /w3 -zv $(STCEXTRACPPFLAGS) -I$(WXDIR)\include -I$(ARCHINCDIR)
+    $(CXX) $[*.cxx $(CXXFLAGS) $(STCEXTRACPPFLAGS)