Skip to content

Commit e8466ed

Browse files
sharma-nidhisharma-nidhi
committed
Quick : merging changes from develop
1 parent 358580b commit e8466ed

27 files changed

+202
-989
lines changed

‎Make/VS.2019/OpenSeaChest.sln‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -906,14 +906,18 @@ Global
906906
{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x64.Build.0 = Static-Release|x64
907907
{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x86.ActiveCfg = Static-Release|Win32
908908
{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x86.Build.0 = Static-Release|Win32
909-
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM.ActiveCfg = Debug|Win32
910-
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM64.ActiveCfg = Debug|Win32
909+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM.ActiveCfg = Debug|ARM
910+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM.Build.0 = Debug|ARM
911+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM64.ActiveCfg = Debug|ARM64
912+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM64.Build.0 = Debug|ARM64
911913
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|x64.ActiveCfg = Debug|x64
912914
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|x64.Build.0 = Debug|x64
913915
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|x86.ActiveCfg = Debug|Win32
914916
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|x86.Build.0 = Debug|Win32
915-
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|ARM.ActiveCfg = Release|Win32
916-
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|ARM64.ActiveCfg = Release|Win32
917+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|ARM.ActiveCfg = Release|ARM
918+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|ARM.Build.0 = Release|ARM
919+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|ARM64.ActiveCfg = Release|ARM64
920+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|ARM64.Build.0 = Release|ARM64
917921
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|x64.ActiveCfg = Release|x64
918922
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|x64.Build.0 = Release|x64
919923
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Release|x86.ActiveCfg = Release|Win32
@@ -934,14 +938,18 @@ Global
934938
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Static-Release|x64.Build.0 = Release|x64
935939
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Static-Release|x86.ActiveCfg = Static-Release|Win32
936940
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Static-Release|x86.Build.0 = Static-Release|Win32
937-
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|ARM.ActiveCfg = Debug|Win32
938-
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|ARM64.ActiveCfg = Debug|Win32
941+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|ARM.ActiveCfg = Debug|ARM
942+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|ARM.Build.0 = Debug|ARM
943+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|ARM64.ActiveCfg = Debug|ARM64
944+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|ARM64.Build.0 = Debug|ARM64
939945
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|x64.ActiveCfg = Debug|x64
940946
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|x64.Build.0 = Debug|x64
941947
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|x86.ActiveCfg = Debug|Win32
942948
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Debug|x86.Build.0 = Debug|Win32
943-
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|ARM.ActiveCfg = Release|Win32
944-
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|ARM64.ActiveCfg = Release|Win32
949+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|ARM.ActiveCfg = Release|ARM
950+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|ARM.Build.0 = Release|ARM
951+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|ARM64.ActiveCfg = Release|ARM64
952+
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|ARM64.Build.0 = Release|ARM64
945953
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|x64.ActiveCfg = Release|x64
946954
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|x64.Build.0 = Release|x64
947955
{2A5F37B2-60C0-4CCD-B43A-71FC72923ACB}.Release|x86.ActiveCfg = Release|Win32

‎Make/VS.2019/OpenSeaChest_Raw/OpenSeaChest_Raw.vcxproj‎

Lines changed: 0 additions & 280 deletions
Large diffs are not rendered by default.

‎Make/VS.2019/openSeaChest_Defect/openSeaChest_Defect.vcxproj‎

Lines changed: 0 additions & 280 deletions
Large diffs are not rendered by default.

‎Make/VS.2022/OpenSeaChest.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,7 @@ Global
907907
{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x86.ActiveCfg = Static-Release|Win32
908908
{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x86.Build.0 = Static-Release|Win32
909909
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM.ActiveCfg = Debug|ARM
910+
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM.Build.0 = Debug|ARM
910911
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM64.ActiveCfg = Debug|ARM64
911912
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|ARM64.Build.0 = Debug|ARM64
912913
{A275B070-D641-414D-AE6A-7796F6D6BE2A}.Debug|x64.ActiveCfg = Debug|x64

‎Make/VS.2022/OpenSeaChest_Raw/OpenSeaChest_Raw.vcxproj‎

Lines changed: 0 additions & 284 deletions
Large diffs are not rendered by default.

‎Make/gcc/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ export PROJECT_DEFINES
342342
json-c:
343343
../buildjsonc.sh build $(CC)
344344

345+
#wingetopt has a GNUMakefile that should be automatically found.
346+
#it has CMake and meson support too, which are preferred
345347
wingetopt:
346348
$(MAKE) -C ../../subprojects/wingetopt
347349

‎Make/gccWin/Makefile.gccWin‎

Lines changed: 55 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,16 @@ LDLIBS = \
5555
../../subprojects/opensea-common/Make/gccWin/$(LIB_FILE_OUTPUT_DIR)/libopensea-common.a \
5656
../../subprojects/wingetopt/lib/libwingetopt.a
5757

58-
LIBJSONFORMATLFLAGS ?= \
59-
../../subprojects/opensea-jsonformat/Make/gccWin/$(LIB_FILE_OUTPUT_DIR)/libopensea-jsonformat.a \
60-
../../subprojects/json-c/buildwin/libjson-c.a
58+
#NOTE: Additional LFLAGS for JSON format output support
59+
LIBJSONFORMATLFLAGS =
60+
6161
INC_DIR= \
6262
-I../../subprojects/opensea-common/include \
6363
-I../../subprojects/opensea-transport/include \
6464
-I../../subprojects/opensea-transport/include/vendor \
65-
-I../../include \
6665
-I../../subprojects/opensea-operations/include \
67-
-I../../subprojects/wingetopt/src \
68-
-I../../subprojects/opensea-jsonformat/include \
69-
-I../../subprojects/json-c \
70-
-I../../subprojects/json-c/buildwin \
66+
-I../../include \
67+
-I../../subprojects/wingetopt/src
7168

7269
ifneq (,$(findstring MINGW64,$(UNAME)))
7370
#CFLAGS += -mno-ms-bitfields
@@ -83,6 +80,18 @@ MACHINE := $(shell uname -m)
8380
ifeq ($(MACHINE), x86_64)
8481
endif
8582

83+
ifeq (1,$(JSONOUTPUTSUPPORT))
84+
85+
LIBJSONFORMATLFLAGS += \
86+
../../subprojects/opensea-jsonformat/Make/gcc/$(LIB_FILE_OUTPUT_DIR)/libopensea-jsonformat.a \
87+
../../subprojects/json-c/build/libjson-c.a
88+
89+
INC_DIR += -I../../subprojects/json-c \
90+
-I../../subprojects/json-c/build \
91+
-I../../subprojects/opensea-jsonformat/include
92+
93+
endif
94+
8695
FILE_OUTPUT_DIR=openseachest_exes
8796

8897
#Files for the final binary
@@ -207,6 +216,10 @@ ifneq (,$(findstring MINGW64,$(UNAME)))
207216
# PROJECT_DEFINES += -D_WIN32_WINNT=0x0601
208217
endif
209218

219+
ifeq (1,$(JSONOUTPUTSUPPORT))
220+
PROJECT_DEFINES += -DFEATURE_JSONOUTPUT_SUPPORT
221+
endif
222+
210223
.PHONY: clean clean_all all
211224
all: clean_all release
212225

@@ -237,7 +250,11 @@ debug: SMARTOUTFILE := $(SMARTOUTFILE)_dbg.exe
237250
debug: ZBDOUTFILE := $(ZBDOUTFILE)_dbg.exe
238251
debug: PASSTHROUGHTESTOUTFILE := $(PASSTHROUGHTESTOUTFILE)_dbg.exe
239252
debug: RESERVATIONSOUTFILE := $(RESERVATIONSOUTFILE)_dbg.exe
240-
debug: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
253+
ifeq (1,$(JSONOUTPUTSUPPORT))
254+
debug: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
255+
else
256+
debug: mkoutputdir wingetopt opensea-libs $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
257+
endif
241258

242259
static-debug: CXXFLAGS += -g
243260
static-debug: CFLAGS += -g
@@ -258,7 +275,11 @@ static-debug: SMARTOUTFILE := $(SMARTOUTFILE)_static_dbg.exe
258275
static-debug: ZBDOUTFILE := $(ZBDOUTFILE)_static_dbg.exe
259276
static-debug: PASSTHROUGHTESTOUTFILE := $(PASSTHROUGHTESTOUTFILE)_static_dbg.exe
260277
static-debug: RESERVATIONSOUTFILE := $(RESERVATIONSOUTFILE)_static_dbg.exe
261-
static-debug: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
278+
ifeq (1,$(JSONOUTPUTSUPPORT))
279+
static-debug: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
280+
else
281+
static-debug: mkoutputdir wingetopt opensea-libs $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
282+
endif
262283

263284
release: CXXFLAGS += -O3
264285
release: CFLAGS += -O3
@@ -277,7 +298,11 @@ release: SMARTOUTFILE := $(SMARTOUTFILE).exe
277298
release: ZBDOUTFILE := $(ZBDOUTFILE).exe
278299
release: PASSTHROUGHTESTOUTFILE := $(PASSTHROUGHTESTOUTFILE).exe
279300
release: RESERVATIONSOUTFILE := $(RESERVATIONSOUTFILE).exe
280-
release: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
301+
ifeq (1,$(JSONOUTPUTSUPPORT))
302+
release: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
303+
else
304+
release: mkoutputdir wingetopt opensea-libs $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
305+
endif
281306

282307
static-release: CXXFLAGS += -O3
283308
static-release: CFLAGS += -O3
@@ -299,7 +324,11 @@ static-release: SMARTOUTFILE := $(SMARTOUTFILE)_static.exe
299324
static-release: ZBDOUTFILE := $(ZBDOUTFILE)_static.exe
300325
static-release: PASSTHROUGHTESTOUTFILE := $(PASSTHROUGHTESTOUTFILE)_static.exe
301326
static-release: RESERVATIONSOUTFILE := $(RESERVATIONSOUTFILE)_static.exe
302-
static-release: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
327+
ifeq (1,$(JSONOUTPUTSUPPORT))
328+
static-release: mkoutputdir wingetopt json-c opensea-libs seajsonformat $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
329+
else
330+
static-release: mkoutputdir wingetopt opensea-libs $(BASICSOUTFILE) $(CONFIGUREOUTFILE) $(ERASEOUTFILE) $(FIRMWAREOUTFILE) $(GENERICTESTSOUTFILE) $(FORMATOUTFILE) $(INFOOUTFILE) $(LOGSOUTFILE) $(NVMEOUTFILE) $(POWERCONTROLOUTFILE) $(SMARTOUTFILE) $(SECURITYOUTFILE) $(ZBDOUTFILE) $(PASSTHROUGHTESTOUTFILE) $(RESERVATIONSOUTFILE)
331+
endif
303332

304333
export CFLAGS
305334
export CXXFLAGS
@@ -313,7 +342,6 @@ json-c:
313342
wingetopt:
314343
$(MAKE) -C ../../subprojects/wingetopt
315344

316-
317345
opensea-libs:
318346
$(MAKE) -C ../../subprojects/opensea-common/Make/gccWin -f Makefile.gccWin
319347
$(MAKE) -C ../../subprojects/opensea-transport/Make/gccWin -f Makefile.gccWin
@@ -325,20 +353,19 @@ seajsonformat:
325353
#basics
326354
ifneq (,$(findstring basics,$(BUILD_ALL)))
327355
$(BASICSOUTFILE): $(BASICSOBJS)
328-
$(CC) $(BASICSOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(BASICSOUTFILE)
356+
$(CC) $(BASICSOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(BASICSOUTFILE)
329357
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(BASICSOUTFILE)
330358
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(BASICSOUTFILE)
331359
endif
332360

333361
#security
334362
ifneq (,$(findstring security,$(BUILD_ALL)))
335363
$(SECURITYOUTFILE): $(SECURITYOBJS)
336-
$(CC) $(SECURITYOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(SECURITYOUTFILE)
364+
$(CC) $(SECURITYOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(SECURITYOUTFILE)
337365
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(SECURITYOUTFILE)
338366
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(SECURITYOUTFILE)
339367
endif
340368

341-
342369
#configure
343370
ifneq (,$(findstring configure,$(BUILD_ALL)))
344371
$(CONFIGUREOUTFILE): $(CONFIGUREOBJS)
@@ -351,35 +378,35 @@ endif
351378
ifneq (,$(findstring erase,$(BUILD_ALL)))
352379
$(ERASEOUTFILE): $(ERASEOBJS)
353380
ifneq (,$(findstring DISABLE_TCG_SUPPORT,$(PROJECT_DEFINES)))
354-
$(CC) $(ERASEOBJS) $(PROJECT_DEFINES) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(ERASEOUTFILE)
381+
$(CC) $(ERASEOBJS) $(PROJECT_DEFINES) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(ERASEOUTFILE)
355382
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(ERASEOUTFILE)
356383
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(ERASEOUTFILE)
357384
else
358-
# $(CC) $(ERASEOBJS) $(TCGLFLAGS) -o $(FILE_OUTPUT_DIR)/$(ERASEOUTFILE)
385+
# $(CC) $(ERASEOBJS) $(LIBJSONFORMATLFLAGS) $(TCGLFLAGS) -o $(FILE_OUTPUT_DIR)/$(ERASEOUTFILE)
359386
# $(STRIP) -s $(FILE_OUTPUT_DIR)/$(ERASEOUTFILE)
360387
endif
361388
endif
362389

363390
#firmware
364391
ifneq (,$(findstring firmware,$(BUILD_ALL)))
365392
$(FIRMWAREOUTFILE): $(FIRMWAREOBJS)
366-
$(CC) $(FIRMWAREOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(FIRMWAREOUTFILE)
393+
$(CC) $(FIRMWAREOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(FIRMWAREOUTFILE)
367394
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(FIRMWAREOUTFILE)
368395
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(FIRMWAREOUTFILE)
369396
endif
370397

371398
#format
372399
ifneq (,$(findstring format,$(BUILD_ALL)))
373400
$(FORMATOUTFILE): $(FORMATOBJS)
374-
$(CC) $(FORMATOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(FORMATOUTFILE)
401+
$(CC) $(FORMATOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(FORMATOUTFILE)
375402
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(FORMATOUTFILE)
376403
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(FORMATOUTFILE)
377404
endif
378405

379406
#generictests
380407
ifneq (,$(findstring generictests,$(BUILD_ALL)))
381408
$(GENERICTESTSOUTFILE) : $(GENERICTESTSOBJS)
382-
$(CC) $(GENERICTESTSOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(GENERICTESTSOUTFILE)
409+
$(CC) $(GENERICTESTSOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(GENERICTESTSOUTFILE)
383410
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(GENERICTESTSOUTFILE)
384411
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(GENERICTESTSOUTFILE)
385412
endif
@@ -395,55 +422,55 @@ endif
395422
#logs
396423
ifneq (,$(findstring logs,$(BUILD_ALL)))
397424
$(LOGSOUTFILE): $(LOGSOBJS)
398-
$(CC) $(LOGSOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(LOGSOUTFILE)
425+
$(CC) $(LOGSOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(LOGSOUTFILE)
399426
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(LOGSOUTFILE)
400427
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(LOGSOUTFILE)
401428
endif
402429

403430
#nvme
404431
ifneq (,$(findstring nvme,$(BUILD_ALL)))
405432
$(NVMEOUTFILE): $(NVMEOBJS)
406-
$(CC) $(NVMEOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(NVMEOUTFILE)
433+
$(CC) $(NVMEOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(NVMEOUTFILE)
407434
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(NVMEOUTFILE)
408435
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(NVMEOUTFILE)
409436
endif
410437

411438
#powercontrol
412439
ifneq (,$(findstring powercontrol,$(BUILD_ALL)))
413440
$(POWERCONTROLOUTFILE) : $(POWERCONTROLOBJS)
414-
$(CC) $(POWERCONTROLOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(POWERCONTROLOUTFILE)
441+
$(CC) $(POWERCONTROLOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(POWERCONTROLOUTFILE)
415442
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(POWERCONTROLOUTFILE)
416443
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(POWERCONTROLOUTFILE)
417444
endif
418445

419446
#smart
420447
ifneq (,$(findstring smart,$(BUILD_ALL)))
421448
$(SMARTOUTFILE): $(SMARTOBJS)
422-
$(CC) $(SMARTOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(SMARTOUTFILE)
449+
$(CC) $(SMARTOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(SMARTOUTFILE)
423450
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(SMARTOUTFILE)
424451
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(SMARTOUTFILE)
425452
endif
426453

427454
#zbd
428455
ifneq (,$(findstring zbd,$(BUILD_ALL)))
429456
$(ZBDOUTFILE): $(ZBDOBJS)
430-
$(CC) $(ZBDOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(ZBDOUTFILE)
457+
$(CC) $(ZBDOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(ZBDOUTFILE)
431458
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(ZBDOUTFILE)
432459
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(ZBDOUTFILE)
433460
endif
434461

435462
#passthrough
436463
ifneq (,$(findstring passthrough,$(BUILD_ALL)))
437464
$(PASSTHROUGHTESTOUTFILE): $(PASSTHROUGHTESTOBJS)
438-
$(CC) $(PASSTHROUGHTESTOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(PASSTHROUGHTESTOUTFILE)
465+
$(CC) $(PASSTHROUGHTESTOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(PASSTHROUGHTESTOUTFILE)
439466
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(PASSTHROUGHTESTOUTFILE)
440467
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(PASSTHROUGHTESTOUTFILE)
441468
endif
442469

443470
#reservations
444471
ifneq (,$(findstring reservations,$(BUILD_ALL)))
445472
$(RESERVATIONSOUTFILE): $(RESERVATIONSOBJS)
446-
$(CC) $(RESERVATIONSOBJS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(RESERVATIONSOUTFILE)
473+
$(CC) $(RESERVATIONSOBJS) $(LIBJSONFORMATLFLAGS) $(LDFLAGS) $(LDLIBS) -o $(FILE_OUTPUT_DIR)/$(RESERVATIONSOUTFILE)
447474
$(STRIP) -s $(FILE_OUTPUT_DIR)/$(RESERVATIONSOUTFILE)
448475
#sh rename_seachest.sh $(FILE_OUTPUT_DIR)/$(RESERVATIONSOUTFILE)
449476
endif

0 commit comments

Comments
 (0)