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') 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 32d99d085ae31727df22216a16116555bd640d0b Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 20 Sep 2021 21:52:36 +0300 Subject: Visual Studio and make file for gctest --- gctest/solution/Makefile | 48 ++++++ gctest/solution/dummy_gc.make | 243 +++++++++++++++++++++++++++ gctest/solution/dummy_gc.vcxproj | 245 +++++++++++++++++++++++++++ gctest/solution/dummy_gc.vcxproj.filters | 13 ++ gctest/solution/gctest.sln | 54 ++++++ gctest/solution/leak_gc.make | 243 +++++++++++++++++++++++++++ gctest/solution/leak_gc.vcxproj | 245 +++++++++++++++++++++++++++ gctest/solution/leak_gc.vcxproj.filters | 13 ++ gctest/solution/test_bench.make | 256 +++++++++++++++++++++++++++++ gctest/solution/test_bench.vcxproj | 238 +++++++++++++++++++++++++++ gctest/solution/test_bench.vcxproj.filters | 16 ++ 11 files changed, 1614 insertions(+) create mode 100644 gctest/solution/Makefile create mode 100644 gctest/solution/dummy_gc.make create mode 100644 gctest/solution/dummy_gc.vcxproj create mode 100644 gctest/solution/dummy_gc.vcxproj.filters create mode 100644 gctest/solution/gctest.sln create mode 100644 gctest/solution/leak_gc.make create mode 100644 gctest/solution/leak_gc.vcxproj create mode 100644 gctest/solution/leak_gc.vcxproj.filters create mode 100644 gctest/solution/test_bench.make create mode 100644 gctest/solution/test_bench.vcxproj create mode 100644 gctest/solution/test_bench.vcxproj.filters (limited to 'gctest/solution') diff --git a/gctest/solution/Makefile b/gctest/solution/Makefile new file mode 100644 index 0000000..fbc272e --- /dev/null +++ b/gctest/solution/Makefile @@ -0,0 +1,48 @@ +# GNU Make solution makefile autogenerated by GENie +# Type "make help" for usage help + +ifndef config + config=debug32 +endif +export config + +PROJECTS := dummy_gc leak_gc test_bench + +.PHONY: all clean help $(PROJECTS) + +all: $(PROJECTS) + +test_bench: + @echo "==== Building test_bench ($(config)) ====" + @${MAKE} --no-print-directory -C . -f test_bench.make + +leak_gc: test_bench + @echo "==== Building leak_gc ($(config)) ====" + @${MAKE} --no-print-directory -C . -f leak_gc.make + +dummy_gc: test_bench + @echo "==== Building dummy_gc ($(config)) ====" + @${MAKE} --no-print-directory -C . -f dummy_gc.make + +clean: + @${MAKE} --no-print-directory -C . -f test_bench.make clean + @${MAKE} --no-print-directory -C . -f leak_gc.make clean + @${MAKE} --no-print-directory -C . -f dummy_gc.make clean + +help: + @echo "Usage: make [config=name] [target]" + @echo "" + @echo "CONFIGURATIONS:" + @echo " debug32" + @echo " release32" + @echo " debug64" + @echo " release64" + @echo "" + @echo "TARGETS:" + @echo " all (default)" + @echo " clean" + @echo " test_bench" + @echo " leak_gc" + @echo " dummy_gc" + @echo "" + @echo "For more information, see https://github.com/bkaradzic/genie" diff --git a/gctest/solution/dummy_gc.make b/gctest/solution/dummy_gc.make new file mode 100644 index 0000000..fd8997d --- /dev/null +++ b/gctest/solution/dummy_gc.make @@ -0,0 +1,243 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = dummy_gc.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/dummy_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/dummy_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/dummy_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/dummy_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/dummy_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/dummy_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/dummy_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/dummy_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Linking dummy_gc + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning dummy_gc +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" +endif + +ifneq (,$(OBJRESP)) +$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +ifneq (,$(LDRESP)) +$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +$(OBJDIR)/src/gc_dummy.o: ../src/gc_dummy.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/gctest/solution/dummy_gc.vcxproj b/gctest/solution/dummy_gc.vcxproj new file mode 100644 index 0000000..db98b09 --- /dev/null +++ b/gctest/solution/dummy_gc.vcxproj @@ -0,0 +1,245 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293} + dummy_gc + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + Application + true + v142 + x64 + true + + + 16.0 + Application + true + v142 + x64 + true + + + 16.0 + Application + false + v142 + x64 + true + + + 16.0 + Application + false + v142 + x64 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\dummy_gc\ + dummy_gc + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\dummy_gc\ + dummy_gc + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\dummy_gc\ + dummy_gc + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\dummy_gc\ + dummy_gc + .exe + false + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX64 + + + + + + + + + {A41847E7-90D0-8834-F9D7-6190E5AE2325} + + + + + + diff --git a/gctest/solution/dummy_gc.vcxproj.filters b/gctest/solution/dummy_gc.vcxproj.filters new file mode 100644 index 0000000..f8d3d44 --- /dev/null +++ b/gctest/solution/dummy_gc.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {2DAB880B-99B4-887C-2230-9F7C8E38947C} + + + + + src + + + diff --git a/gctest/solution/gctest.sln b/gctest/solution/gctest.sln new file mode 100644 index 0000000..c9b58c0 --- /dev/null +++ b/gctest/solution/gctest.sln @@ -0,0 +1,54 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}" + ProjectSection(ProjectDependencies) = postProject + {A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}" + ProjectSection(ProjectDependencies) = postProject + {A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.ActiveCfg = Debug|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.Build.0 = Debug|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.ActiveCfg = Debug|x64 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.Build.0 = Debug|x64 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.ActiveCfg = Release|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.Build.0 = Release|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.ActiveCfg = Release|x64 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.Build.0 = Release|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.Build.0 = Debug|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.ActiveCfg = Debug|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.Build.0 = Debug|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.ActiveCfg = Release|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.Build.0 = Release|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.ActiveCfg = Release|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.Build.0 = Release|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.Build.0 = Debug|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.ActiveCfg = Debug|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.Build.0 = Debug|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.ActiveCfg = Release|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.Build.0 = Release|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.ActiveCfg = Release|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + EndGlobalSection +EndGlobal diff --git a/gctest/solution/leak_gc.make b/gctest/solution/leak_gc.make new file mode 100644 index 0000000..c29f8ea --- /dev/null +++ b/gctest/solution/leak_gc.make @@ -0,0 +1,243 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = leak_gc.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/leak_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/leak_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/leak_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/leak_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/leak_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/leak_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/leak_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/leak_gc.exe + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Linking leak_gc + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning leak_gc +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" +endif + +ifneq (,$(OBJRESP)) +$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +ifneq (,$(LDRESP)) +$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +$(OBJDIR)/src/gc_leak.o: ../src/gc_leak.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/gctest/solution/leak_gc.vcxproj b/gctest/solution/leak_gc.vcxproj new file mode 100644 index 0000000..bf4ea47 --- /dev/null +++ b/gctest/solution/leak_gc.vcxproj @@ -0,0 +1,245 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C} + leak_gc + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + Application + true + v142 + x64 + true + + + 16.0 + Application + true + v142 + x64 + true + + + 16.0 + Application + false + v142 + x64 + true + + + 16.0 + Application + false + v142 + x64 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\leak_gc\ + leak_gc + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\leak_gc\ + leak_gc + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\leak_gc\ + leak_gc + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\leak_gc\ + leak_gc + .exe + false + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX64 + + + + + + + + + {A41847E7-90D0-8834-F9D7-6190E5AE2325} + + + + + + diff --git a/gctest/solution/leak_gc.vcxproj.filters b/gctest/solution/leak_gc.vcxproj.filters new file mode 100644 index 0000000..8e2c3bc --- /dev/null +++ b/gctest/solution/leak_gc.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {2DAB880B-99B4-887C-2230-9F7C8E38947C} + + + + + src + + + diff --git a/gctest/solution/test_bench.make b/gctest/solution/test_bench.make new file mode 100644 index 0000000..9229102 --- /dev/null +++ b/gctest/solution/test_bench.make @@ -0,0 +1,256 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = test_bench.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/test_bench + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/main.o \ + $(OBJDIR)/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/test_bench + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/main.o \ + $(OBJDIR)/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/test_bench + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/main.o \ + $(OBJDIR)/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/test_bench + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_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 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/main.o \ + $(OBJDIR)/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Archiving test_bench +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) +endif + $(SILENT) $(LINKCMD) $(LINKOBJS) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning test_bench +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" +endif + +ifneq (,$(OBJRESP)) +$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +ifneq (,$(LDRESP)) +$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +$(OBJDIR)/src/main.o: ../src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/src/minitrace.o: ../src/minitrace.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/gctest/solution/test_bench.vcxproj b/gctest/solution/test_bench.vcxproj new file mode 100644 index 0000000..3c6a9b1 --- /dev/null +++ b/gctest/solution/test_bench.vcxproj @@ -0,0 +1,238 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A41847E7-90D0-8834-F9D7-6190E5AE2325} + test_bench + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + StaticLibrary + true + v142 + x64 + true + + + 16.0 + StaticLibrary + true + v142 + x64 + true + + + 16.0 + StaticLibrary + false + v142 + x64 + true + + + 16.0 + StaticLibrary + false + v142 + x64 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\test_bench\ + test_bench + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\test_bench\ + test_bench + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\test_bench\ + test_bench + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\test_bench\ + test_bench + .lib + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level3 + true + stdcpp17 + EditAndContinue + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX86 + + + Windows + true + $(OutDir)test_bench.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level3 + true + stdcpp17 + EditAndContinue + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX64 + + + Windows + true + $(OutDir)test_bench.pdb + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level3 + true + stdcpp17 + ProgramDatabase + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX86 + + + Windows + true + $(OutDir)test_bench.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level3 + true + stdcpp17 + ProgramDatabase + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX64 + + + Windows + true + $(OutDir)test_bench.pdb + true + true + + + + + + + + + + + + diff --git a/gctest/solution/test_bench.vcxproj.filters b/gctest/solution/test_bench.vcxproj.filters new file mode 100644 index 0000000..5240a4d --- /dev/null +++ b/gctest/solution/test_bench.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {2DAB880B-99B4-887C-2230-9F7C8E38947C} + + + + + src + + + src + + + -- 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') 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 c724876f8a8ff9aadb3d8a929d4410514f5df93a Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 20 Sep 2021 22:14:28 +0300 Subject: Regenerate project files --- JSImpl/solution/JSImpl.sln | 41 ++++++++++++++++ JSImpl/solution/Makefile | 20 +++++++- compile_commands.json | 80 ++++++++++++++++++++++++++++++++ gctest/solution/dummy_gc.make | 48 +++++++++---------- gctest/solution/dummy_gc.vcxproj | 16 +++---- gctest/solution/leak_gc.make | 48 +++++++++---------- gctest/solution/leak_gc.vcxproj | 16 +++---- gctest/solution/test_bench.make | 16 +++---- gctest/solution/test_bench.vcxproj | 16 +++---- spasm/solution/spasm.vcxproj | 4 ++ spasm/solution/spasm_lib.vcxproj | 16 ++++--- spasm/solution/spasm_lib.vcxproj.filters | 12 ++--- spasm/solution/sprt.vcxproj | 4 ++ spasm/solution/sprun.vcxproj | 4 ++ 14 files changed, 248 insertions(+), 93 deletions(-) create mode 100644 compile_commands.json (limited to 'gctest/solution') diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln index bb2638e..89a91b3 100644 --- a/JSImpl/solution/JSImpl.sln +++ b/JSImpl/solution/JSImpl.sln @@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSImpl", "JSImpl", "{C30B5025-2FEB-CEC0-3803-5A97A4613522}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gctest", "gctest", "{5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}" ProjectSection(ProjectDependencies) = postProject {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} @@ -44,6 +46,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\soluti {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "..\..\gctest\solution\test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "..\..\gctest\solution\leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}" + ProjectSection(ProjectDependencies) = postProject + {A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "..\..\gctest\solution\dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}" + ProjectSection(ProjectDependencies) = postProject + {A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -132,6 +146,30 @@ Global {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|Win32.Build.0 = Release|Win32 {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.ActiveCfg = Release|x64 {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.Build.0 = Release|x64 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.ActiveCfg = Debug|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.Build.0 = Debug|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.ActiveCfg = Debug|x64 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.Build.0 = Debug|x64 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.ActiveCfg = Release|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.Build.0 = Release|Win32 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.ActiveCfg = Release|x64 + {A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.Build.0 = Release|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.Build.0 = Debug|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.ActiveCfg = Debug|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.Build.0 = Debug|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.ActiveCfg = Release|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.Build.0 = Release|Win32 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.ActiveCfg = Release|x64 + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.Build.0 = Release|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.Build.0 = Debug|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.ActiveCfg = Debug|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.Build.0 = Debug|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.ActiveCfg = Release|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.Build.0 = Release|Win32 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.ActiveCfg = Release|x64 + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -146,5 +184,8 @@ Global {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {9892E17D-8434-0C54-6DEF-1FA8593093A4} {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {9892E17D-8434-0C54-6DEF-1FA8593093A4} {69185F10-D52C-87C1-9EAE-2A210A8283F2} = {9892E17D-8434-0C54-6DEF-1FA8593093A4} + {A41847E7-90D0-8834-F9D7-6190E5AE2325} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A} + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A} + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A} EndGlobalSection EndGlobal diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile index 45157d1..78a826a 100644 --- a/JSImpl/solution/Makefile +++ b/JSImpl/solution/Makefile @@ -6,7 +6,7 @@ ifndef config endif export config -PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm spasm_lib sprt sprun +PROJECTS := JSImpl JSLib Test dummy_gc gmock gtest gtest_main leak_gc spasm spasm_lib sprt sprun test_bench .PHONY: all clean help $(PROJECTS) @@ -52,6 +52,18 @@ sprun: sprt @echo "==== Building sprun ($(config)) ====" @${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make +test_bench: + @echo "==== Building test_bench ($(config)) ====" + @${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make + +leak_gc: test_bench + @echo "==== Building leak_gc ($(config)) ====" + @${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make + +dummy_gc: test_bench + @echo "==== Building dummy_gc ($(config)) ====" + @${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make + clean: @${MAKE} --no-print-directory -C ../test -f Test.make clean @${MAKE} --no-print-directory -C ../test -f gtest.make clean @@ -63,6 +75,9 @@ clean: @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make clean @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make clean @${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make clean + @${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make clean + @${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make clean + @${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make clean help: @echo "Usage: make [config=name] [target]" @@ -86,5 +101,8 @@ help: @echo " spasm_lib" @echo " spasm" @echo " sprun" + @echo " test_bench" + @echo " leak_gc" + @echo " dummy_gc" @echo "" @echo "For more information, see https://github.com/bkaradzic/genie" diff --git a/compile_commands.json b/compile_commands.json new file mode 100644 index 0000000..763a143 --- /dev/null +++ b/compile_commands.json @@ -0,0 +1,80 @@ +[ + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/ASTInterpreterTests.o -c ASTInterpreterTests.cpp", + "file": "ASTInterpreterTests.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/CodeGenerationTests.o -c CodeGenerationTests.cpp", + "file": "CodeGenerationTests.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/LexerTests.o -c LexerTests.cpp", + "file": "LexerTests.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/ParserTests.o -c ParserTests.cpp", + "file": "ParserTests.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/empty.o -c empty.cpp", + "file": "empty.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/sprtTests.o -c sprtTests.cpp", + "file": "sprtTests.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest\" -I\"googletest/googletest/include\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/gtest/googletest/googletest/src/gtest-all.o -c googletest/googletest/src/gtest-all.cc", + "file": "googletest/googletest/src/gtest-all.cc" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googlemock\" -I\"googletest/googlemock/include\" -I\"googletest/googletest/include\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/gmock/googletest/googlemock/src/gmock-all.o -c googletest/googlemock/src/gmock-all.cc", + "file": "googletest/googlemock/src/gmock-all.cc" }, + { "directory": "d:/repo/IPL/JSImpl/test", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest\" -I\"googletest/googletest/include\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/gtest_main/googletest/googletest/src/gtest_main.o -c googletest/googletest/src/gtest_main.cc", + "file": "googletest/googletest/src/gtest_main.cc" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/ASTInterpreter.o -c ../src/ASTInterpreter.cpp", + "file": "../src/ASTInterpreter.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/ASTPrinter.o -c ../src/ASTPrinter.cpp", + "file": "../src/ASTPrinter.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/ByteCodeGenerator.o -c ../src/ByteCodeGenerator.cpp", + "file": "../src/ByteCodeGenerator.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/Expression.o -c ../src/Expression.cpp", + "file": "../src/Expression.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/JSONParser.o -c ../src/JSONParser.cpp", + "file": "../src/JSONParser.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/Lexer.o -c ../src/Lexer.cpp", + "file": "../src/Lexer.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/Parser.o -c ../src/Parser.cpp", + "file": "../src/Parser.cpp" }, + { "directory": "d:/repo/IPL/JSImpl/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSImpl/src/main.o -c ../src/main.cpp", + "file": "../src/main.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/sprt/src/spasm.o -c ../src/spasm.cpp", + "file": "../src/spasm.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/assembler.o -c ../src/asm/assembler.cpp", + "file": "../src/asm/assembler.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/bytecode.o -c ../src/asm/bytecode.cpp", + "file": "../src/asm/bytecode.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/lexer.o -c ../src/asm/lexer.cpp", + "file": "../src/asm/lexer.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/symbol.o -c ../src/asm/symbol.cpp", + "file": "../src/asm/symbol.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/token.o -c ../src/asm/token.cpp", + "file": "../src/asm/token.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/tokenizer.o -c ../src/asm/tokenizer.cpp", + "file": "../src/asm/tokenizer.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm/src/asm/main.o -c ../src/asm/main.cpp", + "file": "../src/asm/main.cpp" }, + { "directory": "d:/repo/IPL/spasm/solution", + "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/sprun/src/main.o -c ../src/main.cpp", + "file": "../src/main.cpp" } +] \ No newline at end of file diff --git a/gctest/solution/dummy_gc.make b/gctest/solution/dummy_gc.make index fd8997d..e430d1c 100644 --- a/gctest/solution/dummy_gc.make +++ b/gctest/solution/dummy_gc.make @@ -43,9 +43,9 @@ endif MAKEFILE = dummy_gc.make ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/dummy_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/dummy_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 @@ -54,9 +54,9 @@ ifeq ($(config),debug32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -75,9 +75,9 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/dummy_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/dummy_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 @@ -86,9 +86,9 @@ ifeq ($(config),release32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -107,9 +107,9 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/dummy_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/dummy_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 @@ -118,9 +118,9 @@ ifeq ($(config),debug64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -139,9 +139,9 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/dummy_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/dummy_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 @@ -150,9 +150,9 @@ ifeq ($(config),release64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += diff --git a/gctest/solution/dummy_gc.vcxproj b/gctest/solution/dummy_gc.vcxproj index db98b09..5ca36a1 100644 --- a/gctest/solution/dummy_gc.vcxproj +++ b/gctest/solution/dummy_gc.vcxproj @@ -75,29 +75,29 @@ - ..\build\bin\Debug\ - ..\build\obj\Debug\x32\Debug\dummy_gc\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x32\Debug\dummy_gc\ dummy_gc .exe true - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\dummy_gc\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x64\Debug\dummy_gc\ dummy_gc .exe true - ..\build\bin\Release\ - ..\build\obj\Release\x32\Release\dummy_gc\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x32\Release\dummy_gc\ dummy_gc .exe false - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\dummy_gc\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\dummy_gc\ dummy_gc .exe false diff --git a/gctest/solution/leak_gc.make b/gctest/solution/leak_gc.make index c29f8ea..2cb1381 100644 --- a/gctest/solution/leak_gc.make +++ b/gctest/solution/leak_gc.make @@ -43,9 +43,9 @@ endif MAKEFILE = leak_gc.make ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/leak_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/leak_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 @@ -54,9 +54,9 @@ ifeq ($(config),debug32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -75,9 +75,9 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/leak_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/leak_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 @@ -86,9 +86,9 @@ ifeq ($(config),release32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -107,9 +107,9 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/leak_gc - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/leak_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 @@ -118,9 +118,9 @@ ifeq ($(config),debug64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 - LIBDEPS += ../build/bin/Debug/libtest_bench.a - LDDEPS += ../build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 + LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -139,9 +139,9 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/leak_gc - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/leak_gc.exe + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 @@ -150,9 +150,9 @@ ifeq ($(config),release64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 - LIBDEPS += ../build/bin/Release/libtest_bench.a - LDDEPS += ../build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 + LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += diff --git a/gctest/solution/leak_gc.vcxproj b/gctest/solution/leak_gc.vcxproj index bf4ea47..cccba6f 100644 --- a/gctest/solution/leak_gc.vcxproj +++ b/gctest/solution/leak_gc.vcxproj @@ -75,29 +75,29 @@ - ..\build\bin\Debug\ - ..\build\obj\Debug\x32\Debug\leak_gc\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x32\Debug\leak_gc\ leak_gc .exe true - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\leak_gc\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x64\Debug\leak_gc\ leak_gc .exe true - ..\build\bin\Release\ - ..\build\obj\Release\x32\Release\leak_gc\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x32\Release\leak_gc\ leak_gc .exe false - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\leak_gc\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\leak_gc\ leak_gc .exe false diff --git a/gctest/solution/test_bench.make b/gctest/solution/test_bench.make index 9229102..9a503a5 100644 --- a/gctest/solution/test_bench.make +++ b/gctest/solution/test_bench.make @@ -43,8 +43,8 @@ endif MAKEFILE = test_bench.make ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/test_bench - TARGETDIR = ../build/bin/Debug + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -76,8 +76,8 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/test_bench - TARGETDIR = ../build/bin/Release + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -109,8 +109,8 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/test_bench - TARGETDIR = ../build/bin/Debug + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -142,8 +142,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/test_bench - TARGETDIR = ../build/bin/Release + 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 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) diff --git a/gctest/solution/test_bench.vcxproj b/gctest/solution/test_bench.vcxproj index 3c6a9b1..6ea8e11 100644 --- a/gctest/solution/test_bench.vcxproj +++ b/gctest/solution/test_bench.vcxproj @@ -75,26 +75,26 @@ - ..\build\bin\Debug\ - ..\build\obj\Debug\x32\Debug\test_bench\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x32\Debug\test_bench\ test_bench .lib - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\test_bench\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x64\Debug\test_bench\ test_bench .lib - ..\build\bin\Release\ - ..\build\obj\Release\x32\Release\test_bench\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x32\Release\test_bench\ test_bench .lib - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\test_bench\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\test_bench\ test_bench .lib diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj index c4d1cc3..e74771d 100644 --- a/spasm/solution/spasm.vcxproj +++ b/spasm/solution/spasm.vcxproj @@ -31,6 +31,7 @@ Application true v142 + x64 true @@ -38,6 +39,7 @@ Application true v142 + x64 true @@ -45,6 +47,7 @@ Application false v142 + x64 true @@ -52,6 +55,7 @@ Application false v142 + x64 true diff --git a/spasm/solution/spasm_lib.vcxproj b/spasm/solution/spasm_lib.vcxproj index 72bd81e..bcb4ab9 100644 --- a/spasm/solution/spasm_lib.vcxproj +++ b/spasm/solution/spasm_lib.vcxproj @@ -31,6 +31,7 @@ StaticLibrary true v142 + x64 true @@ -38,6 +39,7 @@ StaticLibrary true v142 + x64 true @@ -45,6 +47,7 @@ StaticLibrary false v142 + x64 true @@ -52,6 +55,7 @@ StaticLibrary false v142 + x64 true @@ -223,18 +227,18 @@ - - - - - - + + + + + + diff --git a/spasm/solution/spasm_lib.vcxproj.filters b/spasm/solution/spasm_lib.vcxproj.filters index c82311e..82b5f56 100644 --- a/spasm/solution/spasm_lib.vcxproj.filters +++ b/spasm/solution/spasm_lib.vcxproj.filters @@ -9,22 +9,22 @@ - + src\asm - + src\asm - + src\asm - + src\asm - + src\asm - + src\asm diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj index acc26ef..6e7737f 100644 --- a/spasm/solution/sprt.vcxproj +++ b/spasm/solution/sprt.vcxproj @@ -31,6 +31,7 @@ StaticLibrary true v142 + x64 true @@ -38,6 +39,7 @@ StaticLibrary true v142 + x64 true @@ -45,6 +47,7 @@ StaticLibrary false v142 + x64 true @@ -52,6 +55,7 @@ StaticLibrary false v142 + x64 true diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj index a86c487..15ab7f9 100644 --- a/spasm/solution/sprun.vcxproj +++ b/spasm/solution/sprun.vcxproj @@ -31,6 +31,7 @@ Application true v142 + x64 true @@ -38,6 +39,7 @@ Application true v142 + x64 true @@ -45,6 +47,7 @@ Application false v142 + x64 true @@ -52,6 +55,7 @@ Application false v142 + x64 true -- 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') 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