From: Chris Elliott <biol75@york.ac.uk>
Date: Sat, 22 Feb 2003 15:42:49 +0000 (+0000)
Subject: update watcom makefile
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ec8b1069137d87bc14c1269d119904a664c96aeb

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 764841827a..c9f3157bf8 100644
--- 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 = ..\..\..
 
-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)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
+!include $(WXDIR)\src\makewat.env
+
 STCLIB = $(WXDIR)\lib\stc.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
 
 NAME = stc
 LNK = $(name).lnk
@@ -74,6 +73,6 @@ clean:   .SYMBOLIC
 .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 764841827a..c9f3157bf8 100644
--- 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)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
+!include $(WXDIR)\src\makewat.env
+
 STCLIB = $(WXDIR)\lib\stc.lib
 THISDIR = $(WXDIR)\contrib\src\stc
 OUTPUTDIR = $(THISDIR)\
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
+
 
 NAME = stc
 LNK = $(name).lnk
@@ -74,6 +73,6 @@ clean:   .SYMBOLIC
 .cxx: $(S)
 
 .cxx.obj:
-    wpp386 $[*.cxx /w3 -zv $(STCEXTRACPPFLAGS) -I$(WXDIR)\include -I$(ARCHINCDIR)
+    $(CXX) $[*.cxx $(CXXFLAGS) $(STCEXTRACPPFLAGS)