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

4
openssl-act-engine/configure.in
View File

@@ -70,7 +70,9 @@ case ${host} in
;; ;;
esac 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" (i386-apple-darwin*) LDFLAGS+=" -L../../actlibrary/MacOSX-10.5-x86_64/Release"
;; ;;

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

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

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

@@ -28,7 +28,7 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#if defined win32 || defined linux #if defined WIN32 || defined linux
#define CONST_OR_NOTCONST const #define CONST_OR_NOTCONST const
#else #else
#define CONST_OR_NOTCONST #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 \ CardObject.cpp CardKey.cpp SlotList.cpp \
CertificateList.cpp SecOpGuard.cpp CertificateList.cpp SecOpGuard.cpp
libengine_act_la_LDFLAGS = -version-info @LIB_VERSION@ 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_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 MAINTAINERCLEANFILES = makefile.in

19
qt/patch/qt-sources-for-mingw-cross-compile.diff
View File

@@ -1,6 +1,6 @@
diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-everywhere-opensource-src-4.7.1-mingw/mkspecs/win32-g++/qmake.conf diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf
--- qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf 2010-11-06 02:55:11.000000000 +0100 --- qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf 2011-02-07 10:46:01.395271865 +0100
+++ qt-everywhere-opensource-src-4.7.1-mingw/mkspecs/win32-g++/qmake.conf 2011-02-04 12:30:53.873211904 +0100 +++ qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf 2011-02-07 10:52:55.911594518 +0100
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
MAKEFILE_GENERATOR = MINGW MAKEFILE_GENERATOR = MINGW
TEMPLATE = app TEMPLATE = app
@@ -98,9 +98,9 @@ diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-ever
+QMAKE_STRIP = i586-mingw32msvc-strip +QMAKE_STRIP = i586-mingw32msvc-strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config) load(qt_config)
diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/codecs/codecs.pri diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri
--- qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri 2010-11-06 02:55:18.000000000 +0100 --- qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri 2011-02-07 10:48:52.396759040 +0100
+++ qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/codecs/codecs.pri 2011-02-01 08:42:37.180300856 +0100 +++ qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri 2011-02-07 10:53:54.182322572 +0100
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
codecs/qutfcodec.cpp \ codecs/qutfcodec.cpp \
codecs/qtextcodecplugin.cpp codecs/qtextcodecplugin.cpp
@@ -117,9 +117,10 @@ diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-eve
-} -}
+#} +#}
symbian:LIBS += -lcharconv symbian:LIBS += -lcharconv
diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/tools/qlocale.cpp Nur in qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs: codecs.pri~.
--- qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp 2010-11-06 02:55:19.000000000 +0100 diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.7.1-win32/src/corelib/tools/qlocale.cpp
+++ qt-everywhere-opensource-src-4.7.1-mingw/src/corelib/tools/qlocale.cpp 2011-01-31 15:34:42.765470002 +0100 --- qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp 2011-02-07 10:48:53.546970826 +0100
+++ qt-everywhere-opensource-src-4.7.1-win32/src/corelib/tools/qlocale.cpp 2011-02-07 10:55:03.155020600 +0100
@@ -6624,18 +6624,18 @@ @@ -6624,18 +6624,18 @@
{ {
// Some values of the floating-point control word can cause _qdtoa to crash with an underflow. // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.