Skip to content

Commit 711a67d

Browse files
karel-mkarel-m
committed
Update makefiles
1 parent f302504 commit 711a67d

6 files changed

Lines changed: 62 additions & 20 deletions

File tree

‎libtomcrypt_VS2008.vcproj‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,34 @@
328328
<References>
329329
</References>
330330
<Files>
331+
<Filter
332+
Name="boxes"
333+
>
334+
<File
335+
RelativePath="src\boxes\ltc_cryptobox_create.c"
336+
>
337+
</File>
338+
<File
339+
RelativePath="src\boxes\ltc_cryptobox_open.c"
340+
>
341+
</File>
342+
<File
343+
RelativePath="src\boxes\ltc_sealedbox_create.c"
344+
>
345+
</File>
346+
<File
347+
RelativePath="src\boxes\ltc_sealedbox_open.c"
348+
>
349+
</File>
350+
<File
351+
RelativePath="src\boxes\ltc_secretbox_create.c"
352+
>
353+
</File>
354+
<File
355+
RelativePath="src\boxes\ltc_secretbox_open.c"
356+
>
357+
</File>
358+
</Filter>
331359
<Filter
332360
Name="ciphers"
333361
>

‎makefile.mingw‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ 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_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/aria.o \
40-
src/ciphers/blowfish.o src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o src/ciphers/idea.o \
41-
src/ciphers/kasumi.o src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o src/ciphers/noekeon.o \
42-
src/ciphers/rc2.o src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o \
38+
OBJECTS=src/boxes/ltc_cryptobox_create.o src/boxes/ltc_cryptobox_open.o \
39+
src/boxes/ltc_sealedbox_create.o src/boxes/ltc_sealedbox_open.o src/boxes/ltc_secretbox_create.o \
40+
src/boxes/ltc_secretbox_open.o src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o \
41+
src/ciphers/aes/aes_enc.o src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o \
42+
src/ciphers/aria.o src/ciphers/blowfish.o src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o \
43+
src/ciphers/idea.o src/ciphers/kasumi.o src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o \
44+
src/ciphers/noekeon.o src/ciphers/rc2.o src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o \
4345
src/ciphers/safer/saferp.o src/ciphers/serpent.o src/ciphers/skipjack.o src/ciphers/sm4.o \
4446
src/ciphers/tea.o src/ciphers/twofish/twofish.o src/ciphers/xtea.o src/encauth/ccm/ccm_add_aad.o \
4547
src/encauth/ccm/ccm_add_nonce.o src/encauth/ccm/ccm_done.o src/encauth/ccm/ccm_init.o \

‎makefile.msvc‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ 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_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/aria.obj \
33-
src/ciphers/blowfish.obj src/ciphers/camellia.obj src/ciphers/cast5.obj src/ciphers/des.obj src/ciphers/idea.obj \
34-
src/ciphers/kasumi.obj src/ciphers/khazad.obj src/ciphers/kseed.obj src/ciphers/multi2.obj src/ciphers/noekeon.obj \
35-
src/ciphers/rc2.obj src/ciphers/rc5.obj src/ciphers/rc6.obj src/ciphers/safer/safer.obj \
31+
OBJECTS=src/boxes/ltc_cryptobox_create.obj src/boxes/ltc_cryptobox_open.obj \
32+
src/boxes/ltc_sealedbox_create.obj src/boxes/ltc_sealedbox_open.obj src/boxes/ltc_secretbox_create.obj \
33+
src/boxes/ltc_secretbox_open.obj src/ciphers/aes/aes.obj src/ciphers/aes/aes_desc.obj \
34+
src/ciphers/aes/aes_enc.obj src/ciphers/aes/aes_enc_desc.obj src/ciphers/aes/aesni.obj src/ciphers/anubis.obj \
35+
src/ciphers/aria.obj src/ciphers/blowfish.obj src/ciphers/camellia.obj src/ciphers/cast5.obj src/ciphers/des.obj \
36+
src/ciphers/idea.obj src/ciphers/kasumi.obj src/ciphers/khazad.obj src/ciphers/kseed.obj src/ciphers/multi2.obj \
37+
src/ciphers/noekeon.obj src/ciphers/rc2.obj src/ciphers/rc5.obj src/ciphers/rc6.obj src/ciphers/safer/safer.obj \
3638
src/ciphers/safer/saferp.obj src/ciphers/serpent.obj src/ciphers/skipjack.obj src/ciphers/sm4.obj \
3739
src/ciphers/tea.obj src/ciphers/twofish/twofish.obj src/ciphers/xtea.obj src/encauth/ccm/ccm_add_aad.obj \
3840
src/encauth/ccm/ccm_add_nonce.obj src/encauth/ccm/ccm_done.obj src/encauth/ccm/ccm_init.obj \

