diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-07-31 18:18:18 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-07-31 18:18:18 +0200 |
| commit | 680a012532e2d962a55c1a588900c3b52c0d6b69 (patch) | |
| tree | 613b0399000e5c72290efa2497cf008fbccb12df /win32/project/Balau.vcxproj | |
| parent | 3c97ca53d8279f0f16ca2f82a703bafa517e39f3 (diff) | |
| parent | ee0ffcb7bcb46d3d129bd262781d54afa736ffbb (diff) | |
Merge branch 'master' of /pub/repo.git/Balau
Diffstat (limited to 'win32/project/Balau.vcxproj')
| -rw-r--r-- | win32/project/Balau.vcxproj | 37 |
1 files changed, 19 insertions, 18 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">
|