diff options
author | George Hazan <george.hazan@gmail.com> | 2015-03-21 11:24:30 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-03-21 11:24:30 +0000 |
commit | 3549d8275503943dcfaf30634a6ddf9b3e966bf1 (patch) | |
tree | 82d7f9943c1ee1f6d81a5fa17b972d9e85966bfd /plugins/MirOTR/Libgcrypt | |
parent | 582059e57583e0f2b4055b9d22f961dbff5cc221 (diff) |
avoiding module duplicate during linking
git-svn-id: http://svn.miranda-ng.org/main/trunk@12461 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/Libgcrypt')
-rw-r--r-- | plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj | 4 | ||||
-rw-r--r-- | plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters | 19 | ||||
-rw-r--r-- | plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj | 4 | ||||
-rw-r--r-- | plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters | 19 |
4 files changed, 16 insertions, 30 deletions
diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj index 8b53b68889..c192cfe7ac 100644 --- a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj +++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj @@ -126,6 +126,7 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\Libgpg-error\err-visibility.c" />
<ClCompile Include="cipher\arcfour.c" />
<ClCompile Include="cipher\blowfish.c" />
<ClCompile Include="cipher\camellia-glue.c" />
@@ -241,12 +242,12 @@ <ClCompile Include="..\Libgpg-error\strsource-sym.c" />
<ClCompile Include="..\Libgpg-error\strsource.c" />
<ClCompile Include="..\Libgpg-error\version.c" />
- <ClCompile Include="..\Libgpg-error\visibility.c" />
<ClCompile Include="..\Libgpg-error\w32-gettext.c" />
<ClCompile Include="..\Libgpg-error\w32-lock.c" />
<ClCompile Include="..\Libgpg-error\w32-thread.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\Libgpg-error\err-visibility.h" />
<ClInclude Include="cipher\bithelp.h" />
<ClInclude Include="cipher\camellia.h" />
<ClInclude Include="cipher\cipher-internal.h" />
@@ -297,7 +298,6 @@ <ClInclude Include="..\Libgpg-error\init.h" />
<ClInclude Include="..\Libgpg-error\mkerrcodes.h" />
<ClInclude Include="..\Libgpg-error\thread.h" />
- <ClInclude Include="..\Libgpg-error\visibility.h" />
</ItemGroup>
<ItemGroup>
<None Include="src\libgcrypt.def" />
diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters index 60739541cb..fb66464cf4 100644 --- a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters +++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj.filters @@ -198,9 +198,6 @@ <ClCompile Include="cipher\whirlpool.c">
<Filter>cipher</Filter>
</ClCompile>
- <ClCompile Include="compat\compat.c">
- <Filter>compat</Filter>
- </ClCompile>
<ClCompile Include="mpi\ec-ed25519.c">
<Filter>mpi</Filter>
</ClCompile>
@@ -306,9 +303,6 @@ <ClCompile Include="src\missing-string.c">
<Filter>src</Filter>
</ClCompile>
- <ClCompile Include="src\module.c">
- <Filter>src</Filter>
- </ClCompile>
<ClCompile Include="src\secmem.c">
<Filter>src</Filter>
</ClCompile>
@@ -372,9 +366,6 @@ <ClCompile Include="..\Libgpg-error\version.c">
<Filter>error</Filter>
</ClCompile>
- <ClCompile Include="..\Libgpg-error\visibility.c">
- <Filter>error</Filter>
- </ClCompile>
<ClCompile Include="..\Libgpg-error\w32-gettext.c">
<Filter>error</Filter>
</ClCompile>
@@ -384,6 +375,10 @@ <ClCompile Include="..\Libgpg-error\w32-thread.c">
<Filter>error</Filter>
</ClCompile>
+ <ClCompile Include="compat\compat.c" />
+ <ClCompile Include="..\Libgpg-error\err-visibility.c">
+ <Filter>error</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="cipher\bithelp.h">
@@ -422,9 +417,6 @@ <ClInclude Include="cipher\rmd.h">
<Filter>cipher</Filter>
</ClInclude>
- <ClInclude Include="compat\libcompat.h">
- <Filter>compat</Filter>
- </ClInclude>
<ClInclude Include="mpi\ec-internal.h">
<Filter>mpi</Filter>
</ClInclude>
@@ -536,7 +528,8 @@ <ClInclude Include="..\Libgpg-error\thread.h">
<Filter>error</Filter>
</ClInclude>
- <ClInclude Include="..\Libgpg-error\visibility.h">
+ <ClInclude Include="compat\libcompat.h" />
+ <ClInclude Include="..\Libgpg-error\err-visibility.h">
<Filter>error</Filter>
</ClInclude>
</ItemGroup>
diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj index 94a453af74..dcb6926569 100644 --- a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj +++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj @@ -114,6 +114,7 @@ </ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\Libgpg-error\err-visibility.c" />
<ClCompile Include="cipher\arcfour.c" />
<ClCompile Include="cipher\blowfish.c" />
<ClCompile Include="cipher\camellia-glue.c" />
@@ -229,12 +230,12 @@ <ClCompile Include="..\Libgpg-error\strsource-sym.c" />
<ClCompile Include="..\Libgpg-error\strsource.c" />
<ClCompile Include="..\Libgpg-error\version.c" />
- <ClCompile Include="..\Libgpg-error\visibility.c" />
<ClCompile Include="..\Libgpg-error\w32-gettext.c" />
<ClCompile Include="..\Libgpg-error\w32-lock.c" />
<ClCompile Include="..\Libgpg-error\w32-thread.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\Libgpg-error\err-visibility.h" />
<ClInclude Include="cipher\bithelp.h" />
<ClInclude Include="cipher\camellia.h" />
<ClInclude Include="cipher\cipher-internal.h" />
@@ -285,7 +286,6 @@ <ClInclude Include="..\Libgpg-error\init.h" />
<ClInclude Include="..\Libgpg-error\mkerrcodes.h" />
<ClInclude Include="..\Libgpg-error\thread.h" />
- <ClInclude Include="..\Libgpg-error\visibility.h" />
</ItemGroup>
<ItemGroup>
<None Include="src\libgcrypt.def" />
diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters index 60739541cb..fb66464cf4 100644 --- a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters +++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj.filters @@ -198,9 +198,6 @@ <ClCompile Include="cipher\whirlpool.c">
<Filter>cipher</Filter>
</ClCompile>
- <ClCompile Include="compat\compat.c">
- <Filter>compat</Filter>
- </ClCompile>
<ClCompile Include="mpi\ec-ed25519.c">
<Filter>mpi</Filter>
</ClCompile>
@@ -306,9 +303,6 @@ <ClCompile Include="src\missing-string.c">
<Filter>src</Filter>
</ClCompile>
- <ClCompile Include="src\module.c">
- <Filter>src</Filter>
- </ClCompile>
<ClCompile Include="src\secmem.c">
<Filter>src</Filter>
</ClCompile>
@@ -372,9 +366,6 @@ <ClCompile Include="..\Libgpg-error\version.c">
<Filter>error</Filter>
</ClCompile>
- <ClCompile Include="..\Libgpg-error\visibility.c">
- <Filter>error</Filter>
- </ClCompile>
<ClCompile Include="..\Libgpg-error\w32-gettext.c">
<Filter>error</Filter>
</ClCompile>
@@ -384,6 +375,10 @@ <ClCompile Include="..\Libgpg-error\w32-thread.c">
<Filter>error</Filter>
</ClCompile>
+ <ClCompile Include="compat\compat.c" />
+ <ClCompile Include="..\Libgpg-error\err-visibility.c">
+ <Filter>error</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="cipher\bithelp.h">
@@ -422,9 +417,6 @@ <ClInclude Include="cipher\rmd.h">
<Filter>cipher</Filter>
</ClInclude>
- <ClInclude Include="compat\libcompat.h">
- <Filter>compat</Filter>
- </ClInclude>
<ClInclude Include="mpi\ec-internal.h">
<Filter>mpi</Filter>
</ClInclude>
@@ -536,7 +528,8 @@ <ClInclude Include="..\Libgpg-error\thread.h">
<Filter>error</Filter>
</ClInclude>
- <ClInclude Include="..\Libgpg-error\visibility.h">
+ <ClInclude Include="compat\libcompat.h" />
+ <ClInclude Include="..\Libgpg-error\err-visibility.h">
<Filter>error</Filter>
</ClInclude>
</ItemGroup>
|