More changes for building the regex lib

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

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 75674040b451c9f77222ffb7169094add51f256a..ef2ee18a056799d56ce830a79c82f799eab790f2 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -109,6 +109,8 @@ DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
 JPEGDIR = $(WXDIR)\src\jpeg
 TIFFDIR = $(WXDIR)\src\tiff
+REGEXDIR = $(WXDIR)\src\regex
+
 
 {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
        cl @<<
@@ -172,7 +174,7 @@ setuph:
     if not exist setup.h copy setup0.h setup.h
     cd $(WXDIR)\src\msw
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D
 
 $D:
     mkdir $D
@@ -198,6 +200,9 @@ $(JPEGDIR)\$D:
 $(TIFFDIR)\$D:
     mkdir $(TIFFDIR)\$D
 
+$(REGEXDIR)\$D:
+    mkdir $(REGEXDIR)\$D
+
 # wxWindows library as DLL
 dll:
         nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
@@ -422,7 +427,7 @@ clean_tiff:
 
 regex:
     cd $(WXDIR)\src\regex
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
     cd $(WXDIR)\src\msw
 
 clean_regex:

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 137d9193b2e62c0db47fb8c145d2c19b1c4dd56c..9dcf51c473216e73641693f2c9973c973b209fcf 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:37, 2001/10/08
+# This file was automatically generated by tmake at 10:56, 2001/10/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -52,6 +52,8 @@ DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
 JPEGDIR = $(WXDIR)\src\jpeg
 TIFFDIR = $(WXDIR)\src\tiff
+REGEXDIR = $(WXDIR)\src\regex
+
 
 {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
        cl @<<
@@ -395,7 +397,7 @@ setuph:
     if not exist setup.h copy setup0.h setup.h
     cd $(WXDIR)\src\msw
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D
 
 $D:
     mkdir $D
@@ -421,6 +423,9 @@ $(JPEGDIR)\$D:
 $(TIFFDIR)\$D:
     mkdir $(TIFFDIR)\$D
 
+$(REGEXDIR)\$D:
+    mkdir $(REGEXDIR)\$D
+
 # wxWindows library as DLL
 dll:
         nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
@@ -645,7 +650,7 @@ clean_tiff:
 
 regex:
     cd $(WXDIR)\src\regex
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
     cd $(WXDIR)\src\msw
 
 clean_regex:

diff --git a/src/regex/makefile.vc b/src/regex/makefile.vc
index 29f07b5f75d191d10d3caab80b510ca33361a04a..5dd195cbb6f46808418733ad039ff03da9405c42 100644 (file)
--- a/src/regex/makefile.vc
+++ b/src/regex/makefile.vc
@@ -7,10 +7,10 @@ LIBTARGET=$(WXDIR)\lib\regexd.lib
 !endif
 
 OBJECTS= \
-               regcomp.obj \
-               regexec.obj \
-               regerror.obj \
-               regfree.obj
+               $D\regcomp.obj \
+               $D\regexec.obj \
+               $D\regerror.obj \
+               $D\regfree.obj
 
 # Pull in standard variable definitions