update watcom makefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/makefile.wat b/contrib/src/stc/makefile.wat
index 764841827ae2b5908381c94668a9a91093ddb875..c9f3157bf837f8f97182399853c377af3c081758 100644 (file)
--- a/contrib/src/stc/makefile.wat
+++ b/contrib/src/stc/makefile.wat
@@ -1,20 +1,19 @@
-# Gizmos makefile for Watcom C++
+# STC makefile for Watcom C++

 
 WXDIR = ..\..\..
 
 
 WXDIR = ..\..\..
 

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-!include $(WXDIR)\src\makewat.env
-

 SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla
 SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla

-

 S=$(SCINTILLA)\src
 S=$(SCINTILLA)\src

-

 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S)
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S)
 

+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
+!include $(WXDIR)\src\makewat.env
+

 STCLIB = $(WXDIR)\lib\stc.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\
 STCLIB = $(WXDIR)\lib\stc.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+

 
 NAME = stc
 LNK = $(name).lnk
 
 NAME = stc
 LNK = $(name).lnk


@@ -74,6 +73,6 @@ clean:   .SYMBOLIC
 .cxx: $(S)
 
 .cxx.obj:
 .cxx: $(S)
 
 .cxx.obj:

-    wpp386 $[*.cxx /w3 -zv $(STCEXTRACPPFLAGS) -I$(WXDIR)\include -I$(ARCHINCDIR)
+    $(CXX) $[*.cxx $(CXXFLAGS) $(STCEXTRACPPFLAGS) 

 
 
 
 

diff --git a/src/stc/makefile.wat b/src/stc/makefile.wat
index 764841827ae2b5908381c94668a9a91093ddb875..c9f3157bf837f8f97182399853c377af3c081758 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 = ..\..\..
 
 
 WXDIR = ..\..\..
 

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-!include $(WXDIR)\src\makewat.env
-

 SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla
 SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla

-

 S=$(SCINTILLA)\src
 S=$(SCINTILLA)\src

-

 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S)
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S)
 

+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
+!include $(WXDIR)\src\makewat.env
+

 STCLIB = $(WXDIR)\lib\stc.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\
 STCLIB = $(WXDIR)\lib\stc.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\

-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+

 
 NAME = stc
 LNK = $(name).lnk
 
 NAME = stc
 LNK = $(name).lnk


@@ -74,6 +73,6 @@ clean:   .SYMBOLIC
 .cxx: $(S)
 
 .cxx.obj:
 .cxx: $(S)
 
 .cxx.obj:

-    wpp386 $[*.cxx /w3 -zv $(STCEXTRACPPFLAGS) -I$(WXDIR)\include -I$(ARCHINCDIR)
+    $(CXX) $[*.cxx $(CXXFLAGS) $(STCEXTRACPPFLAGS)