next try; refs #22

openssl-act-engine/configure.in

@@ -70,7 +70,9 @@ case ${host} in
     ;;
   esac
   ;;
-  (*mingw*) LDFLAGS+=" -L../../actlibrary/mingw32-i586/Release"
+  (*mingw*) 
+    LDFLAGS+=" -L../../actlibrary/mingw32-i586/Release"
+    AM_CONDITIONAL(WIN32, true)
   ;;
   (i386-apple-darwin*) LDFLAGS+=" -L../../actlibrary/MacOSX-10.5-x86_64/Release"
   ;;

openssl-act-engine/src/CertificateList.cpp

@@ -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

openssl-act-engine/src/engine_sct.cpp

@@ -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

openssl-act-engine/src/makefile.am

@@ -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