Skip to content

Commit 9f65c78

Browse files
committed
ip
1 parent 39bcd20 commit 9f65c78

15 files changed

Lines changed: 37 additions & 37 deletions

File tree

make2/build_jamalgam.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,23 +274,23 @@ if [ $USE_PYXES -eq 1 ]; then
274274
if [ -n "$PTHREADS4WSRC" ]; then
275275
OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
276276
else
277-
LDTHREAD=" ../pthreads4w/lib/pthreadVC3-w32.lib "
277+
LDTHREAD=" ../pthreads4w/x86/pthreadVC3.lib "
278278
fi
279279
;;
280280
windows/j64arm)
281281
common="$common -DPYXES=1 -I../pthreads4w/include"
282282
if [ -n "$PTHREADS4WSRC" ]; then
283283
OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
284284
else
285-
LDTHREAD=" ../pthreads4w/lib/pthreadVC3-arm64.lib "
285+
LDTHREAD=" ../pthreads4w/arm64/pthreadVC3.lib "
286286
fi
287287
;;
288288
windows/*)
289289
common="$common -DPYXES=1 -I../pthreads4w/include"
290290
if [ -n "$PTHREADS4WSRC" ]; then
291291
OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
292292
else
293-
LDTHREAD=" ../pthreads4w/lib/pthreadVC3.lib "
293+
LDTHREAD=" ../pthreads4w/x64/pthreadVC3.lib "
294294
fi
295295
;;
296296
*)

make2/build_libj.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,23 +279,23 @@ if [ $USE_PYXES -eq 1 ]; then
279279
if [ -n "$PTHREADS4WSRC" ]; then
280280
OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
281281
else
282-
LDTHREAD=" ../pthreads4w/lib/pthreadVC3-w32.lib "
282+
LDTHREAD=" ../pthreads4w/x86/pthreadVC3.lib "
283283
fi
284284
;;
285285
windows/j64arm)
286286
common="$common -DPYXES=1 -I../pthreads4w/include"
287287
if [ -n "$PTHREADS4WSRC" ]; then
288288
OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
289289
else
290-
LDTHREAD=" ../pthreads4w/lib/pthreadVC3-arm64.lib "
290+
LDTHREAD=" ../pthreads4w/arm64/pthreadVC3.lib "
291291
fi
292292
;;
293293
windows/*)
294294
common="$common -DPYXES=1 -I../pthreads4w/include"
295295
if [ -n "$PTHREADS4WSRC" ]; then
296296
OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
297297
else
298-
LDTHREAD=" ../pthreads4w/lib/pthreadVC3.lib "
298+
LDTHREAD=" ../pthreads4w/x64/pthreadVC3.lib "
299299
fi
300300
;;
301301
*)

makemsvc/jamalgam/makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ ifeq (1,$(USE_PYXES))
6161
ifneq ($(PTHREADS4WSRC),)
6262
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
6363
else
64-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-arm64.lib
64+
PTHREADLIB = ../pthreads4w/arm64/pthreadVC3.lib
6565
endif
6666
else ifeq (x64,$(TARGET_CPU))
6767
ifneq ($(PTHREADS4WSRC),)
6868
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
6969
else
70-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3.lib
70+
PTHREADLIB = ../pthreads4w/x64/pthreadVC3.lib
7171
endif
7272
else
7373
ifneq ($(PTHREADS4WSRC),)
7474
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
7575
else
76-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-w32.lib
76+
PTHREADLIB = ../pthreads4w/x86/pthreadVC3.lib
7777
endif
7878
endif
7979
endif

makemsvc/jamalgam/makefile.win

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ CINCLUDE = -I../mpir/include
3333
!if ""!="$(PTHREADS4WSRC)"
3434
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
3535
!else
36-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-arm64.lib
36+
PTHREADLIB = ../pthreads4w/arm64/pthreadVC3.lib
3737
!endif
3838
!elseif "x64"=="$(TARGET_CPU)"
3939
!if ""!="$(PTHREADS4WSRC)"
4040
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
4141
!else
42-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3.lib
42+
PTHREADLIB = ../pthreads4w/x64/pthreadVC3.lib
4343
!endif
4444
!else
4545
!if ""!="$(PTHREADS4WSRC)"
4646
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
4747
!else
48-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-w32.lib
48+
PTHREADLIB = ../pthreads4w/x86/pthreadVC3.lib
4949
!endif
5050
!endif
5151
CINCLUDE = $(CINCLUDE) -I../pthreads4w/include

makemsvc/jdll/makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ ifeq (1,$(USE_PYXES))
3030
ifneq ($(PTHREADS4WSRC),)
3131
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
3232
else
33-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-arm64.lib
33+
PTHREADLIB = ../pthreads4w/arm64/pthreadVC3.lib
3434
endif
3535
else ifeq (x64,$(TARGET_CPU))
3636
ifneq ($(PTHREADS4WSRC),)
3737
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
3838
else
39-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3.lib
39+
PTHREADLIB = ../pthreads4w/x64/pthreadVC3.lib
4040
endif
4141
else
4242
ifneq ($(PTHREADS4WSRC),)
4343
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
4444
else
45-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-w32.lib
45+
PTHREADLIB = ../pthreads4w/x86/pthreadVC3.lib
4646
endif
4747
endif
4848
CINCLUDE := $(CINCLUDE) -I../pthreads4w/include

makemsvc/jdll/makefile.win

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ CINCLUDE = -I../mpir/include
3030
!if ""!="$(PTHREADS4WSRC)"
3131
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
3232
!else
33-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-arm64.lib
33+
PTHREADLIB = ../pthreads4w/arm64/pthreadVC3.lib
3434
!endif
3535
!elseif "x64"=="$(TARGET_CPU)"
3636
!if ""!="$(PTHREADS4WSRC)"
3737
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
3838
!else
39-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3.lib
39+
PTHREADLIB = ../pthreads4w/x64/pthreadVC3.lib
4040
!endif
4141
!else
4242
!if ""!="$(PTHREADS4WSRC)"
4343
OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
4444
!else
45-
PTHREADLIB = ../pthreads4w/lib/pthreadVC3-w32.lib
45+
PTHREADLIB = ../pthreads4w/x86/pthreadVC3.lib
4646
!endif
4747
!endif
4848
CINCLUDE = $(CINCLUDE) -I../pthreads4w/include

makevs/jdll/template/jdll_vs2019_clang.vcxproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
</ResourceCompile>
186186
<Link>
187187
<AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
188-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
188+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
189189
<OutputFile>.\Release64\j.dll</OutputFile>
190190
<SuppressStartupBanner>true</SuppressStartupBanner>
191191
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
@@ -238,7 +238,7 @@
238238
<Culture>0x0409</Culture>
239239
</ResourceCompile>
240240
<Link>
241-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
241+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
242242
<OutputFile>.\Release64\j.dll</OutputFile>
243243
<SuppressStartupBanner>true</SuppressStartupBanner>
244244
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
@@ -291,7 +291,7 @@
291291
<Culture>0x0409</Culture>
292292
</ResourceCompile>
293293
<Link>
294-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
294+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
295295
<OutputFile>.\Release64\j.dll</OutputFile>
296296
<SuppressStartupBanner>true</SuppressStartupBanner>
297297
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
@@ -346,7 +346,7 @@
346346
<Culture>0x0409</Culture>
347347
</ResourceCompile>
348348
<Link>
349-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
349+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
350350
<SuppressStartupBanner>true</SuppressStartupBanner>
351351
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
352352
<ProgramDatabaseFile>$(outdir)\j.pdb</ProgramDatabaseFile>
@@ -404,7 +404,7 @@
404404
<Culture>0x0409</Culture>
405405
</ResourceCompile>
406406
<Link>
407-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
407+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
408408
<SuppressStartupBanner>true</SuppressStartupBanner>
409409
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
410410
<ProgramDatabaseFile>$(outdir)\j.pdb</ProgramDatabaseFile>
@@ -462,7 +462,7 @@
462462
<Culture>0x0409</Culture>
463463
</ResourceCompile>
464464
<Link>
465-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
465+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
466466
<SuppressStartupBanner>true</SuppressStartupBanner>
467467
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
468468
<ProgramDatabaseFile>$(outdir)\j.pdb</ProgramDatabaseFile>
@@ -514,7 +514,7 @@
514514
</ResourceCompile>
515515
<Link>
516516
<AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
517-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
517+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
518518
<OutputFile>.\Debug64\j.dll</OutputFile>
519519
<SuppressStartupBanner>true</SuppressStartupBanner>
520520
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
@@ -572,7 +572,7 @@
572572
<Culture>0x0409</Culture>
573573
</ResourceCompile>
574574
<Link>
575-
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\lib\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
575+
<AdditionalDependencies>..\..\openssl-asm\md5-x86_64-nasm.o;..\..\openssl-asm\keccak1600-x86_64-nasm.o;..\..\openssl-asm\sha1-x86_64-nasm.o;..\..\openssl-asm\sha256-x86_64-nasm.o;..\..\openssl-asm\sha512-x86_64-nasm.o;..\..\pthreads4w\x64\pthreadVC3.lib;..\..\mpir\windows\x64\mpir.lib;onecore.lib;synchronization.lib;%(AdditionalDependencies)</AdditionalDependencies>
576576
<SuppressStartupBanner>true</SuppressStartupBanner>
577577
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
578578
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -634,7 +634,7 @@
634634
<SubSystem>Windows</SubSystem>
635635
<ImportLibrary>$(outdir)\j.lib</ImportLibrary>
636636
<TargetMachine>MachineX86</TargetMachine>
637-
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\lib\pthreadVC3-w32.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
637+
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\x86\pthreadVC3.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
638638
<GenerateDebugInformation>false</GenerateDebugInformation>
639639
<AdditionalLibraryDirectories>..\..\pthreads4w\include\;..\..\mpir\include\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
640640
</Link>
@@ -727,7 +727,7 @@
727727
<Culture>0x0409</Culture>
728728
</ResourceCompile>
729729
<Link>
730-
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\lib\pthreadVC3-w32.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
730+
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\x86\pthreadVC3.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
731731
<OutputFile>.\release\j.dll</OutputFile>
732732
<SuppressStartupBanner>true</SuppressStartupBanner>
733733
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
@@ -779,7 +779,7 @@
779779
<Culture>0x0409</Culture>
780780
</ResourceCompile>
781781
<Link>
782-
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\lib\pthreadVC3-w32.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
782+
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\x86\pthreadVC3.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
783783
<OutputFile>.\release\j.dll</OutputFile>
784784
<SuppressStartupBanner>true</SuppressStartupBanner>
785785
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
@@ -836,7 +836,7 @@
836836
<Culture>0x0409</Culture>
837837
</ResourceCompile>
838838
<Link>
839-
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\lib\pthreadVC3-w32.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
839+
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\x86\pthreadVC3.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
840840
<SuppressStartupBanner>true</SuppressStartupBanner>
841841
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>
842842
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -886,7 +886,7 @@
886886
<Culture>0x0409</Culture>
887887
</ResourceCompile>
888888
<Link>
889-
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\lib\pthreadVC3-w32.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
889+
<AdditionalDependencies>..\..\openssl-asm\md5-586-nasm.o;..\..\openssl-asm\keccak1600-mmx-nasm.o;..\..\openssl-asm\sha1-586-nasm.o;..\..\openssl-asm\sha256-586-nasm.o;..\..\openssl-asm\sha512-586-nasm.o;..\..\pthreads4w\x86\pthreadVC3.lib;..\..\mpir\windows\x86\mpir.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
890890
<OutputFile>.\debug\j.dll</OutputFile>
891891
<SuppressStartupBanner>true</SuppressStartupBanner>
892892
<ModuleDefinitionFile>..\..\dllsrc\jdll.def</ModuleDefinitionFile>

pthreads4w/arm64/pthreadVC3.dll

54.5 KB
Binary file not shown.

pthreads4w/arm64/pthreadVC3.lib

20.7 KB
Binary file not shown.

pthreads4w/x64/pthreadVC3.dll

50.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)