diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2011-05-28 13:00:33 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2011-05-28 13:00:33 -0700 |
| commit | 5fecb27c1ec6b583fa07028cd26c21dd191c125f (patch) | |
| tree | 663ec473091e89da86bc9c104e099e080c7a9d67 /src | |
| parent | 12a1256c1d33bb4580cd8ab7284d117ca42ec97c (diff) | |
| parent | 0649b6af90bbe8f3e12f0fae6516ca12125d1dc9 (diff) | |
Merge pull request #278 from TheBlueMatt/win32sslv0.3.22rc6
Update to openssl-1.0.0d and enable RPC-SSL on Win32
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.mingw | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/makefile.mingw b/src/makefile.mingw index 57ece3ba29..c3a964e8fc 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -7,14 +7,14 @@ USE_UPNP:=0 INCLUDEPATHS= \ -I"C:\boost-1.43.0-mgw" \ -I"C:\db-4.7.25.NC-mgw\build_unix" \ - -I"C:\openssl-1.0.0c-mgw\include" \ + -I"C:\openssl-1.0.0d-mgw\include" \ -I"C:\wxWidgets-2.9.1-mgw\lib\gcc_lib\mswud" \ -I"C:\wxWidgets-2.9.1-mgw\include" LIBPATHS= \ -L"C:\boost-1.43.0-mgw\stage\lib" \ -L"C:\db-4.7.25.NC-mgw\build_unix" \ - -L"C:\openssl-1.0.0c-mgw" \ + -L"C:\openssl-1.0.0d-mgw" \ -L"C:\wxWidgets-2.9.1-mgw\lib\gcc_lib" WXLIBS= \ @@ -26,9 +26,10 @@ LIBS= \ -l boost_program_options-mgw45-mt-s-1_43 \ -l boost_thread-mgw45-mt-s-1_43 \ -l db_cxx \ - -l eay32 + -l ssl \ + -l crypto -DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH +DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL DEBUGFLAGS=-g -D__WXDEBUG__ CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ |