summaryrefslogtreecommitdiff
path: root/win32/project
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2014-07-31 18:18:18 +0200
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2014-07-31 18:18:18 +0200
commit680a012532e2d962a55c1a588900c3b52c0d6b69 (patch)
tree613b0399000e5c72290efa2497cf008fbccb12df /win32/project
parent3c97ca53d8279f0f16ca2f82a703bafa517e39f3 (diff)
parentee0ffcb7bcb46d3d129bd262781d54afa736ffbb (diff)
Merge branch 'master' of /pub/repo.git/Balau
Diffstat (limited to 'win32/project')
-rw-r--r--win32/project/Balau.vcxproj37
-rw-r--r--win32/project/Balau.vcxproj.filters33
-rw-r--r--win32/project/libcurl.vcxproj13
3 files changed, 51 insertions, 32 deletions
diff --git a/win32/project/Balau.vcxproj b/win32/project/Balau.vcxproj
index 2f220fc..921b1d0 100644
--- a/win32/project/Balau.vcxproj
+++ b/win32/project/Balau.vcxproj
@@ -65,19 +65,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
- <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
- <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
- <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PropertyGroup>
<OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
@@ -256,12 +244,23 @@
<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="..\getopt\getopt.c" />
+ <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" />
@@ -317,7 +316,9 @@
<ClInclude Include="..\..\src\jsoncpp\include\json\value.h" />
<ClInclude Include="..\..\src\jsoncpp\include\json\writer.h" />
<ClInclude Include="..\..\src\jsoncpp\src\json_batchallocator.h" />
+ <ClInclude Include="..\getopt\getopt.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..cd115d4 100644
--- a/win32/project/Balau.vcxproj.filters
+++ b/win32/project/Balau.vcxproj.filters
@@ -22,6 +22,9 @@
<Filter Include="Third Party\lcrypt">
<UniqueIdentifier>{b7c1083c-5e02-4f73-b973-73dfb07f1a9f}</UniqueIdentifier>
</Filter>
+ <Filter Include="Third Party\getopt">
+ <UniqueIdentifier>{d9a98750-dc39-4eb1-9e0d-49bb1a95b104}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\Async.cc">
@@ -141,9 +144,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 +174,27 @@
<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>
+ <ClCompile Include="..\getopt\getopt.c">
+ <Filter>Third Party\getopt</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\includes\Async.h">
@@ -338,6 +359,12 @@
<ClInclude Include="..\..\includes\BCypher.h">
<Filter>Headers</Filter>
</ClInclude>
+ <ClInclude Include="..\regex\regex2.h">
+ <Filter>Third Party\regex</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt\getopt.h">
+ <Filter>Third Party\getopt</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\jsoncpp\src\json_internalarray.inl">
diff --git a/win32/project/libcurl.vcxproj b/win32/project/libcurl.vcxproj
index f1bae89..4a55a5a 100644
--- a/win32/project/libcurl.vcxproj
+++ b/win32/project/libcurl.vcxproj
@@ -64,17 +64,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\build\Win32\VC12\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)lib\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\build\Win64\VC12\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)lib\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\build\Win32\VC12\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)lib\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\build\Win64\VC12\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)lib\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)d</TargetName>
+ <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>