From 08d18723e99c17e762f3ecc6487d32f919bba0fe Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@ff987cc8-cf2f-4642-8568-d52cce064691> Date: Tue, 23 Aug 2011 06:17:12 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=AA=E3=83=96=E3=82=B8=E3=82=A7=E3=82=AF?= =?UTF-8?q?=E3=83=88=E3=81=AE=E7=B5=90=E5=90=88=E3=82=B9=E3=82=AF=E3=83=AA?= =?UTF-8?q?=E3=83=97=E3=83=88=E4=BF=AE=E6=AD=A3($openssl=5Fdir=20=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@204 ff987cc8-cf2f-4642-8568-d52cce064691 --- trunk/tools/merge_lib_objs.plx | 6 ++++-- trunk/tools/merge_lib_objs_hsm.plx | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/trunk/tools/merge_lib_objs.plx b/trunk/tools/merge_lib_objs.plx index d367459..774c4cd 100644 --- a/trunk/tools/merge_lib_objs.plx +++ b/trunk/tools/merge_lib_objs.plx @@ -1,12 +1,14 @@ #!/usr/bin/perl -w use strict; +my $openssl_dir = "../openssl-1.0.0-beta5/"; + my $lib_name = "../libgenid.a"; my @lib_list = ( - "../openssl-1.0.0-beta5/libcrypto.a", - "../openssl-1.0.0-beta5/libssl.a", + $openssl_dir . "libcrypto.a", + $openssl_dir . "libssl.a", ); # move work directory diff --git a/trunk/tools/merge_lib_objs_hsm.plx b/trunk/tools/merge_lib_objs_hsm.plx index 30a9763..815284d 100644 --- a/trunk/tools/merge_lib_objs_hsm.plx +++ b/trunk/tools/merge_lib_objs_hsm.plx @@ -1,12 +1,14 @@ #!/usr/bin/perl -w use strict; + +my $openssl_dir = "../openssl-1.0.0-beta5/"; my $lib_name = "../libgenid.a"; my @lib_list = ( - "../openssl-1.0.0-beta5/libcrypto.a", - "../openssl-1.0.0-beta5/libssl.a", + $openssl_dir . "libcrypto.a", + $openssl_dir . "libssl.a", "/opt/nfast/c/ctd/gcc/lib/libnflog.a", "/opt/nfast/c/ctd/gcc/lib/libcutils.a", "/opt/nfast/c/ctd/gcc/lib/libnfstub.a",