Index: trunk/KDE/kdelibs/kio/kssl/SConscript =================================================================== --- trunk/KDE/kdelibs/kio/kssl/SConscript (revision 472382) +++ trunk/KDE/kdelibs/kio/kssl/SConscript (revision 472383) @@ -1,117 +1,123 @@ #! /usr/bin/env python Import('env') sources = """ kssl.cc ksslcertificatehome.cc ksslsettings.cc ksslcertificate.cc ksslconnectioninfo.cc ksslcertificatefactory.cc ksslcertificatecache.cc ksslpeerinfo.cc ksslinfodlg.cc ksslcertdlg.cc ksslutils.cc kopenssl.cc ksslpkcs12.cc ksslcertchain.cc ksslkeygen.cc ksslx509v3.cc ksslsigners.cc ksslpkcs7.cc ksslpemcallback.cc ksslx509map.cc ksslsession.cc keygenwizard.ui3 keygenwizard2.ui3 ksmimecrypto.cc ksslcsessioncache.cc """ obj = env.kdeobj('convenience',env) obj.target = 'libkssl' obj.source = sources obj.uselib = 'QTCORE QTGUI QT QT3SUPPORT KDE4' obj.includes = '../../kdecore/network ../../kwallet/client' +if env['WINDOWS']: + # TODO: (rh) remove when openssl detection under win32 runs + obj.includes += ' c:/openssl/include' + if env['CC'] == 'gcc': + obj.libpaths += ' c:/openssl/lib/mingw' + obj.libs += ' eay32' obj.execute() #TODO other stuffs env.bksys_insttype('KDECONF', '', 'kssl/ksslcalist') env.bksys_insttype('KDEAPPS', 'kssl', 'kssl/caroot/ca-bundle.crt') """ # don't change the order of this one. it breaks when openssl is in /usr/include # and the distro's KDE is there too, but the current "devel" KDE prefix is # somewhere else. Another option for the future (needs testing) would be to # change SSL_INCLUDES to .../include/openssl and make the source use #include # instead of #include INCLUDES=-I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES) noinst_LTLIBRARIES = libkssl.la KSSLVERSION= 3.0.0 KSSLPATCH= 0 METASOURCES= AUTO include_HEADERS = \ kssl.h \ ksslcertificatehome.h \ ksslsettings.h \ ksslcertificate.h \ ksslconnectioninfo.h \ ksslcertificatefactory.h \ ksslcertificatecache.h \ ksslpeerinfo.h \ ksslinfodlg.h \ ksslcertdlg.h \ ksslutils.h \ kopenssl.h \ ksslall.h \ ksslpkcs12.h \ ksslcertchain.h \ ksslkeygen.h \ ksslx509v3.h \ ksslsigners.h \ ksslpkcs7.h \ ksslpemcallback.h \ ksslconfig.h \ ksslsession.h \ ksslx509map.h \ ksmimecrypto.h noinst_HEADERS = ksslcsessioncache.h libkssl_la_SOURCES = \ kssl.cc \ ksslcertificatehome.cc \ ksslsettings.cc \ ksslcertificate.cc \ ksslconnectioninfo.cc \ ksslcertificatefactory.cc \ ksslcertificatecache.cc \ ksslpeerinfo.cc \ ksslinfodlg.cc \ ksslcertdlg.cc \ ksslutils.cc \ kopenssl.cc \ ksslpkcs12.cc \ ksslcertchain.cc \ ksslkeygen.cc \ ksslx509v3.cc \ ksslsigners.cc \ ksslpkcs7.cc \ ksslpemcallback.cc \ ksslx509map.cc \ ksslsession.cc \ keygenwizard.ui3 \ keygenwizard2.ui3 \ ksmimecrypto.cc \ ksslcsessioncache.cc SUBDIRS = kssl include $(top_srcdir)/admin/Doxyfile.am """