From d8704c516b3a8b32817ffcad1868d7cd135efe48 Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Sun, 1 Nov 2020 21:34:40 +0200 Subject: Move AST interpreter value to std::variant --- JSImpl/solution/genie.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'JSImpl/solution') diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua index 247f72d..777446b 100644 --- a/JSImpl/solution/genie.lua +++ b/JSImpl/solution/genie.lua @@ -3,7 +3,7 @@ solution 'JSImpl' flags { 'FatalWarnings', 'ExtraWarnings', - 'Cpp14', + 'Cpp17', 'Symbols', } defines { -- cgit v1.3.1-23-gd82d From acb4362f28e783632a5c79db98f14b60aa12f175 Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Sun, 1 Nov 2020 21:37:45 +0200 Subject: Move project to C++17 --- JSImpl/solution/JSImpl.make | 72 ++---------------------- JSImpl/solution/JSImpl.sln | 47 ---------------- JSImpl/solution/JSImpl.vcxproj | 110 +----------------------------------- JSImpl/solution/JSLib.make | 84 ++-------------------------- JSImpl/solution/JSLib.vcxproj | 108 +----------------------------------- JSImpl/solution/Makefile | 2 - JSImpl/test/Test.make | 82 ++------------------------- JSImpl/test/Test.vcxproj | 114 +------------------------------------- JSImpl/test/gmock.make | 74 ++----------------------- JSImpl/test/gmock.vcxproj | 112 +------------------------------------ JSImpl/test/gtest.make | 74 ++----------------------- JSImpl/test/gtest.vcxproj | 112 +------------------------------------ JSImpl/test/gtest_main.make | 74 ++----------------------- JSImpl/test/gtest_main.vcxproj | 112 +------------------------------------ spasm/solution/spasm.make | 72 ++---------------------- spasm/solution/spasm.vcxproj | 110 +----------------------------------- spasm/solution/spasm.vcxproj.user | 8 --- spasm/solution/spasm_lib.make | 82 ++------------------------- spasm/solution/spasm_lib.vcxproj | 108 +----------------------------------- spasm/solution/sprt.make | 72 ++---------------------- spasm/solution/sprt.vcxproj | 108 +----------------------------------- spasm/solution/sprt.vcxproj.user | 8 --- spasm/solution/sprun.make | 72 ++---------------------- spasm/solution/sprun.vcxproj | 110 +----------------------------------- spasm/solution/sprun.vcxproj.user | 8 --- 25 files changed, 60 insertions(+), 1875 deletions(-) (limited to 'JSImpl/solution') diff --git a/JSImpl/solution/JSImpl.make b/JSImpl/solution/JSImpl.make index f79241f..355d4a1 100644 --- a/JSImpl/solution/JSImpl.make +++ b/JSImpl/solution/JSImpl.make @@ -50,9 +50,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" LIBDEPS += ../build/bin/Debug/libJSLib.a @@ -82,9 +82,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" LIBDEPS += ../build/bin/Release/libJSLib.a @@ -106,70 +106,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/JSImpl - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/JSImpl - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 - LIBDEPS += ../build/bin/Debug/libJSLib.a - LDDEPS += ../build/bin/Debug/libJSLib.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/JSImpl - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/JSImpl - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 - LIBDEPS += ../build/bin/Release/libJSLib.a - LDDEPS += ../build/bin/Release/libJSLib.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/src \ diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln index ce219bf..850831a 100644 --- a/JSImpl/solution/JSImpl.sln +++ b/JSImpl/solution/JSImpl.sln @@ -1,8 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.29613.14 -MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spasm", "Spasm", "{9892E17D-8434-0C54-6DEF-1FA8593093A4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}" @@ -49,91 +47,49 @@ 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 {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|Win32.ActiveCfg = Debug|Win32 {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|Win32.Build.0 = Debug|Win32 - {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.ActiveCfg = Debug|x64 - {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.Build.0 = Debug|x64 {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|Win32.ActiveCfg = Release|Win32 {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|Win32.Build.0 = Release|Win32 - {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.ActiveCfg = Release|x64 - {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.Build.0 = Release|x64 {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|Win32.ActiveCfg = Debug|Win32 {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|Win32.Build.0 = Debug|Win32 - {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.ActiveCfg = Debug|x64 - {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.Build.0 = Debug|x64 {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|Win32.ActiveCfg = Release|Win32 {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|Win32.Build.0 = Release|Win32 - {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.ActiveCfg = Release|x64 - {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.Build.0 = Release|x64 {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|Win32.ActiveCfg = Debug|Win32 {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|Win32.Build.0 = Debug|Win32 - {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.ActiveCfg = Debug|x64 - {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.Build.0 = Debug|x64 {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|Win32.ActiveCfg = Release|Win32 {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|Win32.Build.0 = Release|Win32 - {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.ActiveCfg = Release|x64 - {EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.Build.0 = Release|x64 {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|Win32.ActiveCfg = Debug|Win32 {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|Win32.Build.0 = Debug|Win32 - {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|x64.ActiveCfg = Debug|x64 - {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Debug|x64.Build.0 = Debug|x64 {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|Win32.ActiveCfg = Release|Win32 {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|Win32.Build.0 = Release|Win32 - {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|x64.ActiveCfg = Release|x64 - {B686840F-229B-ACC0-EB1C-502057F0A8F1}.Release|x64.Build.0 = Release|x64 {30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|Win32.ActiveCfg = Debug|Win32 {30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|Win32.Build.0 = Debug|Win32 - {30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.ActiveCfg = Debug|x64 - {30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.Build.0 = Debug|x64 {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|Win32.ActiveCfg = Release|Win32 {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|Win32.Build.0 = Release|Win32 - {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.ActiveCfg = Release|x64 - {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.Build.0 = Release|x64 {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|Win32.ActiveCfg = Debug|Win32 {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|Win32.Build.0 = Debug|Win32 - {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.ActiveCfg = Debug|x64 - {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.Build.0 = Debug|x64 {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|Win32.ActiveCfg = Release|Win32 {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|Win32.Build.0 = Release|Win32 - {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.ActiveCfg = Release|x64 - {19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.Build.0 = Release|x64 {549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|Win32.ActiveCfg = Debug|Win32 {549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|Win32.Build.0 = Debug|Win32 - {549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.ActiveCfg = Debug|x64 - {549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.Build.0 = Debug|x64 {549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|Win32.ActiveCfg = Release|Win32 {549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|Win32.Build.0 = Release|Win32 - {549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.ActiveCfg = Release|x64 - {549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.Build.0 = Release|x64 {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|Win32.ActiveCfg = Debug|Win32 {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|Win32.Build.0 = Debug|Win32 - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.ActiveCfg = Debug|x64 - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.Build.0 = Debug|x64 {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|Win32.ActiveCfg = Release|Win32 {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|Win32.Build.0 = Release|Win32 - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.ActiveCfg = Release|x64 - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.Build.0 = Release|x64 {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|Win32.ActiveCfg = Debug|Win32 {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|Win32.Build.0 = Debug|Win32 - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.ActiveCfg = Debug|x64 - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.Build.0 = Debug|x64 {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|Win32.ActiveCfg = Release|Win32 {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|Win32.Build.0 = Release|Win32 - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|x64.ActiveCfg = Release|x64 - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|x64.Build.0 = Release|x64 {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|Win32.ActiveCfg = Debug|Win32 {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|Win32.Build.0 = Debug|Win32 - {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.ActiveCfg = Debug|x64 - {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.Build.0 = Debug|x64 {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|Win32.ActiveCfg = Release|Win32 {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -149,7 +105,4 @@ Global {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {9892E17D-8434-0C54-6DEF-1FA8593093A4} {69185F10-D52C-87C1-9EAE-2A210A8283F2} = {9892E17D-8434-0C54-6DEF-1FA8593093A4} EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B9E3E8B3-5BA4-4521-B598-F1EF432D2126} - EndGlobalSection EndGlobal diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj index 8db08cc..a2bc858 100644 --- a/JSImpl/solution/JSImpl.vcxproj +++ b/JSImpl/solution/JSImpl.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {549B84BA-403D-AF90-29F8-C2E4153936E1} @@ -33,13 +25,6 @@ v142 true - - 16.0 - Application - true - v142 - true - 16.0 Application @@ -47,28 +32,15 @@ v142 true - - 16.0 - Application - false - v142 - true - - - - - - - ..\build\bin\Debug\ @@ -77,13 +49,6 @@ .exe true - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\JSImpl\ - JSImpl - .exe - true - ..\build\bin\Release\ ..\build\obj\Release\Release\JSImpl\ @@ -91,13 +56,6 @@ .exe false - - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\JSImpl\ - JSImpl - .exe - false - %(AdditionalOptions) @@ -111,37 +69,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(IntDir)JSImpl.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)JSImpl.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)JSImpl.exe - mainCRTStartup - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(IntDir)JSImpl.compile.pdb Caret @@ -156,7 +84,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)JSImpl.exe mainCRTStartup - MachineX64 @@ -172,39 +99,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(IntDir)JSImpl.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)JSImpl.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)JSImpl.exe - mainCRTStartup - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(IntDir)JSImpl.compile.pdb Caret @@ -221,7 +116,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)JSImpl.exe mainCRTStartup - MachineX64 diff --git a/JSImpl/solution/JSLib.make b/JSImpl/solution/JSLib.make index 9770cb0..6d92807 100644 --- a/JSImpl/solution/JSLib.make +++ b/JSImpl/solution/JSLib.make @@ -50,9 +50,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -88,9 +88,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -118,82 +118,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/JSLib - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libJSLib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - 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/ASTInterpreter.o \ - $(OBJDIR)/src/ASTPrinter.o \ - $(OBJDIR)/src/ByteCodeGenerator.o \ - $(OBJDIR)/src/Expression.o \ - $(OBJDIR)/src/JSONParser.o \ - $(OBJDIR)/src/Lexer.o \ - $(OBJDIR)/src/Parser.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/JSLib - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libJSLib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - 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/ASTInterpreter.o \ - $(OBJDIR)/src/ASTPrinter.o \ - $(OBJDIR)/src/ByteCodeGenerator.o \ - $(OBJDIR)/src/Expression.o \ - $(OBJDIR)/src/JSONParser.o \ - $(OBJDIR)/src/Lexer.o \ - $(OBJDIR)/src/Parser.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/src \ diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj index 67600b0..b56083a 100644 --- a/JSImpl/solution/JSLib.vcxproj +++ b/JSImpl/solution/JSLib.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {19EA680D-85FE-90BE-4E80-341EBA538DEF} @@ -33,13 +25,6 @@ v142 true - - 16.0 - StaticLibrary - true - v142 - true - 16.0 StaticLibrary @@ -47,28 +32,15 @@ v142 true - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - ..\build\bin\Debug\ @@ -76,24 +48,12 @@ JSLib .lib - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\JSLib\ - JSLib - .lib - ..\build\bin\Release\ ..\build\obj\Release\Release\JSLib\ JSLib .lib - - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\JSLib\ - JSLib - .lib - %(AdditionalOptions) @@ -107,37 +67,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(OutDir)JSLib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)JSLib.lib - - - Windows - true - $(OutDir)JSLib.pdb - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(OutDir)JSLib.pdb Caret @@ -147,7 +77,6 @@ $(OutDir)JSLib.lib - MachineX64 Windows @@ -168,39 +97,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(OutDir)JSLib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)JSLib.lib - - - Windows - true - $(OutDir)JSLib.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(OutDir)JSLib.pdb Caret @@ -210,7 +107,6 @@ $(OutDir)JSLib.lib - MachineX64 Windows diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile index fe89e52..fd12d74 100644 --- a/JSImpl/solution/Makefile +++ b/JSImpl/solution/Makefile @@ -70,8 +70,6 @@ help: @echo "CONFIGURATIONS:" @echo " debug" @echo " release" - @echo " debug64" - @echo " release64" @echo "" @echo "TARGETS:" @echo " all (default)" diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make index 68e167d..38d963e 100644 --- a/JSImpl/test/Test.make +++ b/JSImpl/test/Test.make @@ -51,9 +51,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a @@ -88,9 +88,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a @@ -116,80 +116,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/Test - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/Test - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m64 - LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a - LDDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a - LDRESP = - LIBS += $(LDDEPS) -lpthread - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/CodeGenerationTests.o \ - $(OBJDIR)/LexerTests.o \ - $(OBJDIR)/ParserTests.o \ - $(OBJDIR)/empty.o \ - $(OBJDIR)/sprtTests.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/Test - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/Test - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." -m64 - LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a - LDDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a - LDRESP = - LIBS += $(LDDEPS) -lpthread - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/CodeGenerationTests.o \ - $(OBJDIR)/LexerTests.o \ - $(OBJDIR)/ParserTests.o \ - $(OBJDIR)/empty.o \ - $(OBJDIR)/sprtTests.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/. \ diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj index 3abf38f..b2e4e83 100644 --- a/JSImpl/test/Test.vcxproj +++ b/JSImpl/test/Test.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F} @@ -33,13 +25,6 @@ v142 true - - 16.0 - Application - true - v142 - true - 16.0 Application @@ -47,28 +32,15 @@ v142 true - - 16.0 - Application - false - v142 - true - - - - - - - ..\build\bin\Debug\ @@ -77,13 +49,6 @@ .exe true - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\Test\ - Test - .exe - true - ..\build\bin\Release\ ..\build\obj\Release\Release\Test\ @@ -91,13 +56,6 @@ .exe false - - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\Test\ - Test - .exe - false - %(AdditionalOptions) @@ -112,39 +70,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(IntDir)Test.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - - - Console - true - $(OutDir)Test.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)Test.exe - mainCRTStartup - - - - - %(AdditionalOptions) - Disabled - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(IntDir)Test.compile.pdb Caret @@ -160,7 +86,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)Test.exe mainCRTStartup - MachineX64 @@ -177,41 +102,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(IntDir)Test.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - - - Console - true - $(OutDir)Test.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)Test.exe - mainCRTStartup - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(IntDir)Test.compile.pdb Caret @@ -229,7 +120,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)Test.exe mainCRTStartup - MachineX64 diff --git a/JSImpl/test/gmock.make b/JSImpl/test/gmock.make index 73e4eac..37d54df 100644 --- a/JSImpl/test/gmock.make +++ b/JSImpl/test/gmock.make @@ -51,9 +51,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -84,9 +84,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -108,72 +108,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/gmock - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgmock.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - 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)/googletest/googlemock/src/gmock-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/gmock - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgmock.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - 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)/googletest/googlemock/src/gmock-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/googletest/googlemock/src \ diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj index 5a4490e..44afba9 100644 --- a/JSImpl/test/gmock.vcxproj +++ b/JSImpl/test/gmock.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {B686840F-229B-ACC0-EB1C-502057F0A8F1} @@ -33,13 +25,6 @@ v142 true - - 16.0 - StaticLibrary - true - v142 - true - 16.0 StaticLibrary @@ -47,28 +32,15 @@ v142 true - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - ..\build\bin\Debug\ @@ -76,24 +48,12 @@ gmock .lib - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\gmock\ - gmock - .lib - ..\build\bin\Release\ ..\build\obj\Release\Release\gmock\ gmock .lib - - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\gmock\ - gmock - .lib - %(AdditionalOptions) @@ -108,39 +68,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(OutDir)gmock.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gmock.lib - - - Windows - true - $(OutDir)gmock.pdb - - - - - %(AdditionalOptions) - Disabled - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(OutDir)gmock.pdb Caret @@ -151,7 +79,6 @@ $(OutDir)gmock.lib - MachineX64 Windows @@ -173,41 +100,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(OutDir)gmock.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gmock.lib - - - Windows - true - $(OutDir)gmock.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(OutDir)gmock.pdb Caret @@ -218,7 +111,6 @@ $(OutDir)gmock.lib - MachineX64 Windows diff --git a/JSImpl/test/gtest.make b/JSImpl/test/gtest.make index 44e1cb0..675ddd5 100644 --- a/JSImpl/test/gtest.make +++ b/JSImpl/test/gtest.make @@ -51,9 +51,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -84,9 +84,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -108,72 +108,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/gtest - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgtest.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - 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)/googletest/googletest/src/gtest-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/gtest - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgtest.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - 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)/googletest/googletest/src/gtest-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/googletest/googletest/src \ diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj index 5e12d95..229231e 100644 --- a/JSImpl/test/gtest.vcxproj +++ b/JSImpl/test/gtest.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {EC34880F-5849-B0C0-21CB-53208D9EACF1} @@ -33,13 +25,6 @@ v142 true - - 16.0 - StaticLibrary - true - v142 - true - 16.0 StaticLibrary @@ -47,28 +32,15 @@ v142 true - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - ..\build\bin\Debug\ @@ -76,24 +48,12 @@ gtest .lib - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\gtest\ - gtest - .lib - ..\build\bin\Release\ ..\build\obj\Release\Release\gtest\ gtest .lib - - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\gtest\ - gtest - .lib - %(AdditionalOptions) @@ -108,39 +68,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(OutDir)gtest.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest.lib - - - Windows - true - $(OutDir)gtest.pdb - - - - - %(AdditionalOptions) - Disabled - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(OutDir)gtest.pdb Caret @@ -151,7 +79,6 @@ $(OutDir)gtest.lib - MachineX64 Windows @@ -173,41 +100,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(OutDir)gtest.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest.lib - - - Windows - true - $(OutDir)gtest.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(OutDir)gtest.pdb Caret @@ -218,7 +111,6 @@ $(OutDir)gtest.lib - MachineX64 Windows diff --git a/JSImpl/test/gtest_main.make b/JSImpl/test/gtest_main.make index 8a0d8af..ecc5583 100644 --- a/JSImpl/test/gtest_main.make +++ b/JSImpl/test/gtest_main.make @@ -51,9 +51,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -84,9 +84,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -108,72 +108,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/gtest_main - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - 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)/googletest/googletest/src/gtest_main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/gtest_main - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - 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)/googletest/googletest/src/gtest_main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/googletest/googletest/src \ diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj index aeec05d..c39b848 100644 --- a/JSImpl/test/gtest_main.vcxproj +++ b/JSImpl/test/gtest_main.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {30B03E7E-1C68-80CB-856F-592771461BBC} @@ -33,13 +25,6 @@ v142 true - - 16.0 - StaticLibrary - true - v142 - true - 16.0 StaticLibrary @@ -47,28 +32,15 @@ v142 true - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - ..\build\bin\Debug\ @@ -76,24 +48,12 @@ gtest_main .lib - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\gtest_main\ - gtest_main - .lib - ..\build\bin\Release\ ..\build\obj\Release\Release\gtest_main\ gtest_main .lib - - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\gtest_main\ - gtest_main - .lib - %(AdditionalOptions) @@ -108,39 +68,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(OutDir)gtest_main.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest_main.lib - - - Windows - true - $(OutDir)gtest_main.pdb - - - - - %(AdditionalOptions) - Disabled - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(OutDir)gtest_main.pdb Caret @@ -151,7 +79,6 @@ $(OutDir)gtest_main.lib - MachineX64 Windows @@ -173,41 +100,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(OutDir)gtest_main.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest_main.lib - - - Windows - true - $(OutDir)gtest_main.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(OutDir)gtest_main.pdb Caret @@ -218,7 +111,6 @@ $(OutDir)gtest_main.lib - MachineX64 Windows diff --git a/spasm/solution/spasm.make b/spasm/solution/spasm.make index af6a577..8f27eff 100644 --- a/spasm/solution/spasm.make +++ b/spasm/solution/spasm.make @@ -50,9 +50,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" LIBDEPS += ../../JSImpl/build/bin/Debug/libspasm_lib.a @@ -82,9 +82,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" LIBDEPS += ../../JSImpl/build/bin/Release/libspasm_lib.a @@ -106,70 +106,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/spasm - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/spasm - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 - LIBDEPS += ../../JSImpl/build/bin/Debug/libspasm_lib.a - LDDEPS += ../../JSImpl/build/bin/Debug/libspasm_lib.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/spasm - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/spasm - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 - LIBDEPS += ../../JSImpl/build/bin/Release/libspasm_lib.a - LDDEPS += ../../JSImpl/build/bin/Release/libspasm_lib.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/src/asm \ diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj index 58407b4..0f6cd48 100644 --- a/spasm/solution/spasm.vcxproj +++ b/spasm/solution/spasm.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {69185F10-D52C-87C1-9EAE-2A210A8283F2} @@ -33,13 +25,6 @@ v142 true - - 16.0 - Application - true - v142 - true - 16.0 Application @@ -47,28 +32,15 @@ v142 true - - 16.0 - Application - false - v142 - true - - - - - - - ..\..\JSImpl\build\bin\Debug\ @@ -77,13 +49,6 @@ .exe true - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\spasm\ - spasm - .exe - true - ..\..\JSImpl\build\bin\Release\ ..\..\JSImpl\build\obj\Release\Release\spasm\ @@ -91,13 +56,6 @@ .exe false - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\spasm\ - spasm - .exe - false - %(AdditionalOptions) @@ -111,37 +69,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(IntDir)spasm.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)spasm.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)spasm.exe - mainCRTStartup - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(IntDir)spasm.compile.pdb Caret @@ -156,7 +84,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)spasm.exe mainCRTStartup - MachineX64 @@ -172,39 +99,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(IntDir)spasm.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)spasm.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)spasm.exe - mainCRTStartup - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(IntDir)spasm.compile.pdb Caret @@ -221,7 +116,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)spasm.exe mainCRTStartup - MachineX64 diff --git a/spasm/solution/spasm.vcxproj.user b/spasm/solution/spasm.vcxproj.user index f927c73..648ac8e 100644 --- a/spasm/solution/spasm.vcxproj.user +++ b/spasm/solution/spasm.vcxproj.user @@ -4,16 +4,8 @@ WindowsLocalDebugger - - WindowsLocalDebugger - - WindowsLocalDebugger - - WindowsLocalDebugger - - diff --git a/spasm/solution/spasm_lib.make b/spasm/solution/spasm_lib.make index 9c25a78..d2f9572 100644 --- a/spasm/solution/spasm_lib.make +++ b/spasm/solution/spasm_lib.make @@ -50,9 +50,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -87,9 +87,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -116,80 +116,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/spasm_lib - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/libspasm_lib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - 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/asm/assembler.o \ - $(OBJDIR)/src/asm/bytecode.o \ - $(OBJDIR)/src/asm/lexer.o \ - $(OBJDIR)/src/asm/symbol.o \ - $(OBJDIR)/src/asm/token.o \ - $(OBJDIR)/src/asm/tokenizer.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/spasm_lib - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/libspasm_lib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - 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/asm/assembler.o \ - $(OBJDIR)/src/asm/bytecode.o \ - $(OBJDIR)/src/asm/lexer.o \ - $(OBJDIR)/src/asm/symbol.o \ - $(OBJDIR)/src/asm/token.o \ - $(OBJDIR)/src/asm/tokenizer.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/src/asm \ diff --git a/spasm/solution/spasm_lib.vcxproj b/spasm/solution/spasm_lib.vcxproj index 71e58a7..8e25b5a 100644 --- a/spasm/solution/spasm_lib.vcxproj +++ b/spasm/solution/spasm_lib.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} @@ -33,13 +25,6 @@ v142 true - - 16.0 - StaticLibrary - true - v142 - true - 16.0 StaticLibrary @@ -47,28 +32,15 @@ v142 true - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - ..\..\JSImpl\build\bin\Debug\ @@ -76,24 +48,12 @@ spasm_lib .lib - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\spasm_lib\ - spasm_lib - .lib - ..\..\JSImpl\build\bin\Release\ ..\..\JSImpl\build\obj\Release\Release\spasm_lib\ spasm_lib .lib - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\spasm_lib\ - spasm_lib - .lib - %(AdditionalOptions) @@ -107,37 +67,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(OutDir)spasm_lib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)spasm_lib.lib - - - Windows - true - $(OutDir)spasm_lib.pdb - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(OutDir)spasm_lib.pdb Caret @@ -147,7 +77,6 @@ $(OutDir)spasm_lib.lib - MachineX64 Windows @@ -168,39 +97,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(OutDir)spasm_lib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)spasm_lib.lib - - - Windows - true - $(OutDir)spasm_lib.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(OutDir)spasm_lib.pdb Caret @@ -210,7 +107,6 @@ $(OutDir)spasm_lib.lib - MachineX64 Windows diff --git a/spasm/solution/sprt.make b/spasm/solution/sprt.make index 6c9b995..502c222 100644 --- a/spasm/solution/sprt.make +++ b/spasm/solution/sprt.make @@ -50,9 +50,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -82,9 +82,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) LIBDEPS += @@ -106,70 +106,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/sprt - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/libsprt.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - 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/spasm.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/sprt - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/libsprt.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - 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/spasm.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/src \ diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj index 55cd65f..235ceb6 100644 --- a/spasm/solution/sprt.vcxproj +++ b/spasm/solution/sprt.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} @@ -33,13 +25,6 @@ v142 true - - 16.0 - StaticLibrary - true - v142 - true - 16.0 StaticLibrary @@ -47,28 +32,15 @@ v142 true - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - ..\..\JSImpl\build\bin\Debug\ @@ -76,24 +48,12 @@ sprt .lib - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\sprt\ - sprt - .lib - ..\..\JSImpl\build\bin\Release\ ..\..\JSImpl\build\obj\Release\Release\sprt\ sprt .lib - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\sprt\ - sprt - .lib - %(AdditionalOptions) @@ -107,37 +67,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(OutDir)sprt.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)sprt.lib - - - Windows - true - $(OutDir)sprt.pdb - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(OutDir)sprt.pdb Caret @@ -147,7 +77,6 @@ $(OutDir)sprt.lib - MachineX64 Windows @@ -168,39 +97,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(OutDir)sprt.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)sprt.lib - - - Windows - true - $(OutDir)sprt.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(OutDir)sprt.pdb Caret @@ -210,7 +107,6 @@ $(OutDir)sprt.lib - MachineX64 Windows diff --git a/spasm/solution/sprt.vcxproj.user b/spasm/solution/sprt.vcxproj.user index f927c73..648ac8e 100644 --- a/spasm/solution/sprt.vcxproj.user +++ b/spasm/solution/sprt.vcxproj.user @@ -4,16 +4,8 @@ WindowsLocalDebugger - - WindowsLocalDebugger - - WindowsLocalDebugger - - WindowsLocalDebugger - - diff --git a/spasm/solution/sprun.make b/spasm/solution/sprun.make index 60e73eb..af64163 100644 --- a/spasm/solution/sprun.make +++ b/spasm/solution/sprun.make @@ -50,9 +50,9 @@ ifeq ($(config),debug) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" LIBDEPS += ../../JSImpl/build/bin/Debug/libsprt.a @@ -82,9 +82,9 @@ ifeq ($(config),release) ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++14 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" LIBDEPS += ../../JSImpl/build/bin/Release/libsprt.a @@ -106,70 +106,6 @@ ifeq ($(config),release) endef endif -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/sprun - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/sprun - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 - LIBDEPS += ../../JSImpl/build/bin/Debug/libsprt.a - LDDEPS += ../../JSImpl/build/bin/Debug/libsprt.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/sprun - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/sprun - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 - LIBDEPS += ../../JSImpl/build/bin/Release/libsprt.a - LDDEPS += ../../JSImpl/build/bin/Release/libsprt.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - OBJDIRS := \ $(OBJDIR) \ $(OBJDIR)/src \ diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj index 10bb330..b22971a 100644 --- a/spasm/solution/sprun.vcxproj +++ b/spasm/solution/sprun.vcxproj @@ -5,18 +5,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {FD605F10-6975-87C1-32F7-2A219ECA83F2} @@ -33,13 +25,6 @@ v142 true - - 16.0 - Application - true - v142 - true - 16.0 Application @@ -47,28 +32,15 @@ v142 true - - 16.0 - Application - false - v142 - true - - - - - - - ..\..\JSImpl\build\bin\Debug\ @@ -77,13 +49,6 @@ .exe true - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\sprun\ - sprun - .exe - true - ..\..\JSImpl\build\bin\Release\ ..\..\JSImpl\build\obj\Release\Release\sprun\ @@ -91,13 +56,6 @@ .exe false - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\sprun\ - sprun - .exe - false - %(AdditionalOptions) @@ -111,37 +69,7 @@ Level4 true - stdcpp14 - EditAndContinue - $(IntDir)sprun.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)sprun.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)sprun.exe - mainCRTStartup - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp14 + stdcpp17 EditAndContinue $(IntDir)sprun.compile.pdb Caret @@ -156,7 +84,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)sprun.exe mainCRTStartup - MachineX64 @@ -172,39 +99,7 @@ Level4 true - stdcpp14 - ProgramDatabase - $(IntDir)sprun.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)sprun.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)sprun.exe - mainCRTStartup - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp14 + stdcpp17 ProgramDatabase $(IntDir)sprun.compile.pdb Caret @@ -221,7 +116,6 @@ ;%(AdditionalLibraryDirectories) $(OutDir)sprun.exe mainCRTStartup - MachineX64 diff --git a/spasm/solution/sprun.vcxproj.user b/spasm/solution/sprun.vcxproj.user index f927c73..648ac8e 100644 --- a/spasm/solution/sprun.vcxproj.user +++ b/spasm/solution/sprun.vcxproj.user @@ -4,16 +4,8 @@ WindowsLocalDebugger - - WindowsLocalDebugger - - WindowsLocalDebugger - - WindowsLocalDebugger - - -- cgit v1.3.1-23-gd82d