winundef.h is needed for wxBase as well

[wxWidgets.git] / distrib / msw / tmake / vc.t

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 2104ad17c21fb24d0b82ce92b9d6f6fec6a15e53..19b21b7ab9b65ef2261270d0843298665c854000 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -28,7 +28,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\b16\b/;
+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
 
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= "\$(COMMDIR)\\\$D\\" . $file . " "
@@ -167,7 +167,7 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
-SETUP_H=$(ARCHINCDIR)\wx\setup.h 
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
 # Normal, static library
 all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
@@ -176,10 +176,10 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
-$(SETUP_H):
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
     copy $(WXDIR)\include\wx\msw\setup.h $@
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D
 
 $D:
     mkdir $D
@@ -208,6 +208,10 @@ $(TIFFDIR)\$D:
 $(REGEXDIR)\$D:
     mkdir $(REGEXDIR)\$D
 
+$(WXDIR)\$D:
+    mkdir $(WXDIR)\$D
+
+
 # wxWindows library as DLL
 dll:
         nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
@@ -459,6 +463,9 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
+       -erase $(WXDIR)\$D\$(PCH)
+       -erase $(WXDIR)\$D\*.pdb
+       -erase $(WXDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.pdb
         -erase $(GENDIR)\$D\*.sbr
@@ -493,6 +500,7 @@ clean: $(PERIPH_CLEAN_TARGET)
         -rmdir $(HTMLDIR)\$(D)
         -rmdir $(JPEGDIR)\$(D)
         -rmdir $(TIFFDIR)\$(D)
+       -rmdir $(WXDIR)\$D
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp