Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:godai0519/BoostConnect

  • Loading branch information...
commit 691c99ed0ebe95a96577bca6725e75ba3cfe427e 2 parents f16d6f9 + a128255
unknown authored
View
8 include/boostconnect/boostconnect.vcxproj
@@ -71,16 +71,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>C:\openssl\build\debug\include;C:\boost\include\boost-1_52;..\..\include;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)..\..\include;C:\boost\include\boost-1_52;C:\openssl\build\debug\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LibraryPath>C:\openssl\build\debug\lib;C:\boost\lib;$(LibraryPath)</LibraryPath>
+ <LibraryPath>C:\boost\lib;C:\openssl\build\debug\lib;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)lib\</OutDir>
<TargetName>lib$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>C:\openssl\build\debug\include;C:\boost\include\boost-1_52;..\..\include;$(IncludePath)</IncludePath>
- <LibraryPath>C:\openssl\build\debug\lib;C:\boost\lib;$(LibraryPath)</LibraryPath>
+ <IncludePath>$(ProjectDir)..\..\include;C:\boost\include\boost-1_52;C:\openssl\build\release\include;$(IncludePath)</IncludePath>
+ <LibraryPath>C:\boost\lib;C:\openssl\build\release\lib;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)lib\</OutDir>
<TargetName>lib$(ProjectName)</TargetName>
</PropertyGroup>
View
4 include/boostconnect/config.hpp
@@ -1,5 +1,5 @@
-#define SSL_ENABLE 1
+#define BOOSTCONNECT_ENABLE_SSL 1
-#if SSL_ENABLE
+#if BOOSTCONNECT_ENABLE_SSL
#define USE_SSL_BOOSTCONNECT
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.