From 728886e38902d3133f2d94e59387d87fe800ace6 Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 20 Sep 2021 21:48:02 +0300 Subject: Move files to match other projects --- gctest/solution/genie.lua | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 gctest/solution/genie.lua (limited to 'gctest/solution/genie.lua') diff --git a/gctest/solution/genie.lua b/gctest/solution/genie.lua new file mode 100644 index 0000000..2f56616 --- /dev/null +++ b/gctest/solution/genie.lua @@ -0,0 +1,56 @@ +solution 'gctest' + if _ACTION ~= 'jcdb' then + platforms { 'x32', 'x64' } + configurations {'Debug', 'Release'} + else + configurations {'Debug'} + end + flags { + 'FatalWarnings', + 'ExtraWarnings', + 'Cpp17', + 'Symbols', + } + defines { + '_SCL_SECURE_NO_WARNINGS', + '_CRT_SECURE_NO_WARNINGS', + 'MTR_ENABLED', + } + + local root = '../build/' + + configuration 'Debug' + targetdir(root .. 'bin/Debug') + objdir(root .. 'obj/Debug') + + configuration 'Release' + flags 'OptimizeSpeed' + targetdir(root .. 'bin/Release') + objdir(root .. 'obj/Release') + -- GCC generates a warning for uninitialized data in + -- std::normal_distribution + configuration 'gcc' + removeflags 'ExtraWarnings' + configuration '*' + + project 'test_bench' + kind 'StaticLib' + language 'C++' + files { + '../src/main.cpp', + '../src/minitrace.cpp', + } + removeflags 'ExtraWarnings' + + project 'leak_gc' + kind 'ConsoleApp' + language 'C++' + files '../src/gc_leak.cpp' + links 'test_bench' + + project 'dummy_gc' + kind 'ConsoleApp' + language 'C++' + files '../src/gc_dummy.cpp' + links 'test_bench' + -- cgit v1.3.1-26-gb76a From 107e06f9403d0ad26a04a099b45c2d746ef08c6f Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 20 Sep 2021 22:09:59 +0300 Subject: Include gctest to the main solution --- JSImpl/solution/genie.lua | 3 +++ appveyor.yml | 5 +---- gctest/solution/genie.lua | 25 ++++++++++++++++++++----- 3 files changed, 24 insertions(+), 9 deletions(-) (limited to 'gctest/solution/genie.lua') diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua index e3720a4..5d36fc8 100644 --- a/JSImpl/solution/genie.lua +++ b/JSImpl/solution/genie.lua @@ -49,3 +49,6 @@ solution 'JSImpl' group 'Spasm' include '../../spasm/solution/' + + group 'gctest' + include '../../gctest/solution/' diff --git a/appveyor.yml b/appveyor.yml index eb21f68..9cde8fd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,9 +18,7 @@ platform: - x64 build: - project: - - JSImpl/solution/JSImpl.sln - - gctest/solution/gctest.sln + project: JSImpl/solution/JSImpl.sln verbosity: minimal parallel: true @@ -31,7 +29,6 @@ for: - image: Ubuntu build_script: - make -C $APPVEYOR_BUILD_FOLDER/JSImpl/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/x64/64/'` - - make -C $APPVEYOR_BUILD_FOLDER/gctest/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/x64/64/'` test_script: - '$APPVEYOR_BUILD_FOLDER/JSImpl/build/bin/$CONFIGURATION/Test' after_test: diff --git a/gctest/solution/genie.lua b/gctest/solution/genie.lua index 2f56616..a63f1f5 100644 --- a/gctest/solution/genie.lua +++ b/gctest/solution/genie.lua @@ -1,20 +1,20 @@ -solution 'gctest' +if not solution() then + solution 'gctest' if _ACTION ~= 'jcdb' then platforms { 'x32', 'x64' } configurations {'Debug', 'Release'} else configurations {'Debug'} + platforms { 'x64' } end flags { 'FatalWarnings', 'ExtraWarnings', - 'Cpp17', 'Symbols', } + defines { - '_SCL_SECURE_NO_WARNINGS', - '_CRT_SECURE_NO_WARNINGS', - 'MTR_ENABLED', + '_SCL_SECURE_NO_WARNINGS', } local root = '../build/' @@ -27,11 +27,23 @@ solution 'gctest' flags 'OptimizeSpeed' targetdir(root .. 'bin/Release') objdir(root .. 'obj/Release') + configuration '*' +end + +function setup() + flags 'Cpp17' + defines { + '_SCL_SECURE_NO_WARNINGS', + '_CRT_SECURE_NO_WARNINGS', + 'MTR_ENABLED', + } + -- GCC generates a warning for uninitialized data in -- std::normal_distribution configuration 'gcc' removeflags 'ExtraWarnings' configuration '*' +end project 'test_bench' kind 'StaticLib' @@ -41,16 +53,19 @@ solution 'gctest' '../src/minitrace.cpp', } removeflags 'ExtraWarnings' + setup() project 'leak_gc' kind 'ConsoleApp' language 'C++' files '../src/gc_leak.cpp' links 'test_bench' + setup() project 'dummy_gc' kind 'ConsoleApp' language 'C++' files '../src/gc_dummy.cpp' links 'test_bench' + setup() -- cgit v1.3.1-26-gb76a From 9ee40497ba76829317352ae537e9bcab0a7b043e Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Tue, 21 Sep 2021 21:57:18 +0300 Subject: Fix build for Linux --- gctest/solution/dummy_gc.make | 8 ++++---- gctest/solution/dummy_gc.vcxproj | 16 ++++++++-------- gctest/solution/genie.lua | 1 + gctest/solution/leak_gc.make | 8 ++++---- gctest/solution/leak_gc.vcxproj | 16 ++++++++-------- gctest/solution/test_bench.make | 8 ++++---- gctest/solution/test_bench.vcxproj | 16 ++++++++-------- gctest/src/main.cpp | 4 ++-- gctest/src/minitrace/minitrace.c | 2 +- 9 files changed, 40 insertions(+), 39 deletions(-) (limited to 'gctest/solution/genie.lua') diff --git a/gctest/solution/dummy_gc.make b/gctest/solution/dummy_gc.make index e430d1c..7b308c8 100644 --- a/gctest/solution/dummy_gc.make +++ b/gctest/solution/dummy_gc.make @@ -46,7 +46,7 @@ ifeq ($(config),debug32) OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/dummy_gc TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/dummy_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 @@ -78,7 +78,7 @@ ifeq ($(config),release32) OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/dummy_gc TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/dummy_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 @@ -110,7 +110,7 @@ ifeq ($(config),debug64) OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/dummy_gc TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/dummy_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 @@ -142,7 +142,7 @@ ifeq ($(config),release64) OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/dummy_gc TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/dummy_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 diff --git a/gctest/solution/dummy_gc.vcxproj b/gctest/solution/dummy_gc.vcxproj index 5ca36a1..f10ece1 100644 --- a/gctest/solution/dummy_gc.vcxproj +++ b/gctest/solution/dummy_gc.vcxproj @@ -106,7 +106,7 @@ %(AdditionalOptions) Disabled - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true EnableFastChecks @@ -121,7 +121,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console @@ -137,7 +137,7 @@ %(AdditionalOptions) Disabled - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true EnableFastChecks @@ -152,7 +152,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console @@ -168,7 +168,7 @@ %(AdditionalOptions) MaxSpeed - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true true @@ -183,7 +183,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console @@ -201,7 +201,7 @@ %(AdditionalOptions) MaxSpeed - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true true @@ -216,7 +216,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console diff --git a/gctest/solution/genie.lua b/gctest/solution/genie.lua index a63f1f5..8a1473a 100644 --- a/gctest/solution/genie.lua +++ b/gctest/solution/genie.lua @@ -35,6 +35,7 @@ function setup() defines { '_SCL_SECURE_NO_WARNINGS', '_CRT_SECURE_NO_WARNINGS', + '_CRT_NONSTDC_NO_WARNINGS', -- for strdup in minitrace.c 'MTR_ENABLED', } diff --git a/gctest/solution/leak_gc.make b/gctest/solution/leak_gc.make index 2cb1381..4414edf 100644 --- a/gctest/solution/leak_gc.make +++ b/gctest/solution/leak_gc.make @@ -46,7 +46,7 @@ ifeq ($(config),debug32) OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/leak_gc TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/leak_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 @@ -78,7 +78,7 @@ ifeq ($(config),release32) OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/leak_gc TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/leak_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 @@ -110,7 +110,7 @@ ifeq ($(config),debug64) OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/leak_gc TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/leak_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 @@ -142,7 +142,7 @@ ifeq ($(config),release64) OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/leak_gc TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/leak_gc - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 diff --git a/gctest/solution/leak_gc.vcxproj b/gctest/solution/leak_gc.vcxproj index cccba6f..eeba8db 100644 --- a/gctest/solution/leak_gc.vcxproj +++ b/gctest/solution/leak_gc.vcxproj @@ -106,7 +106,7 @@ %(AdditionalOptions) Disabled - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true EnableFastChecks @@ -121,7 +121,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console @@ -137,7 +137,7 @@ %(AdditionalOptions) Disabled - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true EnableFastChecks @@ -152,7 +152,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console @@ -168,7 +168,7 @@ %(AdditionalOptions) MaxSpeed - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true true @@ -183,7 +183,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console @@ -201,7 +201,7 @@ %(AdditionalOptions) MaxSpeed - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true true @@ -216,7 +216,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) Console diff --git a/gctest/solution/test_bench.make b/gctest/solution/test_bench.make index 9a503a5..f58b981 100644 --- a/gctest/solution/test_bench.make +++ b/gctest/solution/test_bench.make @@ -46,7 +46,7 @@ ifeq ($(config),debug32) OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/test_bench TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/libtest_bench.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 @@ -79,7 +79,7 @@ ifeq ($(config),release32) OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/test_bench TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/libtest_bench.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 @@ -112,7 +112,7 @@ ifeq ($(config),debug64) OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/test_bench TARGETDIR = ../../JSImpl/build/bin/Debug TARGET = $(TARGETDIR)/libtest_bench.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 @@ -145,7 +145,7 @@ ifeq ($(config),release64) OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/test_bench TARGETDIR = ../../JSImpl/build/bin/Release TARGET = $(TARGETDIR)/libtest_bench.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 diff --git a/gctest/solution/test_bench.vcxproj b/gctest/solution/test_bench.vcxproj index 6ea8e11..5625175 100644 --- a/gctest/solution/test_bench.vcxproj +++ b/gctest/solution/test_bench.vcxproj @@ -102,7 +102,7 @@ %(AdditionalOptions) Disabled - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true EnableFastChecks @@ -117,7 +117,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) $(OutDir)test_bench.lib @@ -133,7 +133,7 @@ %(AdditionalOptions) Disabled - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true EnableFastChecks @@ -148,7 +148,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) $(OutDir)test_bench.lib @@ -164,7 +164,7 @@ %(AdditionalOptions) MaxSpeed - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true true @@ -179,7 +179,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) $(OutDir)test_bench.lib @@ -197,7 +197,7 @@ %(AdditionalOptions) MaxSpeed - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) false true true @@ -212,7 +212,7 @@ Caret - _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) $(OutDir)test_bench.lib diff --git a/gctest/src/main.cpp b/gctest/src/main.cpp index dd9a137..03e7ef8 100644 --- a/gctest/src/main.cpp +++ b/gctest/src/main.cpp @@ -383,8 +383,8 @@ int main(int argc, char* argv[]) if (RecycledObject::Alive) { - std::fprintf(stderr, "%lld objects leaked\n", - (uint64_t)RecycledObject::Alive); + std::fprintf(stderr, "%zu objects leaked\n", + RecycledObject::Alive.load()); } mtr_shutdown(); diff --git a/gctest/src/minitrace/minitrace.c b/gctest/src/minitrace/minitrace.c index d0cec8f..3d8e7fd 100644 --- a/gctest/src/minitrace/minitrace.c +++ b/gctest/src/minitrace/minitrace.c @@ -472,7 +472,7 @@ void internal_mtr_raw_event_arg(const char *category, const char *name, char ph, switch (arg_type) { case MTR_ARG_TYPE_INT: ev->a_int = (int)(uintptr_t)arg_value; break; case MTR_ARG_TYPE_STRING_CONST: ev->a_str = (const char*)arg_value; break; - case MTR_ARG_TYPE_STRING_COPY: ev->a_str = _strdup((const char*)arg_value); break; + case MTR_ARG_TYPE_STRING_COPY: ev->a_str = strdup((const char*)arg_value); break; case MTR_ARG_TYPE_NONE: break; } -- cgit v1.3.1-26-gb76a