Skip to content

Commit c816b13

Browse files
committed
Update makefiles
Signed-off-by: Steffen Jaeckel <[email protected]>
1 parent 09303a0 commit c816b13

6 files changed

+18
-4
lines changed

Diff for: libtomcrypt_VS2008.vcproj

+8
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,10 @@
410410
RelativePath="src\ciphers\aes\aes.c"
411411
>
412412
</File>
413+
<File
414+
RelativePath="src\ciphers\aes\aes_desc.c"
415+
>
416+
</File>
413417
<File
414418
RelativePath="src\ciphers\aes\aes_tab.c"
415419
>
@@ -454,6 +458,10 @@
454458
/>
455459
</FileConfiguration>
456460
</File>
461+
<File
462+
RelativePath="src\ciphers\aes\aesni.c"
463+
>
464+
</File>
457465
</Filter>
458466
<Filter
459467
Name="safer"

Diff for: makefile.mingw

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ LIBMAIN_I =libtomcrypt.dll.a
3535
LIBMAIN_D =libtomcrypt.dll
3636

3737
#List of objects to compile (all goes to libtomcrypt.a)
38-
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_enc.o src/ciphers/anubis.o src/ciphers/blowfish.o \
38+
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o src/ciphers/aes/aes_enc.o \
39+
src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o src/ciphers/blowfish.o \
3940
src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o src/ciphers/idea.o src/ciphers/kasumi.o \
4041
src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o src/ciphers/noekeon.o src/ciphers/rc2.o \
4142
src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o src/ciphers/safer/saferp.o \

Diff for: makefile.msvc

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ VERSION=1.18.2-develop
2828
LIBMAIN_S =tomcrypt.lib
2929

3030
#List of objects to compile (all goes to tomcrypt.lib)
31-
OBJECTS=src/ciphers/aes/aes.obj src/ciphers/aes/aes_enc.obj src/ciphers/anubis.obj src/ciphers/blowfish.obj \
31+
OBJECTS=src/ciphers/aes/aes.obj src/ciphers/aes/aes_desc.obj src/ciphers/aes/aes_enc.obj \
32+
src/ciphers/aes/aes_enc_desc.obj src/ciphers/aes/aesni.obj src/ciphers/anubis.obj src/ciphers/blowfish.obj \
3233
src/ciphers/camellia.obj src/ciphers/cast5.obj src/ciphers/des.obj src/ciphers/idea.obj src/ciphers/kasumi.obj \
3334
src/ciphers/khazad.obj src/ciphers/kseed.obj src/ciphers/multi2.obj src/ciphers/noekeon.obj src/ciphers/rc2.obj \
3435
src/ciphers/rc5.obj src/ciphers/rc6.obj src/ciphers/safer/safer.obj src/ciphers/safer/saferp.obj \

Diff for: makefile.unix

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ VERSION=1.18.2-develop
4545
LIBMAIN_S =libtomcrypt.a
4646

4747
#List of objects to compile (all goes to libtomcrypt.a)
48-
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_enc.o src/ciphers/anubis.o src/ciphers/blowfish.o \
48+
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o src/ciphers/aes/aes_enc.o \
49+
src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o src/ciphers/blowfish.o \
4950
src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o src/ciphers/idea.o src/ciphers/kasumi.o \
5051
src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o src/ciphers/noekeon.o src/ciphers/rc2.o \
5152
src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o src/ciphers/safer/saferp.o \

Diff for: makefile_include.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ library: $(call print-help,library,Builds the library) $(LIBNAME)
213213

214214

215215
# List of objects to compile (all goes to libtomcrypt.a)
216-
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_enc.o src/ciphers/anubis.o src/ciphers/blowfish.o \
216+
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o src/ciphers/aes/aes_enc.o \
217+
src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o src/ciphers/blowfish.o \
217218
src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o src/ciphers/idea.o src/ciphers/kasumi.o \
218219
src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o src/ciphers/noekeon.o src/ciphers/rc2.o \
219220
src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o src/ciphers/safer/saferp.o \

Diff for: sources.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
set(SOURCES
22
src/ciphers/aes/aes.c
3+
src/ciphers/aes/aes_desc.c
34
src/ciphers/aes/aes_tab.c
5+
src/ciphers/aes/aesni.c
46
src/ciphers/anubis.c
57
src/ciphers/blowfish.c
68
src/ciphers/camellia.c

0 commit comments

Comments
 (0)