From 1b434b9fff746c2a56d4186fe787fadf7571c603 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Thu, 31 Jul 2014 00:39:59 -0700
Subject: Changing the regex library for one that isn't GPL.

---
 win32/project/Balau.vcxproj         | 21 ++++++++++++++++-----
 win32/project/Balau.vcxproj.filters | 24 +++++++++++++++++++++---
 2 files changed, 37 insertions(+), 8 deletions(-)

(limited to 'win32/project')

diff --git a/win32/project/Balau.vcxproj b/win32/project/Balau.vcxproj
index 61c24b7..0959a39 100644
--- a/win32/project/Balau.vcxproj
+++ b/win32/project/Balau.vcxproj
@@ -244,12 +244,22 @@
     <ClCompile Include="..\..\src\TaskMan.cc" />
     <ClCompile Include="..\..\src\Threads.cc" />
     <ClCompile Include="..\..\src\ZHandle.cc" />
-    <ClCompile Include="..\regex\msvc-regex.c">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4290;4800;4018;4090;4047;4101</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4290;4800;4018;4090;4047;4101</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4290;4800;4018;4090;4047;4101</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4290;4800;4018;4090;4047;4101</DisableSpecificWarnings>
+    <ClCompile Include="..\regex\engine.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\regex\regcomp.c">
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4290;4800;4703</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4290;4800;4703</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4290;4800;4703</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4290;4800;4703</DisableSpecificWarnings>
     </ClCompile>
+    <ClCompile Include="..\regex\regerror.c" />
+    <ClCompile Include="..\regex\regexec.c" />
+    <ClCompile Include="..\regex\regfree.c" />
+    <ClCompile Include="..\regex\split.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\Async.h" />
@@ -306,6 +316,7 @@
     <ClInclude Include="..\..\src\jsoncpp\include\json\writer.h" />
     <ClInclude Include="..\..\src\jsoncpp\src\json_batchallocator.h" />
     <ClInclude Include="..\regex\regex.h" />
+    <ClInclude Include="..\regex\regex2.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\jsoncpp\src\json_internalarray.inl">
diff --git a/win32/project/Balau.vcxproj.filters b/win32/project/Balau.vcxproj.filters
index cbaa322..02b4e84 100644
--- a/win32/project/Balau.vcxproj.filters
+++ b/win32/project/Balau.vcxproj.filters
@@ -141,9 +141,6 @@
     <ClCompile Include="..\..\libev\ev_win32.c">
       <Filter>Third Party\libev</Filter>
     </ClCompile>
-    <ClCompile Include="..\regex\msvc-regex.c">
-      <Filter>Third Party\regex</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\jsoncpp\src\json_reader.cpp">
       <Filter>Third Party\jsoncpp</Filter>
     </ClCompile>
@@ -174,6 +171,24 @@
     <ClCompile Include="..\..\src\CurlTask.cc">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\regex\engine.c">
+      <Filter>Third Party\regex</Filter>
+    </ClCompile>
+    <ClCompile Include="..\regex\regcomp.c">
+      <Filter>Third Party\regex</Filter>
+    </ClCompile>
+    <ClCompile Include="..\regex\regerror.c">
+      <Filter>Third Party\regex</Filter>
+    </ClCompile>
+    <ClCompile Include="..\regex\regexec.c">
+      <Filter>Third Party\regex</Filter>
+    </ClCompile>
+    <ClCompile Include="..\regex\regfree.c">
+      <Filter>Third Party\regex</Filter>
+    </ClCompile>
+    <ClCompile Include="..\regex\split.c">
+      <Filter>Third Party\regex</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\Async.h">
@@ -338,6 +353,9 @@
     <ClInclude Include="..\..\includes\BCypher.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\regex\regex2.h">
+      <Filter>Third Party\regex</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\jsoncpp\src\json_internalarray.inl">
-- 
cgit v1.2.3