diff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-08-16 17:15:36 (GMT) | 
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-08-16 17:15:36 (GMT) | 
| commit | 9b594b480fea33624fcf636adfa455aba5efb97f (patch) | |
| tree | d34bb0ed34d0bd19ce07b1187bfcf22fc3c0a399 | |
| parent | 00a26ca1c2d3f753599d5608b18726996beeb4b1 (diff) | |
| download | swift-9b594b480fea33624fcf636adfa455aba5efb97f.zip swift-9b594b480fea33624fcf636adfa455aba5efb97f.tar.bz2 | |
More build system tweaks.
| -rw-r--r-- | 3rdParty/Boost/SConscript | 3 | ||||
| -rw-r--r-- | 3rdParty/OpenSSL/SConscript | 626 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 54 | ||||
| -rw-r--r-- | SwifTools/Idle/PlatformIdleQuerier.cpp | 9 | ||||
| -rw-r--r-- | SwifTools/SConscript | 5 | 
5 files changed, 667 insertions, 30 deletions
| diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index 9181425..0c01051 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -105,7 +105,8 @@ elif env.get("BOOST_BUNDLED", False) :  					"src/libs/thread/src/win32/tss_dll.cpp",  					"src/libs/thread/src/win32/tss_pe.cpp"] -		myenv.StaticLibrary("Boost", sources, CPPFLAGS = cppflags, CPPDEFINES = cppdefines) +		myenv.MergeFlags(myenv["BOOST_FLAGS"]) +		myenv.StaticLibrary("Boost", sources)  		if ARGUMENTS.get("BOOST_BUILD_BCP") or env.GetOption("clean") :  			bcp_env = myenv.Clone() diff --git a/3rdParty/OpenSSL/SConscript b/3rdParty/OpenSSL/SConscript new file mode 100644 index 0000000..c19632c --- /dev/null +++ b/3rdParty/OpenSSL/SConscript @@ -0,0 +1,626 @@ +Import("env") + +openssl_bundle_dir = "#/../openssl" + +if env.get("OPENSSL_BUNDLED", False) : +	if env["SCONS_STAGE"] == "flags" : +		env["OPENSSL_FLAGS"] = { +				"CPPPATH": [Dir(openssl_bundle_dir + "/include")], +				"LIBPATH": [Dir(".")], +				"LIBS": ["ssl", "crypto"] +			} + +	if env["SCONS_STAGE"] == "build" : +		openssl_env = env.Clone() +		openssl_env["OPENSSL_BUNDLE_DIR"] = openssl_bundle_dir +		openssl_env.Append(CPPPATH = [ +				"$OPENSSL_BUNDLE_DIR",  +				"$OPENSSL_BUNDLE_DIR/crypto",  +				"$OPENSSL_BUNDLE_DIR/crypto/asn1",  +				"$OPENSSL_BUNDLE_DIR/crypto/evp",  +				"$OPENSSL_BUNDLE_DIR/include" +			]) +		openssl_env.Append(CPPDEFINES = ["OPENSSL_THREADS", "_REENTRANT", "DSO_DLFCN", "HAVE_DLFCN_H", "L_ENDIAN"]) + +		openssl_env.StaticLibrary("crypto", [ +				"$OPENSSL_BUNDLE_DIR/crypto/cryptlib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/mem.c", +				"$OPENSSL_BUNDLE_DIR/crypto/mem_dbg.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cversion.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ex_data.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cpt_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ebcdic.c", +				"$OPENSSL_BUNDLE_DIR/crypto/uid.c", +				"$OPENSSL_BUNDLE_DIR/crypto/o_time.c", +				"$OPENSSL_BUNDLE_DIR/crypto/o_str.c", +				"$OPENSSL_BUNDLE_DIR/crypto/o_dir.c", +				"$OPENSSL_BUNDLE_DIR/crypto/mem_clr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/objects/o_names.c", +				"$OPENSSL_BUNDLE_DIR/crypto/objects/obj_dat.c", +				"$OPENSSL_BUNDLE_DIR/crypto/objects/obj_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/objects/obj_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/objects/obj_xref.c", +				"$OPENSSL_BUNDLE_DIR/crypto/md4/md4_dgst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/md4/md4_one.c", +				"$OPENSSL_BUNDLE_DIR/crypto/md5/md5_dgst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/md5/md5_one.c", +				"$OPENSSL_BUNDLE_DIR/crypto/sha/sha_dgst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/sha/sha1dgst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/sha/sha_one.c", +				"$OPENSSL_BUNDLE_DIR/crypto/sha/sha1_one.c", +				"$OPENSSL_BUNDLE_DIR/crypto/sha/sha256.c", +				"$OPENSSL_BUNDLE_DIR/crypto/sha/sha512.c", +				"$OPENSSL_BUNDLE_DIR/crypto/mdc2/mdc2dgst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/mdc2/mdc2_one.c", +				"$OPENSSL_BUNDLE_DIR/crypto/hmac/hmac.c", +				"$OPENSSL_BUNDLE_DIR/crypto/hmac/hm_ameth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/hmac/hm_pmeth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ripemd/rmd_dgst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ripemd/rmd_one.c", +				"$OPENSSL_BUNDLE_DIR/crypto/whrlpool/wp_dgst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/whrlpool/wp_block.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/set_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/ecb_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/cbc_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/ecb3_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/cfb64enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/cfb64ede.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/cfb_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/ofb64ede.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/enc_read.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/enc_writ.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/ofb64enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/ofb_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/str2key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/pcbc_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/qud_cksm.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/rand_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/des_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/fcrypt_b.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/fcrypt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/xcbc_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/rpc_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/cbc_cksm.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/ede_cbcm_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/des_old.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/des_old2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/des/read2pwd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_misc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_ecb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_cfb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_ofb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_ctr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_ige.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_wrap.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_core.c", +				"$OPENSSL_BUNDLE_DIR/crypto/aes/aes_cbc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rc2/rc2_ecb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rc2/rc2_skey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rc2/rc2_cbc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rc2/rc2cfb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rc2/rc2ofb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rc4/rc4_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rc4/rc4_skey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/idea/i_cbc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/idea/i_cfb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/idea/i_ofb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/idea/i_ecb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/idea/i_skey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bf/bf_skey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bf/bf_ecb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bf/bf_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bf/bf_cfb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bf/bf_ofb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cast/c_skey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cast/c_ecb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cast/c_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cast/c_cfb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cast/c_ofb64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/camellia/cmll_ecb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/camellia/cmll_ofb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/camellia/cmll_cfb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/camellia/cmll_ctr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/camellia/camellia.c", +				"$OPENSSL_BUNDLE_DIR/crypto/camellia/cmll_misc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/camellia/cmll_cbc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/seed/seed.c", +				"$OPENSSL_BUNDLE_DIR/crypto/seed/seed_ecb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/seed/seed_cbc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/seed/seed_cfb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/seed/seed_ofb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/modes/cbc128.c", +				"$OPENSSL_BUNDLE_DIR/crypto/modes/ctr128.c", +				"$OPENSSL_BUNDLE_DIR/crypto/modes/cts128.c", +				"$OPENSSL_BUNDLE_DIR/crypto/modes/cfb128.c", +				"$OPENSSL_BUNDLE_DIR/crypto/modes/ofb128.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_add.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_div.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_exp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_ctx.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_mul.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_mod.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_print.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_rand.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_shift.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_word.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_blind.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_kron.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_sqrt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_gcd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_prime.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_sqr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_asm.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_recp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_mont.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_mpi.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_exp2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_gf2m.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_nist.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_depr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bn/bn_const.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ecp_smpl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ecp_mont.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ecp_nist.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_cvt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_mult.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_curve.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_check.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_print.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec2_smpl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec2_mult.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_ameth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/ec_pmeth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ec/eck_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_eay.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_gen.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_sign.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_saos.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_pk1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_ssl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_none.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_oaep.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_chk.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_null.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_pss.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_x931.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_depr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_ameth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rsa/rsa_pmeth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_gen.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_vrf.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_sign.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_ossl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_depr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_ameth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_pmeth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dsa/dsa_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdsa/ecs_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdsa/ecs_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdsa/ecs_ossl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdsa/ecs_sign.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdsa/ecs_vrf.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdsa/ecs_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_gen.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_check.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_depr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_ameth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_pmeth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dh/dh_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdh/ech_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdh/ech_ossl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdh/ech_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ecdh/ech_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_dl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_dlfcn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_null.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_openssl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_win32.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_vms.c", +				"$OPENSSL_BUNDLE_DIR/crypto/dso/dso_beos.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_list.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_init.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_ctrl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_table.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_pkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_fat.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_all.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_rsa.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_dsa.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_ecdsa.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_dh.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_ecdh.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_rand.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_store.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_cipher.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_digest.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_pkmeth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/tb_asnmth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_openssl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_cnf.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_dyn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/engine/eng_cryptodev.c", +				"$OPENSSL_BUNDLE_DIR/crypto/buffer/buffer.c", +				"$OPENSSL_BUNDLE_DIR/crypto/buffer/buf_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bio_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bio_cb.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bio_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_mem.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_null.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_fd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_file.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_sock.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_conn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bf_null.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bf_buff.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/b_print.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/b_dump.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/b_sock.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_acpt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bf_nbio.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_log.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_bio.c", +				"$OPENSSL_BUNDLE_DIR/crypto/bio/bss_dgram.c", +				"$OPENSSL_BUNDLE_DIR/crypto/stack/stack.c", +				"$OPENSSL_BUNDLE_DIR/crypto/lhash/lhash.c", +				"$OPENSSL_BUNDLE_DIR/crypto/lhash/lh_stats.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/md_rand.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/randfile.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/rand_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/rand_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/rand_egd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/rand_win.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/rand_unix.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/rand_os2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/rand/rand_nw.c", +				"$OPENSSL_BUNDLE_DIR/crypto/err/err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/err/err_all.c", +				"$OPENSSL_BUNDLE_DIR/crypto/err/err_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/encode.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/digest.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/evp_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/evp_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/evp_acnf.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_des.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_bf.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_idea.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_des3.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_camellia.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_rc4.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_aes.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/names.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_seed.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_xcbc_d.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_rc2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_cast.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_rc5.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_null.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_md2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_md4.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_md5.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_sha.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_sha1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_wp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_dss.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_dss1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_mdc2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_ripemd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_ecdsa.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p_open.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p_seal.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p_sign.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p_verify.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p_dec.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/bio_md.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/bio_b64.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/bio_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/evp_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_null.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/c_all.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/c_allc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/c_alld.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/evp_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/bio_ok.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/evp_pkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/evp_pbe.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p5_crpt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/p5_crpt2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/e_old.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/pmeth_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/pmeth_fn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/pmeth_gn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/evp/m_sigver.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_object.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_bitstr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_utctm.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_gentm.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_time.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_int.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_octet.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_print.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_type.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_set.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_dup.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_d2i_fp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_i2d_fp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_enum.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_utf8.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_sign.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_digest.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_verify.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_mbstr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_strex.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_algor.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_val.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_pubkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_sig.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_req.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_attrib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_bignum.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_long.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_name.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_x509.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_x509a.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_crl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_info.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_spki.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/nsseq.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_nx509.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/d2i_pu.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/d2i_pr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/i2d_pu.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/i2d_pr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/t_req.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/t_x509.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/t_x509a.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/t_crl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/t_pkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/t_spki.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/t_bitst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/tasn_new.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/tasn_fre.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/tasn_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/tasn_dec.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/tasn_utl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/tasn_typ.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/tasn_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/ameth_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/f_int.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/f_string.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/n_pkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/f_enum.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_pkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_bool.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/x_exten.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/bio_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/bio_ndef.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/asn_mime.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/asn1_gen.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/asn1_par.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/asn1_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/asn1_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_bytes.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/a_strnid.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/evp_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/asn_pack.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/p5_pbe.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/p5_pbev2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/p8_pkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/asn1/asn_moid.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_sign.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_seal.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_info.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_all.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_x509.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_xaux.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_oth.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_pk8.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pem_pkey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pem/pvkfmt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_def.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_d2.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_r2x.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_cmp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_obj.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_req.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509spki.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_vfy.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_set.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509cset.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509rset.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509name.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_v3.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_ext.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_att.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509type.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_lu.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x_all.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_txt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_trs.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/by_file.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/by_dir.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509/x509_vpm.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_bcons.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_bitst.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_conf.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_extku.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_ia5.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_utl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_genn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_alt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_skey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_akey.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_pku.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_int.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_enum.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_sxnet.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_cpols.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_crld.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_purp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_info.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_ocsp.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_akeya.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_pmaps.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_pcons.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_ncons.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_pcia.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_pci.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/pcy_cache.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/pcy_node.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/pcy_data.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/pcy_map.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/pcy_tree.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/pcy_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_asid.c", +				"$OPENSSL_BUNDLE_DIR/crypto/x509v3/v3_addr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/conf/conf_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/conf/conf_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/conf/conf_api.c", +				"$OPENSSL_BUNDLE_DIR/crypto/conf/conf_def.c", +				"$OPENSSL_BUNDLE_DIR/crypto/conf/conf_mod.c", +				"$OPENSSL_BUNDLE_DIR/crypto/conf/conf_mall.c", +				"$OPENSSL_BUNDLE_DIR/crypto/conf/conf_sap.c", +				"$OPENSSL_BUNDLE_DIR/crypto/txt_db/txt_db.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/pk7_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/pk7_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/pkcs7err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/pk7_doit.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/pk7_smime.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/pk7_attr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/pk7_mime.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs7/bio_pk7.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_add.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_asn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_attr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_crpt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_crt.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_decr.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_init.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_key.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_kiss.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_mutl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_utl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_npas.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/pk12err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_p8d.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pkcs12/p12_p8e.c", +				"$OPENSSL_BUNDLE_DIR/crypto/comp/comp_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/comp/comp_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/comp/c_rle.c", +				"$OPENSSL_BUNDLE_DIR/crypto/comp/c_zlib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_asn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_ext.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_ht.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_cl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_srv.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_prn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_vfy.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ocsp/ocsp_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ui/ui_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ui/ui_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ui/ui_openssl.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ui/ui_util.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ui/ui_compat.c", +				"$OPENSSL_BUNDLE_DIR/crypto/krb5/krb5_asn.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_asn1.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_att.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_io.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_smime.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_sd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_dd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_cd.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_env.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_enc.c", +				"$OPENSSL_BUNDLE_DIR/crypto/cms/cms_ess.c", +				"$OPENSSL_BUNDLE_DIR/crypto/pqueue/pqueue.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_err.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_req_utils.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_req_print.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_rsp_utils.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_rsp_print.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_rsp_sign.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_rsp_verify.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_verify_ctx.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_lib.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_conf.c", +				"$OPENSSL_BUNDLE_DIR/crypto/ts/ts_asn1.c", +			]) +		openssl_env.StaticLibrary("ssl", [ +				"$OPENSSL_BUNDLE_DIR/ssl/s2_meth.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s2_srvr.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s2_clnt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s2_lib.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s2_enc.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s2_pkt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s3_meth.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s3_srvr.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s3_clnt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s3_lib.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s3_enc.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s3_pkt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s3_both.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s23_meth.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s23_srvr.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s23_clnt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s23_lib.c", +				"$OPENSSL_BUNDLE_DIR/ssl/s23_pkt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/t1_meth.c", +				"$OPENSSL_BUNDLE_DIR/ssl/t1_srvr.c", +				"$OPENSSL_BUNDLE_DIR/ssl/t1_clnt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/t1_lib.c", +				"$OPENSSL_BUNDLE_DIR/ssl/t1_enc.c", +				"$OPENSSL_BUNDLE_DIR/ssl/d1_meth.c", +				"$OPENSSL_BUNDLE_DIR/ssl/d1_srvr.c", +				"$OPENSSL_BUNDLE_DIR/ssl/d1_clnt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/d1_lib.c", +				"$OPENSSL_BUNDLE_DIR/ssl/d1_pkt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/d1_both.c", +				"$OPENSSL_BUNDLE_DIR/ssl/d1_enc.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_lib.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_err2.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_cert.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_sess.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_ciph.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_stat.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_rsa.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_asn1.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_txt.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_algs.c", +				"$OPENSSL_BUNDLE_DIR/ssl/bio_ssl.c", +				"$OPENSSL_BUNDLE_DIR/ssl/ssl_err.c", +				"$OPENSSL_BUNDLE_DIR/ssl/kssl.c", +				"$OPENSSL_BUNDLE_DIR/ssl/t1_reneg.c", +			]) +		openssl_env.WriteVal("$OPENSSL_BUNDLE_DIR/crypto/buildinf.h", openssl_env.Value("#define CFLAGS \"\"\n#define PLATFORM \"-\"\n#define DATE \"-\"")) diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 8bb3bdd..00587f3 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -151,27 +151,30 @@ if ARGUMENTS.get("SWIFT_INSTALLDIR", "") :  target = env["target"]  iOSVersion = env.get("iosversion", "4.0")  if target in ("iphone-device", "iphone-simulator"): -   if target == "iphone-device": -      sdkPart = "iPhoneOS" -      env["CC"] = "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/arm-apple-darwin9-gcc-4.0.1" -      env["CXX"] = "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/arm-apple-darwin9-g++-4.0.1" -      env["PATH"] = "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/" -      env["LD"] = env["CC"] -#      env["openssl"] = "#/3rdParty/openssl-0.9.8l-arm" -      targetIncludesArch = "arm" - -   if target == "iphone-simulator": -      sdkPart = "iPhoneSimulator" -      env.Append(CCFLAGS = ["-arch", "i386"]) -      env.Append(LINKFLAGS = ["-arch", "i386"]) -      targetIncludesArch = "i686" - -   sdkVer = iOSVersion -   sdk = "/Developer/Platforms/" + sdkPart + ".platform/Developer/SDKs/" + sdkPart + sdkVer + ".sdk" - -   env.Append(FRAMEWORKS = ["CoreFoundation", "Foundation", "UIKit", "CoreGraphics"]) -   env.Append(LINKFLAGS = ["-L\"" + sdk + "/usr/lib\"", "-F\"" + sdk + "/System/Library/Frameworks\"", "-F\"" + sdk + "/System/Library/PrivateFrameworks\""]) -   env.Append(CPPFLAGS = ["-isysroot", sdk]) +	if target == "iphone-device": +		sdkPart = "iPhoneOS" +	else : +		sdkPart = "iPhoneSimulator" +	sdkVer = iOSVersion +	sdk = "/Developer/Platforms/" + sdkPart + ".platform/Developer/SDKs/" + sdkPart + sdkVer + ".sdk" + +	if target == "iphone-device": +		sdkPart = "iPhoneOS" +		env["CC"] = "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/arm-apple-darwin10-gcc-4.2.1" +		env["CXX"] = "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/arm-apple-darwin10-g++-4.2.1" +		env["PATH"] = "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/" +		env["LD"] = env["CC"] +		env.Append(CPPPATH = [sdk + "/usr/include/c++/4.2.1/armv7-apple-darwin10"]) +		env.Append(CPPDEFINES = ["_LITTLE_ENDIAN"]) +		targetIncludesArch = "arm" +	if target == "iphone-simulator": +		env.Append(CCFLAGS = ["-arch", "i386"]) +		env.Append(LINKFLAGS = ["-arch", "i386"]) +		targetIncludesArch = "i686" + +	env.Append(FRAMEWORKS = ["CoreFoundation", "Foundation", "UIKit", "CoreGraphics"]) +	env.Append(LINKFLAGS = ["-L\"" + sdk + "/usr/lib\"", "-F\"" + sdk + "/System/Library/Frameworks\"", "-F\"" + sdk + "/System/Library/PrivateFrameworks\""]) +	env.Append(CPPFLAGS = ["-isysroot", sdk])  conf_env = env.Clone() @@ -383,6 +386,9 @@ if use_openssl and openssl_conf.CheckCHeader("openssl/ssl.h") :  		env["OPENSSL_FLAGS"]["LIBS"] = ["libeay32MT", "ssleay32MT"]  	else:  		env["OPENSSL_FLAGS"]["LIBS"] = ["ssl", "crypto"] +elif target in ("iphone-device", "iphone-simulator") : +	env["OPENSSL_BUNDLED"] = True +	env["HAVE_OPENSSL"] = True  else :  	env["OPENSSL_FLAGS"] = "" @@ -406,11 +412,11 @@ elif env.get("bonjour", False) :  		env["BONJOUR_FLAGS"]["LIBS"] = ["dnssd"]  	bonjour_conf.Finish() -# Cocoa +# Cocoa & IOKit  if env["PLATFORM"] == "darwin" :  	cocoa_conf = Configure(conf_env) -	if cocoa_conf.CheckCHeader("Cocoa/Cocoa.h") : -		env["HAVE_COCOA"] = True +	if cocoa_conf.CheckCHeader("IOKit/IOKitLib.h") : +		env["HAVE_IOKIT"] = True  	cocoa_conf.Finish()  ################################################################################ diff --git a/SwifTools/Idle/PlatformIdleQuerier.cpp b/SwifTools/Idle/PlatformIdleQuerier.cpp index 7213e77..a28e701 100644 --- a/SwifTools/Idle/PlatformIdleQuerier.cpp +++ b/SwifTools/Idle/PlatformIdleQuerier.cpp @@ -7,15 +7,14 @@  #include "SwifTools/Idle/PlatformIdleQuerier.h"  #include "Swiften/Base/Platform.h" -#if defined(SWIFTEN_PLATFORM_MACOSX) +#if defined(SWIFTEN_PLATFORM_MACOSX) && defined(HAVE_IOKIT)  #include "SwifTools/Idle/MacOSXIdleQuerier.h"  #elif defined(SWIFTEN_PLATFORM_WINDOWS)  #include "SwifTools/Idle/WindowsIdleQuerier.h"  #elif defined(HAVE_XSS)  #include "SwifTools/Idle/XSSIdleQuerier.h" -#else -#include "SwifTools/Idle/DummyIdleQuerier.h"  #endif +#include "SwifTools/Idle/DummyIdleQuerier.h"  #include <cassert>  #include <iostream> @@ -24,7 +23,11 @@ namespace Swift {  PlatformIdleQuerier::PlatformIdleQuerier() : querier(NULL) {  #if defined(SWIFTEN_PLATFORM_MACOSX) +#if defined(HAVE_IOKIT)  	querier = new MacOSXIdleQuerier(); +#else +	querier = new DummyIdleQuerier(); +#endif  #elif defined(SWIFTEN_PLATFORM_WINDOWS)  	querier = new WindowsIdleQuerier();  #elif defined(HAVE_XSS) diff --git a/SwifTools/SConscript b/SwifTools/SConscript index 18781c3..7620879 100644 --- a/SwifTools/SConscript +++ b/SwifTools/SConscript @@ -36,8 +36,9 @@ if env["SCONS_STAGE"] == "build" :  	if myenv["PLATFORM"] == "win32" :  		sources += ["Idle/WindowsIdleQuerier.cpp"] -	elif myenv["PLATFORM"] == "darwin" : -		sources += ["Idle/MacOSXIdleQuerier.cpp"] +	elif myenv["PLATFORM"] == "darwin" and myenv.get("HAVE_IOKIT", False) : +			myenv.Append(CPPDEFINES = ["HAVE_IOKIT"]) +			sources += ["Idle/MacOSXIdleQuerier.cpp"]  	elif myenv["HAVE_XSS"] :  		myenv.Append(CPPDEFINES = ["HAVE_XSS"])  		sources += ["Idle/XSSIdleQuerier.cpp"] | 
 Swift
 Swift