Skip to content

Commit 159ba69

Browse files
bilambilam
committed
makefile
1 parent f5968d5 commit 159ba69

3 files changed

Lines changed: 86 additions & 84 deletions

File tree

‎make2/build_jamalgam.sh‎

Lines changed: 78 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -338,33 +338,33 @@ case "$jplatform/$j64x" in
338338
windows/*) BACKTRACE_OBJS="" ;;
339339
darwin/*)
340340
BACKTRACE_OBJS=" \
341-
atomic.o \
342-
backtrace.o \
343-
dwarf.o \
344-
fileline.o \
345-
mmap.o \
346-
mmapio.o \
347-
posix.o \
348-
print.o \
349-
simple.o \
350-
sort.o \
351-
state.o \
352-
macho.o "
341+
../libbacktrace/atomic.o \
342+
../libbacktrace/backtrace.o \
343+
../libbacktrace/dwarf.o \
344+
../libbacktrace/fileline.o \
345+
../libbacktrace/mmap.o \
346+
../libbacktrace/mmapio.o \
347+
../libbacktrace/posix.o \
348+
../libbacktrace/print.o \
349+
../libbacktrace/simple.o \
350+
../libbacktrace/sort.o \
351+
../libbacktrace/state.o \
352+
../libbacktrace/macho.o "
353353
;;
354354
*)
355355
BACKTRACE_OBJS=" \
356-
atomic.o \
357-
backtrace.o \
358-
dwarf.o \
359-
fileline.o \
360-
mmap.o \
361-
mmapio.o \
362-
posix.o \
363-
print.o \
364-
simple.o \
365-
sort.o \
366-
state.o \
367-
elf.o "
356+
../libbacktrace/atomic.o \
357+
../libbacktrace/backtrace.o \
358+
../libbacktrace/dwarf.o \
359+
../libbacktrace/fileline.o \
360+
../libbacktrace/mmap.o \
361+
../libbacktrace/mmapio.o \
362+
../libbacktrace/posix.o \
363+
../libbacktrace/print.o \
364+
../libbacktrace/simple.o \
365+
../libbacktrace/sort.o \
366+
../libbacktrace/state.o \
367+
../libbacktrace/elf.o "
368368
;;
369369
esac
370370

@@ -409,82 +409,81 @@ if [ $NO_SHA_ASM -ne 0 ]; then
409409
else
410410

411411
SRC_ASM_LINUXAVX512=" \
412-
md5-x86_64-elf.o \
413-
keccak1600-avx512-elf.o \
414-
sha1-x86_64-elf.o \
415-
sha256-x86_64-elf.o \
416-
sha512-x86_64-elf.o \
412+
openssl/sha/asm/md5-x86_64-elf.o \
413+
openssl/sha/asm/keccak1600-avx512-elf.o \
414+
openssl/sha/asm/sha1-x86_64-elf.o \
415+
openssl/sha/asm/sha256-x86_64-elf.o \
416+
openssl/sha/asm/sha512-x86_64-elf.o \
417417
viixamd64.o "
418418

419419
SRC_ASM_LINUXAVX2=" \
420-
md5-x86_64-elf.o \
421-
keccak1600-avx2-elf.o \
422-
sha1-x86_64-elf.o \
423-
sha256-x86_64-elf.o \
424-
sha512-x86_64-elf.o \
425-
viixamd64.o "
420+
openssl/sha/asm/md5-x86_64-elf.o \
421+
openssl/sha/asm/keccak1600-avx2-elf.o \
422+
openssl/sha/asm/sha1-x86_64-elf.o \
423+
openssl/sha/asm/sha256-x86_64-elf.o \
424+
openssl/sha/asm/sha512-x86_64-elf.o "
426425

427426
SRC_ASM_LINUX=" \
428-
md5-x86_64-elf.o \
429-
keccak1600-x86_64-elf.o \
430-
sha1-x86_64-elf.o \
431-
sha256-x86_64-elf.o \
432-
sha512-x86_64-elf.o "
427+
openssl/sha/asm/md5-x86_64-elf.o \
428+
openssl/sha/asm/keccak1600-x86_64-elf.o \
429+
openssl/sha/asm/sha1-x86_64-elf.o \
430+
openssl/sha/asm/sha256-x86_64-elf.o \
431+
openssl/sha/asm/sha512-x86_64-elf.o "
433432

434433
SRC_ASM_LINUX32=" \
435-
md5-586-elf.o \
436-
keccak1600-mmx-elf.o \
437-
sha1-586-elf.o \
438-
sha256-586-elf.o \
439-
sha512-586-elf.o "
434+
openssl/sha/asm/md5-586-elf.o \
435+
openssl/sha/asm/keccak1600-mmx-elf.o \
436+
openssl/sha/asm/sha1-586-elf.o \
437+
openssl/sha/asm/sha256-586-elf.o \
438+
openssl/sha/asm/sha512-586-elf.o "
440439

441440
SRC_ASM_RASPI=" \
442-
md5-aarch64-elf.o \
443-
keccak1600-armv8-elf.o \
444-
sha1-armv8-elf.o \
445-
sha256-armv8-elf.o \
446-
sha512-armv8-elf.o "
441+
openssl/sha/asm/md5-aarch64-elf.o \
442+
openssl/sha/asm/keccak1600-armv8-elf.o \
443+
openssl/sha/asm/sha1-armv8-elf.o \
444+
openssl/sha/asm/sha256-armv8-elf.o \
445+
openssl/sha/asm/sha512-armv8-elf.o "
447446

448447
SRC_ASM_RASPI32=" \
449-
keccak1600-armv4-elf.o \
450-
sha1-armv4-elf.o \
451-
sha256-armv4-elf.o \
452-
sha512-armv4-elf.o "
448+
openssl/sha/asm/keccak1600-armv4-elf.o \
449+
openssl/sha/asm/sha1-armv4-elf.o \
450+
openssl/sha/asm/sha256-armv4-elf.o \
451+
openssl/sha/asm/sha512-armv4-elf.o "
453452

454453
SRC_ASM_MAC=" \
455-
md5-x86_64-macho.o \
456-
keccak1600-x86_64-macho.o \
457-
sha1-x86_64-macho.o \
458-
sha256-x86_64-macho.o \
459-
sha512-x86_64-macho.o "
454+
openssl/sha/asm/md5-x86_64-macho.o \
455+
openssl/sha/asm/keccak1600-x86_64-macho.o \
456+
openssl/sha/asm/sha1-x86_64-macho.o \
457+
openssl/sha/asm/sha256-x86_64-macho.o \
458+
openssl/sha/asm/sha512-x86_64-macho.o "
460459

461460
SRC_ASM_MAC32=" \
462-
md5-586-macho.o \
463-
keccak1600-mmx-macho.o \
464-
sha1-586-macho.o \
465-
sha256-586-macho.o \
466-
sha512-586-macho.o "
461+
openssl/sha/asm/md5-586-macho.o \
462+
openssl/sha/asm/keccak1600-mmx-macho.o \
463+
openssl/sha/asm/sha1-586-macho.o \
464+
openssl/sha/asm/sha256-586-macho.o \
465+
openssl/sha/asm/sha512-586-macho.o "
467466

468467
SRC_ASM_IOS=" \
469-
md5-aarch64-ios.o \
470-
keccak1600-armv8-ios.o \
471-
sha1-armv8-ios.o \
472-
sha256-armv8-ios.o \
473-
sha512-armv8-ios.o "
468+
openssl/sha/asm/md5-aarch64-ios.o \
469+
openssl/sha/asm/keccak1600-armv8-ios.o \
470+
openssl/sha/asm/sha1-armv8-ios.o \
471+
openssl/sha/asm/sha256-armv8-ios.o \
472+
openssl/sha/asm/sha512-armv8-ios.o "
474473

475474
OBJS_ASM_WIN=" \
476-
openssl-asm/md5-x86_64-nasm.o \
477-
openssl-asm/keccak1600-x86_64-nasm.o \
478-
openssl-asm/sha1-x86_64-nasm.o \
479-
openssl-asm/sha256-x86_64-nasm.o \
480-
openssl-asm/sha512-x86_64-nasm.o "
475+
../openssl-asm/md5-x86_64-nasm.o \
476+
../openssl-asm/keccak1600-x86_64-nasm.o \
477+
../openssl-asm/sha1-x86_64-nasm.o \
478+
../openssl-asm/sha256-x86_64-nasm.o \
479+
../openssl-asm/sha512-x86_64-nasm.o "
481480

482481
OBJS_ASM_WIN32=" \
483-
openssl-asm/md5-586-nasm.o \
484-
openssl-asm/keccak1600-mmx-nasm.o \
485-
openssl-asm/sha1-586-nasm.o \
486-
openssl-asm/sha256-586-nasm.o \
487-
openssl-asm/sha512-586-nasm.o "
482+
../openssl-asm/md5-586-nasm.o \
483+
../openssl-asm/keccak1600-mmx-nasm.o \
484+
../openssl-asm/sha1-586-nasm.o \
485+
../openssl-asm/sha256-586-nasm.o \
486+
../openssl-asm/sha512-586-nasm.o "
488487

489488
fi
490489

‎make2/build_libj.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,11 @@ else
374374
openssl/sha/asm/sha512-x86_64-elf.o "
375375

376376
SRC_ASM_LINUX=" \
377-
openssl/sha/asm/openssl/sha/asm/md5-x86_64-elf.o \
378-
openssl/sha/asm/openssl/sha/asm/keccak1600-x86_64-elf.o \
379-
openssl/sha/asm/openssl/sha/asm/sha1-x86_64-elf.o \
380-
openssl/sha/asm/openssl/sha/asm/sha256-x86_64-elf.o \
381-
openssl/sha/asm/openssl/sha/asm/sha512-x86_64-elf.o "
377+
openssl/sha/asm/md5-x86_64-elf.o \
378+
openssl/sha/asm/keccak1600-x86_64-elf.o \
379+
openssl/sha/asm/sha1-x86_64-elf.o \
380+
openssl/sha/asm/sha256-x86_64-elf.o \
381+
openssl/sha/asm/sha512-x86_64-elf.o "
382382

383383
SRC_ASM_LINUX32=" \
384384
openssl/sha/asm/md5-586-elf.o \

‎script/buildga.cmd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ IF "%~1"=="x86" GOTO L01A
2121
IF "%~1"=="arm64" GOTO L01B
2222
IF "%~1" NEQ "x64" EXIT /b 1
2323
mkdir j64
24+
mkdir bin\windows\j64
2425
copy bin\profile.ijs j64
2526
copy pthreads4w\bin\pthreadVC3.dll j64
2627
copy mpir\windows\x64\mpir.dll j64
@@ -30,6 +31,7 @@ curl --output-dir "j64" -O "https://www.jsoftware.com/download/lapackbin/libopen
3031
GOTO L01C
3132
:L01A
3233
mkdir j32
34+
mkdir bin\windows\j32
3335
copy bin\profile.ijs j32
3436
copy pthreads4w\bin\pthreadVC3-w32.dll j32\pthreadVC3-w32.dll
3537
copy mpir\windows\x86\mpir.dll j32\mpir32.dll
@@ -39,6 +41,7 @@ curl --output-dir "j32" -O "https://www.jsoftware.com/dowoad/lapackbin/libopenbl
3941
GOTO L01C
4042
:L01B
4143
mkdir j64
44+
mkdir bin\windows\j64arm
4245
copy bin\profile.ijs j64
4346
copy pthreads4w\bin\pthreadVC3-arm64.dll j64\pthreadVC3-arm64.dll
4447
copy mpir\windows\arm64\mpir-a64.dll j64

0 commit comments

Comments
 (0)