Reverted my bad <> -> "" fix, sorry; updated project files.

Probably regex should have it's own .dsp file :-(

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

diff --git a/samples/dragimag/DragimagVC.dsp b/samples/dragimag/DragimagVC.dsp
index 6910a6fb6820b4268c9691e5bc9c98e857ce7e71..51394f32d3877011f1fa2149565d05897ab7ad4b 100644 (file)
--- a/samples/dragimag/DragimagVC.dsp
+++ b/samples/dragimag/DragimagVC.dsp
@@ -25,8 +25,8 @@ CFG=DragimagVC - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
+# PROP Scc_ProjName "DragimagVC"
+# PROP Scc_LocalPath "."
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 17557ddd14eaa0138e843cf446aebcd9318f2ca4..4347a2bc28c656c0bab2f16d815ca1142968330e 100644 (file)
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "regex.h"
+#include <regex.h>
 
 #include "utils.h"
 #include "regex2.h"

diff --git a/src/regex/regerror.c b/src/regex/regerror.c
index 1bb1ec1ce842d5cb19e2657ad737359956586589..1ec073997d5515779a1a746fe2369876975023d7 100644 (file)
--- a/src/regex/regerror.c
+++ b/src/regex/regerror.c
@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "regex.h"
+#include <regex.h>
 
 #include "utils.h"
 #include "regerror.ih"

diff --git a/src/regex/regexec.c b/src/regex/regexec.c
index 7e314950e7501cf7f88904aeb7e0368ec7d47d1e..a1037648e793e59c47ee1c408bcc0273006c9304 100644 (file)
--- a/src/regex/regexec.c
+++ b/src/regex/regexec.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
-#include "regex.h"
+#include <regex.h>
 
 #include "utils.h"
 #include "regex2.h"

diff --git a/src/regex/regfree.c b/src/regex/regfree.c
index 9c1488ab23a319ebe78c5e22eb4412a01fc525e7..9a6acf1733ab0fed70814c2528410b15d804e3ac 100644 (file)
--- a/src/regex/regfree.c
+++ b/src/regex/regfree.c
@@ -1,7 +1,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "regex.h"
+#include <regex.h>
 
 #include "utils.h"
 #include "regex2.h"

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 86a24d799a5fdf62fd959c317c3b39a39704b536..763b35aeed311c3f75003688f25a89094795f569 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -413,6 +413,7 @@ SOURCE=.\common\radiocmn.cpp
 # Begin Source File
 
 SOURCE=.\common\regex.cpp
+# ADD CPP /I "regex"
 # End Source File
 # Begin Source File
 
@@ -1224,26 +1225,25 @@ SOURCE=..\include\wx\msw\setup.h
 # Begin Source File
 
 SOURCE=.\regex\regcomp.c
+# ADD CPP /I "regex"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\regex\regerror.c
+# ADD CPP /I "regex"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\regex\regexec.c
+# ADD CPP /I "regex"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 SOURCE=.\regex\regfree.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex\split.c
+# ADD CPP /I "regex"
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index b45258f9c12e859c1d021365eb0738ebc21cad5b..8a2930ead72cd170a514c9701adbd752bde6dd02 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -423,6 +423,11 @@ SOURCE=.\common\radiocmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\regex.cpp
+# ADD CPP /I "regex"
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\resourc2.cpp
 # End Source File
 # Begin Source File