web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

next try; refs #22

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-02-07 09:20:36 +00:00
parent daa56586f9
commit 0f92a587e1
5 changed files with 98 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openssl-act-engine/src/CertificateList.cpp
View File

@@ -22,7 +22,7 @@
#include <sstream>
#include <string>
#if defined win32 || defined linux
#if defined WIN32 || defined linux
#define CONST_OR_NOTCONST const
#else
#define CONST_OR_NOTCONST

2
openssl-act-engine/src/engine_sct.cpp
View File

@@ -28,7 +28,7 @@
#include <openssl/ssl.h>
#if defined win32 || defined linux
#if defined WIN32 || defined linux
#define CONST_OR_NOTCONST const
#else
#define CONST_OR_NOTCONST

16
openssl-act-engine/src/makefile.am
View File

@@ -19,9 +19,21 @@ libengine_act_la_SOURCES = engine_front.cpp engine_sct.cpp \
CardObject.cpp CardKey.cpp SlotList.cpp \
CertificateList.cpp SecOpGuard.cpp
libengine_act_la_LDFLAGS = -version-info @LIB_VERSION@
libengine_act_la_LIBADD = -lact -ldl
libengine_act_la_LIBADD = -lact -ldl -lssl
if WIN32
libengine_act_la_LIBADD += -lcrypto -lgdi32
else
endif
test_engine_SOURCES = test_engine.cpp
test_engine_LDADD = -lssl -lcrypto
test_engine_LDADD = .libs/libengine_act.a -lcrypto
if WIN32
test_engine_LDADD += -lssl -lgdi32
endif
if WIN32
libengine_act.dll: $(libengine_act_la_SOURCES:%.cpp=.libs/%.o)
$(CXX) -o $@ $^ --shared $(LDFLAGS) -lact -lcrypto -lgdi32 -lkernel32 -lcrypt32
endif
MAINTAINERCLEANFILES = makefile.in