From df9b8f8ae7a540988c20fdffaaff2442c349873a Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Fri, 20 Jun 2014 21:31:41 -0700
Subject: Moving tokenize, percentEncode and percentDecode around. Fixing a few
 warnings. Workarounding c-ares  and pthreads compilation issue with unicode.

---
 win32/project/Balau.vcxproj    | 7 ++++++-
 win32/project/c-ares.vcxproj   | 2 +-
 win32/project/pthreads.vcxproj | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'win32/project')

diff --git a/win32/project/Balau.vcxproj b/win32/project/Balau.vcxproj
index e08f09f..07d6277 100644
--- a/win32/project/Balau.vcxproj
+++ b/win32/project/Balau.vcxproj
@@ -256,7 +256,12 @@
     <ClCompile Include="..\..\src\TaskMan.cc" />
     <ClCompile Include="..\..\src\Threads.cc" />
     <ClCompile Include="..\..\src\ZHandle.cc" />
-    <ClCompile Include="..\regex\msvc-regex.c" />
+    <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>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\Async.h" />
diff --git a/win32/project/c-ares.vcxproj b/win32/project/c-ares.vcxproj
index 342516e..2276ca5 100644
--- a/win32/project/c-ares.vcxproj
+++ b/win32/project/c-ares.vcxproj
@@ -27,7 +27,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
diff --git a/win32/project/pthreads.vcxproj b/win32/project/pthreads.vcxproj
index 7ea7c3d..7820ce8 100644
--- a/win32/project/pthreads.vcxproj
+++ b/win32/project/pthreads.vcxproj
@@ -27,7 +27,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-- 
cgit v1.2.3