summaryrefslogtreecommitdiff
path: root/win32/project
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2014-06-20 21:31:41 -0700
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2014-06-20 21:31:41 -0700
commitdf9b8f8ae7a540988c20fdffaaff2442c349873a (patch)
treeff9be69934b6896c8d7e91412b63dd9cd9b37341 /win32/project
parentfcc66ce9f5d6db995536beab5539fd47e490bf14 (diff)
Moving tokenize, percentEncode and percentDecode around. Fixing a few warnings. Workarounding c-ares and pthreads compilation issue with unicode.
Diffstat (limited to 'win32/project')
-rw-r--r--win32/project/Balau.vcxproj7
-rw-r--r--win32/project/c-ares.vcxproj2
-rw-r--r--win32/project/pthreads.vcxproj2
3 files changed, 8 insertions, 3 deletions
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>