A fix for attribrute sorting, but it's still broken if there are

[wxWidgets.git] / src / msw / makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 91d20815f5c9914b578d7242bb7c0023f1b7fe2c..25a417a77a36d39defbd98276b1ad1c5a4138df1 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 13:52, 2001/08/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -138,6 +138,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\cmdproc.obj \
                $(COMMDIR)\$D\cmndata.obj \
                $(COMMDIR)\$D\config.obj \
+               $(COMMDIR)\$D\containr.obj \
                $(COMMDIR)\$D\cshelp.obj \
                $(COMMDIR)\$D\ctrlcmn.obj \
                $(COMMDIR)\$D\ctrlsub.obj \
@@ -159,6 +160,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\encconv.obj \
                $(COMMDIR)\$D\event.obj \
                $(COMMDIR)\$D\extended.obj \
+               $(COMMDIR)\$D\fddlgcmn.obj \
                $(COMMDIR)\$D\ffile.obj \
                $(COMMDIR)\$D\file.obj \
                $(COMMDIR)\$D\fileconf.obj \
@@ -285,6 +287,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
                $(OLEDIR)\$D\droptgt.obj \
                $(MSWDIR)\$D\enhmeta.obj \
                $(MSWDIR)\$D\evtloop.obj \
+               $(MSWDIR)\$D\fdrepdlg.obj \
                $(MSWDIR)\$D\filedlg.obj \
                $(MSWDIR)\$D\font.obj \
                $(MSWDIR)\$D\fontdlg.obj \
@@ -379,7 +382,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
-all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET)
+all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
 
 setuph:
     cd $(WXDIR)\include\wx\msw
@@ -624,12 +627,22 @@ clean_tiff:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
+regex:
+    cd $(WXDIR)\src\regex
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    cd $(WXDIR)\src\msw
+
+clean_regex:
+    cd $(WXDIR)\src\regex
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
 rcparser:
     cd $(WXDIR)\utils\rcparser\src
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff
+cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp