linux compilation with new build tree (43f48d94) · Commits · ITS - Intelligent Transport Systems / ITS

.gitignore

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.

100755 → 100644

+8 −4

Changes for Makefile: 8 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,9 +7,9 @@ ifeq (,$(TOPDIR))
		TOPDIR := .
		endif

		#ifeq (,$(TTCN3_DIR))
		ifeq (,$(TTCN3_DIR))
		TTCN3_DIR := /cygdrive/c/Tools/Titan
		#endif
		endif

		#ifeq (,$(OPENSSL_DIR))
		# OPENSSL_DIR := C:/Tools/OpenSSL/Win64
		@@ -29,14 +29,18 @@ all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework
		defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS)
		libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs

		#ifneq (,$(windir))
		ifneq (,$(windir))
		# Silence linker warnings.
		LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc
		defines += WIN32
		libs += $(patsubst %, -L%/lib, $(OPENSSL_DIR))
		all_includes += $(addsuffix /include, $(OPENSSL_DIR))
		libs += /cygdrive/c/windows/system32/npcap/wpcap.dll
		#endif
		else
		defines += LINUX
		libs += -lpcap -lrt -lpthread
		endif

		libs += -lssl -lcrypto -lxml2

		$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS)))

100755 → 100644

+1 −1

Changes for asn1/Makefile: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ ASN_FILES = CAM/CAM_PDU_Descriptions.asn \
		Security/1609Dot2/IEEE1609dot2.asn \
		Security/1609Dot2/IEEE1609dot2BaseTypes.asn \
		Security/TS102921/EtsiTs102941BaseTypes.asn \
		Security/TS102921/EtsiTs102941MessagesCA.asn \
		Security/TS102921/EtsiTs102941MessagesCa.asn \
		Security/TS102921/EtsiTs102941TrustLists.asn \
		Security/TS102921/EtsiTs102941TypesAuthorization.asn \
		Security/TS102921/EtsiTs102941TypesAuthorizationValidation.asn \

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.