Update again to Gpg4Win 3.0 test_diphoton
authorThomas
Fri, 27 Oct 2017 16:05:34 +0200
branchtest_diphoton
changeset 2217f648ba7ae89d
parent 2208 b19261f4fed4
child 2221 07ce59b5c058
Update again to Gpg4Win 3.0
build-windows/pEpEngine.vcxproj
src/platform_windows.cpp
     1.1 --- a/build-windows/pEpEngine.vcxproj	Thu Oct 26 15:56:01 2017 +0200
     1.2 +++ b/build-windows/pEpEngine.vcxproj	Fri Oct 27 16:05:34 2017 +0200
     1.3 @@ -43,12 +43,12 @@
     1.4    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     1.5      <LinkIncremental>true</LinkIncremental>
     1.6      <RunCodeAnalysis>false</RunCodeAnalysis>
     1.7 -	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
     1.8 +	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
     1.9      <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Debug;$(LibraryPath)</LibraryPath>
    1.10    </PropertyGroup>
    1.11    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    1.12      <LinkIncremental>false</LinkIncremental>
    1.13 -	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
    1.14 +	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
    1.15      <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Release;$(LibraryPath)</LibraryPath>
    1.16    </PropertyGroup>
    1.17    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     2.1 --- a/src/platform_windows.cpp	Thu Oct 26 15:56:01 2017 +0200
     2.2 +++ b/src/platform_windows.cpp	Fri Oct 27 16:05:34 2017 +0200
     2.3 @@ -141,12 +141,12 @@
     2.4  
     2.5  	// Look up GnuPG installation in current user scope
     2.6  	bool result = readRegistryString(HKEY_CURRENT_USER,
     2.7 -		TEXT("SOFTWARE\\GNU\\GnuPG"), TEXT("Install Directory"), path,
     2.8 +		TEXT("SOFTWARE\\GnuPG"), TEXT("Install Directory"), path,
     2.9  		PATH_BUF_SIZE, NULL);
    2.10  	// If not found in current user, look up in local machine
    2.11  	if (!result)
    2.12  		result = readRegistryString(HKEY_LOCAL_MACHINE,
    2.13 -			TEXT("SOFTWARE\\GNU\\GnuPG"), TEXT("Install Directory"), path,
    2.14 +			TEXT("SOFTWARE\\GnuPG"), TEXT("Install Directory"), path,
    2.15  			PATH_BUF_SIZE, NULL);
    2.16  	assert(result);
    2.17  	if (!result)