merging
authorVolker Birk <vb@pep-project.org>
Wed, 27 Apr 2016 08:27:32 +0200
changeset 66b27aa367761c
parent 65 4736900394cb
parent 64 4eb297e99140
child 67 6e53205493ef
merging
     1.1 --- a/pEpCOMServerAdapter.vcxproj	Fri Mar 11 16:07:00 2016 +0100
     1.2 +++ b/pEpCOMServerAdapter.vcxproj	Wed Apr 27 08:27:32 2016 +0200
     1.3 @@ -45,6 +45,17 @@
     1.4      <IgnoreImportLibrary>true</IgnoreImportLibrary>
     1.5      <LinkIncremental>false</LinkIncremental>
     1.6    </PropertyGroup>
     1.7 +  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     1.8 +    <PostBuildEvent>
     1.9 +      <Command>echo "registering server $(TargetPath)"
    1.10 +"$(TargetPath)" /Regserver
    1.11 +
    1.12 +echo "generating interop assembly $(TargetDir)pEpCOMServerAdapter.Interop.dll"
    1.13 +"$(SDK40ToolsPath)x64\TlbImp.exe" "$(TargetPath)" /out:"$(TargetDir)pEpCOMServerAdapter.Interop.dll" /namespace:pEpCOMServerAdapterLib /primary /keyfile:"$(SolutionDir)pEp\pEp_test.snk" /machine:Agnostic
    1.14 +
    1.15 +</Command>
    1.16 +    </PostBuildEvent>
    1.17 +  </ItemDefinitionGroup>
    1.18    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    1.19      <ClCompile>
    1.20        <PrecompiledHeader>Use</PrecompiledHeader>
    1.21 @@ -73,7 +84,7 @@
    1.22      <Link>
    1.23        <SubSystem>Windows</SubSystem>
    1.24        <GenerateDebugInformation>true</GenerateDebugInformation>
    1.25 -      <RegisterOutput>true</RegisterOutput>
    1.26 +      <RegisterOutput>false</RegisterOutput>
    1.27        <AdditionalDependencies>comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.28        <PerUserRedirection>true</PerUserRedirection>
    1.29      </Link>
    1.30 @@ -157,6 +168,7 @@
    1.31      <Text Include="ReadMe.txt" />
    1.32    </ItemGroup>
    1.33    <ItemGroup>
    1.34 +    <None Include="..\..\pep_for_outlook\pep\pep_test.snk" />
    1.35      <None Include="pEpCOMServerAdapter.rgs" />
    1.36      <None Include="pEpEngine.rgs" />
    1.37    </ItemGroup>
     2.1 --- a/pEpCOMServerAdapter.vcxproj.filters	Fri Mar 11 16:07:00 2016 +0100
     2.2 +++ b/pEpCOMServerAdapter.vcxproj.filters	Wed Apr 27 08:27:32 2016 +0200
     2.3 @@ -88,6 +88,7 @@
     2.4      <None Include="pEpEngine.rgs">
     2.5        <Filter>Resource Files</Filter>
     2.6      </None>
     2.7 +    <None Include="..\..\pep_for_outlook\pep\pep_test.snk" />
     2.8    </ItemGroup>
     2.9    <ItemGroup>
    2.10      <Midl Include="pEpCOMServerAdapter.idl">