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 --- 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 --- 11 files changed, 24 insertions(+), 734 deletions(-) (limited to 'spasm/solution') 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-26-gb76a