Skip to content

Commit c93cc12

Browse files
committed
LTC_SOURCE ceased to exist
f55039b removed all usage of `LTC_SOURCE`, but I missed to remove it from the makefiles etc. Signed-off-by: Steffen Jaeckel <[email protected]>
1 parent 54f0456 commit c93cc12

6 files changed

+11
-11
lines changed

helper.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ sub prepare_msvc_files_xml {
233233
########### aes_enc "hack" disabled - discussion: https://github.com/libtom/libtomcrypt/pull/158
234234
# if ($full eq 'src\ciphers\aes\aes.c') { #hack
235235
# my %cmd = (
236-
# 'Debug|Win32' => [ 'Debug/aes.obj;Debug/aes_enc.obj', 'cl /nologo /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D &quot;LTC_SOURCE&quot; /D &quot;USE_LTM&quot; /Fp&quot;Debug/libtomcrypt.pch&quot; /YX /Fo&quot;Debug/&quot; /Fd&quot;Debug/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;cl /nologo /DENCRYPT_ONLY /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D &quot;LTC_SOURCE&quot; /D &quot;USE_LTM&quot; /Fp&quot;Debug/libtomcrypt.pch&quot; /YX /Fo&quot;Debug/aes_enc.obj&quot; /Fd&quot;Debug/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;' ],
237-
# 'Release|Win32' => [ 'Release/aes.obj;Release/aes_enc.obj', 'cl /nologo /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D &quot;LTC_SOURCE&quot; /D &quot;USE_LTM&quot; /Fp&quot;Release/libtomcrypt.pch&quot; /YX /Fo&quot;Release/&quot; /Fd&quot;Release/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;cl /nologo /DENCRYPT_ONLY /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D &quot;LTC_SOURCE&quot; /D &quot;USE_LTM&quot; /Fp&quot;Release/libtomcrypt.pch&quot; /YX /Fo&quot;Release/aes_enc.obj&quot; /Fd&quot;Release/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;' ],
236+
# 'Debug|Win32' => [ 'Debug/aes.obj;Debug/aes_enc.obj', 'cl /nologo /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D /D &quot;USE_LTM&quot; /Fp&quot;Debug/libtomcrypt.pch&quot; /YX /Fo&quot;Debug/&quot; /Fd&quot;Debug/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;cl /nologo /DENCRYPT_ONLY /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D /D &quot;USE_LTM&quot; /Fp&quot;Debug/libtomcrypt.pch&quot; /YX /Fo&quot;Debug/aes_enc.obj&quot; /Fd&quot;Debug/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;' ],
237+
# 'Release|Win32' => [ 'Release/aes.obj;Release/aes_enc.obj', 'cl /nologo /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D /D &quot;USE_LTM&quot; /Fp&quot;Release/libtomcrypt.pch&quot; /YX /Fo&quot;Release/&quot; /Fd&quot;Release/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;cl /nologo /DENCRYPT_ONLY /MLd /W3 /Gm /GX /ZI /Od /I &quot;src\headers&quot; /I &quot;..\libtommath&quot; /D &quot;_DEBUG&quot; /D &quot;LTM_DESC&quot; /D &quot;WIN32&quot; /D &quot;_MBCS&quot; /D &quot;_LIB&quot; /D /D &quot;USE_LTM&quot; /Fp&quot;Release/libtomcrypt.pch&quot; /YX /Fo&quot;Release/aes_enc.obj&quot; /Fd&quot;Release/&quot; /FD /GZ /c $(InputPath)&#x0D;&#x0A;' ],
238238
# );
239239
# for (@$targets) {
240240
# next unless $cmd{$_};

libtomcrypt_VS2008.vcproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
Name="VCCLCompilerTool"
4747
Optimization="0"
4848
AdditionalIncludeDirectories="src\headers,..\libtommath"
49-
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_SOURCE;LTC_NO_TEST;LTC_NO_PROTOTYPES"
49+
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_NO_TEST;LTC_NO_PROTOTYPES"
5050
MinimalRebuild="true"
5151
ExceptionHandling="0"
5252
BasicRuntimeChecks="3"
@@ -123,7 +123,7 @@
123123
Optimization="2"
124124
InlineFunctionExpansion="1"
125125
AdditionalIncludeDirectories="src\headers,..\libtommath"
126-
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_SOURCE;LTC_NO_TEST;LTC_NO_PROTOTYPES"
126+
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_NO_TEST;LTC_NO_PROTOTYPES"
127127
StringPooling="true"
128128
ExceptionHandling="0"
129129
RuntimeLibrary="0"
@@ -199,7 +199,7 @@
199199
Name="VCCLCompilerTool"
200200
Optimization="0"
201201
AdditionalIncludeDirectories="src\headers,..\libtommath"
202-
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_SOURCE;LTC_NO_TEST;LTC_NO_PROTOTYPES"
202+
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_NO_TEST;LTC_NO_PROTOTYPES"
203203
MinimalRebuild="true"
204204
ExceptionHandling="0"
205205
BasicRuntimeChecks="3"
@@ -277,7 +277,7 @@
277277
Optimization="2"
278278
InlineFunctionExpansion="1"
279279
AdditionalIncludeDirectories="src\headers,..\libtommath"
280-
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_SOURCE;LTC_NO_TEST;LTC_NO_PROTOTYPES"
280+
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;LTM_DESC;LTC_NO_TEST;LTC_NO_PROTOTYPES"
281281
StringPooling="true"
282282
ExceptionHandling="0"
283283
RuntimeLibrary="0"

makefile.mingw

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CFLAGS = -O2 -DUSE_LTM -DLTM_DESC -I../libtommath
2525
EXTRALIBS = -L../libtommath -ltommath
2626

2727
#Compilation flags
28-
LTC_CFLAGS = -Isrc/headers -Itests -DLTC_SOURCE $(CFLAGS)
28+
LTC_CFLAGS = -Isrc/headers -Itests $(CFLAGS)
2929
LTC_LDFLAGS = $(LDFLAGS) $(EXTRALIBS)
3030
VERSION=1.18.2-develop
3131

makefile.msvc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CFLAGS = /Ox /DUSE_LTM /DLTM_DESC /I../libtommath
2020
EXTRALIBS = ../libtommath/tommath.lib
2121

2222
#Compilation flags
23-
LTC_CFLAGS = /nologo /Isrc/headers/ /Itests/ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /DLTC_SOURCE /W3 $(CFLAGS)
23+
LTC_CFLAGS = /nologo /Isrc/headers/ /Itests/ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /W3 $(CFLAGS)
2424
LTC_LDFLAGS = advapi32.lib $(EXTRALIBS)
2525
VERSION=1.18.2-develop
2626

makefile.unix

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ PC_CFLAGS = -DLTM_DESC
4040
PC_LIBS = -ltommath
4141

4242
#Compilation flags
43-
LTC_CFLAGS = -Isrc/headers -Itests -DLTC_SOURCE $(CFLAGS)
43+
LTC_CFLAGS = -Isrc/headers -Itests $(CFLAGS)
4444
LTC_LDFLAGS = $(LDFLAGS) $(EXTRALIBS)
4545
VERSION=1.18.2-develop
4646
VERSION_PC=1.18.2

makefile_include.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ endef
7474
# Also note that we're extending the environments' CFLAGS.
7575
# If you think that our CFLAGS are not nice you can easily override them
7676
# by giving them as a parameter to make:
77-
# make CFLAGS="-I./src/headers/ -DLTC_SOURCE ..." ...
77+
# make CFLAGS="-I./src/headers/ ..." ...
7878
#
7979
ifneq ($(shell echo $(CFLAGS) | grep LTM_DESC),)
8080
LTC_CFLAGS+=$(shell PKG_CONFIG_PATH=$(LIBPATH)/pkgconfig pkg-config --cflags-only-I libtommath ${silent_stderr} || true)
@@ -85,7 +85,7 @@ endif
8585
ifneq ($(shell echo $(CFLAGS) | grep GMP_DESC),)
8686
LTC_CFLAGS+=$(shell PKG_CONFIG_PATH=$(LIBPATH)/pkgconfig pkg-config --cflags-only-I gmp ${silent_stderr} || true)
8787
endif
88-
LTC_CFLAGS += -I./src/headers/ -DLTC_SOURCE -Wall -Wsign-compare -Wshadow
88+
LTC_CFLAGS += -I./src/headers/ -Wall -Wsign-compare -Wshadow
8989

9090
ifdef OLD_GCC
9191
LTC_CFLAGS += -W

0 commit comments

Comments
 (0)