‎makefile.unix‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ VERSION_PC=1.18.2
4949
LIBMAIN_S =libtomcrypt.a
5050

5151
#List of objects to compile (all goes to libtomcrypt.a)
52-
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o src/ciphers/aes/aes_enc.o \
53-
src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o src/ciphers/aria.o \
54-
src/ciphers/blowfish.o src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o src/ciphers/idea.o \
55-
src/ciphers/kasumi.o src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o src/ciphers/noekeon.o \
56-
src/ciphers/rc2.o src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o \
52+
OBJECTS=src/boxes/ltc_cryptobox_create.o src/boxes/ltc_cryptobox_open.o \
53+
src/boxes/ltc_sealedbox_create.o src/boxes/ltc_sealedbox_open.o src/boxes/ltc_secretbox_create.o \
54+
src/boxes/ltc_secretbox_open.o src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o \
55+
src/ciphers/aes/aes_enc.o src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o \
56+
src/ciphers/aria.o src/ciphers/blowfish.o src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o \
57+
src/ciphers/idea.o src/ciphers/kasumi.o src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o \
58+
src/ciphers/noekeon.o src/ciphers/rc2.o src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o \
5759
src/ciphers/safer/saferp.o src/ciphers/serpent.o src/ciphers/skipjack.o src/ciphers/sm4.o \
5860
src/ciphers/tea.o src/ciphers/twofish/twofish.o src/ciphers/xtea.o src/encauth/ccm/ccm_add_aad.o \
5961
src/encauth/ccm/ccm_add_nonce.o src/encauth/ccm/ccm_done.o src/encauth/ccm/ccm_init.o \

‎makefile_include.mk‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,13 @@ library: $(call print-help,library,Builds the library) $(LIBNAME)
220220

221221
# List of objects to compile (all goes to libtomcrypt.a)
222222
ifndef AMALGAM
223-
OBJECTS=src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o src/ciphers/aes/aes_enc.o \
224-
src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o src/ciphers/aria.o \
225-
src/ciphers/blowfish.o src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o src/ciphers/idea.o \
226-
src/ciphers/kasumi.o src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o src/ciphers/noekeon.o \
227-
src/ciphers/rc2.o src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o \
223+
OBJECTS=src/boxes/ltc_cryptobox_create.o src/boxes/ltc_cryptobox_open.o \
224+
src/boxes/ltc_sealedbox_create.o src/boxes/ltc_sealedbox_open.o src/boxes/ltc_secretbox_create.o \
225+
src/boxes/ltc_secretbox_open.o src/ciphers/aes/aes.o src/ciphers/aes/aes_desc.o \
226+
src/ciphers/aes/aes_enc.o src/ciphers/aes/aes_enc_desc.o src/ciphers/aes/aesni.o src/ciphers/anubis.o \
227+
src/ciphers/aria.o src/ciphers/blowfish.o src/ciphers/camellia.o src/ciphers/cast5.o src/ciphers/des.o \
228+
src/ciphers/idea.o src/ciphers/kasumi.o src/ciphers/khazad.o src/ciphers/kseed.o src/ciphers/multi2.o \
229+
src/ciphers/noekeon.o src/ciphers/rc2.o src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o \
228230
src/ciphers/safer/saferp.o src/ciphers/serpent.o src/ciphers/skipjack.o src/ciphers/sm4.o \
229231
src/ciphers/tea.o src/ciphers/twofish/twofish.o src/ciphers/xtea.o src/encauth/ccm/ccm_add_aad.o \
230232
src/encauth/ccm/ccm_add_nonce.o src/encauth/ccm/ccm_done.o src/encauth/ccm/ccm_init.o \

‎sources.cmake‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
set(SOURCES
2+
src/boxes/ltc_cryptobox_create.c
3+
src/boxes/ltc_cryptobox_open.c
4+
src/boxes/ltc_sealedbox_create.c
5+
src/boxes/ltc_sealedbox_open.c
6+
src/boxes/ltc_secretbox_create.c
7+
src/boxes/ltc_secretbox_open.c
28
src/ciphers/aes/aes.c
39
src/ciphers/aes/aes_desc.c
410
src/ciphers/aes/aes_tab.c

0 commit comments

Comments
 (0)