stc src and includes added back

[wxWidgets.git] / distrib / msw / tmake / Makefile

diff --git a/distrib/msw/tmake/Makefile b/distrib/msw/tmake/Makefile
index c01444f793a3cf71a5ace0f6b82c6560cac92490..c023b7b7f237911f9407c5044231551fd13c8eb5 100644 (file)
--- a/distrib/msw/tmake/Makefile
+++ b/distrib/msw/tmake/Makefile
@@ -11,7 +11,6 @@ all: $(MSW_MAKEFILES_DIR)/makefile.vc \
      $(MSW_MAKEFILES_DIR)/makefile.b32 \
      $(MSW_MAKEFILES_DIR)/makefile.dos \
      $(MSW_MAKEFILES_DIR)/makefile.bcc \
-     $(MSW_MAKEFILES_DIR)/makefile.sc \
      $(MSW_MAKEFILES_DIR)/makefile.wat \
      $(MSW_MAKEFILES_DIR)/makefile.g95 \
      $(WXDIR)/Makefile.in \
@@ -19,9 +18,11 @@ all: $(MSW_MAKEFILES_DIR)/makefile.vc \
      $(WXDIR)/src/msw/files.lst \
      $(WXDIR)/src/gtk/files.lst \
      $(WXDIR)/src/mac/files.lst \
+     $(WXDIR)/src/cocoa/files.lst \
      $(WXDIR)/src/motif/files.lst \
      $(WXDIR)/src/os2/files.lst \
      $(WXDIR)/src/mgl/files.lst \
+     $(WXDIR)/src/mgl/makefile.wat \
      $(WXDIR)/src/microwin/files.lst \
      $(WXDIR)/src/x11/files.lst \
      $(WXDIR)/src/univ/files.lst \
@@ -41,9 +42,6 @@ $(MSW_MAKEFILES_DIR)/makefile.dos: dos.t filelist.txt wxwin.pro
 $(MSW_MAKEFILES_DIR)/makefile.bcc: bcc.t filelist.txt wxwin.pro
        $(TMAKE) -t bcc wxwin.pro -o $@
 
-$(MSW_MAKEFILES_DIR)/makefile.sc: sc.t filelist.txt wxwin.pro
-       $(TMAKE) -t sc wxwin.pro -o $@
-
 $(MSW_MAKEFILES_DIR)/makefile.wat: wat.t filelist.txt wxwin.pro
        $(TMAKE) -t wat wxwin.pro -o $@
 
@@ -59,6 +57,9 @@ $(WXDIR)/src/msw/files.lst: msw.t filelist.txt wxwin.pro
 $(WXDIR)/src/mgl/files.lst: mgl.t filelist.txt wxwin.pro
        $(TMAKE) -t mgl wxwin.pro -o $@
 
+$(WXDIR)/src/mgl/makefile.wat: watmgl.t filelist.txt wxwin.pro
+       $(TMAKE) -t watmgl wxwin.pro -o $@
+
 $(WXDIR)/src/microwin/files.lst: micro.t filelist.txt wxwin.pro
        $(TMAKE) -t micro wxwin.pro -o $@
 
@@ -68,6 +69,9 @@ $(WXDIR)/src/gtk/files.lst: gtk.t filelist.txt wxwin.pro
 $(WXDIR)/src/mac/files.lst: mac.t filelist.txt wxwin.pro
        $(TMAKE) -t mac wxwin.pro -o $@
 
+$(WXDIR)/src/cocoa/files.lst: cocoa.t filelist.txt wxwin.pro
+       $(TMAKE) -t cocoa wxwin.pro -o $@
+
 $(WXDIR)/src/motif/files.lst: motif.t filelist.txt wxwin.pro
        $(TMAKE) -t motif wxwin.pro -o $@
 
@@ -81,10 +85,10 @@ $(WXDIR)/src/x11/files.lst: x11.t filelist.txt wxwin.pro
        $(TMAKE) -t x11 wxwin.pro -o $@
 
 $(WXDIR)/src/wxBase.dsp: vc6base.t filelist.txt wxwin.pro
-       $(TMAKE) -t vc6base wxwin.pro -o $@
+       WXWIN=$(WXDIR) $(TMAKE) -t vc6base wxwin.pro -o $@
 
 $(WXDIR)/src/wxWindows.dsp: vc6msw.t filelist.txt wxwin.pro
-       $(TMAKE) -t vc6msw wxwin.pro -o $@
+       WXWIN=$(WXDIR) $(TMAKE) -t vc6msw wxwin.pro -o $@
 
 $(WXDIR)/src/wxUniv.dsp: vc6univ.t filelist.txt wxwin.pro
        $(TMAKE) -t vc6univ wxwin.pro -o $@