From 262b9f45b79516eb5608773b124245f9e9e1427c Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Sun, 4 Oct 2020 08:41:48 +0300 Subject: Generate projects with 32-bit support --- spasm/solution/spasm.make | 86 ++++++++++++++++++- spasm/solution/spasm.vcxproj | 129 +++++++++++++++++++++++++++-- spasm/solution/spasm.vcxproj.filters | 2 +- spasm/solution/spasm.vcxproj.user | 10 ++- spasm/solution/spasm_lib.make | 96 +++++++++++++++++++++- spasm/solution/spasm_lib.vcxproj | 137 +++++++++++++++++++++++++++---- spasm/solution/spasm_lib.vcxproj.filters | 14 ++-- spasm/solution/sprt.make | 86 ++++++++++++++++++- spasm/solution/sprt.vcxproj | 125 ++++++++++++++++++++++++++-- spasm/solution/sprt.vcxproj.filters | 2 +- spasm/solution/sprt.vcxproj.user | 10 ++- spasm/solution/sprun.make | 86 ++++++++++++++++++- spasm/solution/sprun.vcxproj | 129 +++++++++++++++++++++++++++-- spasm/solution/sprun.vcxproj.filters | 2 +- spasm/solution/sprun.vcxproj.user | 10 ++- 15 files changed, 865 insertions(+), 59 deletions(-) (limited to 'spasm/solution') diff --git a/spasm/solution/spasm.make b/spasm/solution/spasm.make index 6c081cc..af6a577 100644 --- a/spasm/solution/spasm.make +++ b/spasm/solution/spasm.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,70 @@ endif MAKEFILE = spasm.make +ifeq ($(config),debug) + OBJDIR = ../../JSImpl/build/obj/Debug/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 + 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_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" + 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),release) + OBJDIR = ../../JSImpl/build/obj/Release/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 + 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_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_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" + 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 + ifeq ($(config),debug64) OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/spasm TARGETDIR = ../../JSImpl/build/bin/Debug @@ -55,11 +119,14 @@ ifeq ($(config),debug64) 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 \ @@ -84,11 +151,14 @@ ifeq ($(config),release64) 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 \ @@ -111,7 +181,7 @@ RESOURCES := \ all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) @: -$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIBS) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS) +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) @echo Linking spasm $(SILENT) $(LINKCMD) $(POSTBUILDCMDS) @@ -150,6 +220,18 @@ $(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) $(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" endif +ifneq (,$(OBJRESP)) +$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +ifneq (,$(LDRESP)) +$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + $(OBJDIR)/src/asm/main.o: ../src/asm/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj index b0b5718..58407b4 100644 --- a/spasm/solution/spasm.vcxproj +++ b/spasm/solution/spasm.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,32 +21,62 @@ {69185F10-D52C-87C1-9EAE-2A210A8283F2} spasm - 8.1 + 10.0 + 10.0.10240.0 Win32Proj + + 16.0 + Application + true + v142 + true + + 16.0 Application true - v140 - x64 + v142 + true + + + 16.0 + Application + false + v142 + true + 16.0 Application false - v140 - x64 + v142 + true + + + + + + + + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\Debug\spasm\ + spasm + .exe + true + ..\..\JSImpl\build\bin\Debug\ ..\..\JSImpl\build\obj\Debug\x64\Debug\spasm\ @@ -46,6 +84,13 @@ .exe true + + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\Release\spasm\ + spasm + .exe + false + ..\..\JSImpl\build\bin\Release\ ..\..\JSImpl\build\obj\Release\x64\Release\spasm\ @@ -53,21 +98,53 @@ .exe false - + %(AdditionalOptions) Disabled _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + 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 EditAndContinue $(IntDir)spasm.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -76,26 +153,61 @@ Console true $(OutDir)spasm.pdb + ;%(AdditionalLibraryDirectories) $(OutDir)spasm.exe mainCRTStartup MachineX64 - + %(AdditionalOptions) MaxSpeed _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + 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 ProgramDatabase $(IntDir)spasm.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -106,6 +218,7 @@ $(OutDir)spasm.pdb true true + ;%(AdditionalLibraryDirectories) $(OutDir)spasm.exe mainCRTStartup MachineX64 diff --git a/spasm/solution/spasm.vcxproj.filters b/spasm/solution/spasm.vcxproj.filters index a9d3fb8..d75f1a8 100644 --- a/spasm/solution/spasm.vcxproj.filters +++ b/spasm/solution/spasm.vcxproj.filters @@ -1,5 +1,5 @@ - + {2DAB880B-99B4-887C-2230-9F7C8E38947C} diff --git a/spasm/solution/spasm.vcxproj.user b/spasm/solution/spasm.vcxproj.user index 99820f1..f927c73 100644 --- a/spasm/solution/spasm.vcxproj.user +++ b/spasm/solution/spasm.vcxproj.user @@ -1,9 +1,17 @@ - + + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger diff --git a/spasm/solution/spasm_lib.make b/spasm/solution/spasm_lib.make index 94b4322..9c25a78 100644 --- a/spasm/solution/spasm_lib.make +++ b/spasm/solution/spasm_lib.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,80 @@ endif MAKEFILE = spasm_lib.make +ifeq ($(config),debug) + OBJDIR = ../../JSImpl/build/obj/Debug/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 + 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_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) + 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),release) + OBJDIR = ../../JSImpl/build/obj/Release/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 + 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_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_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) + 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),debug64) OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/spasm_lib TARGETDIR = ../../JSImpl/build/bin/Debug @@ -55,11 +129,14 @@ ifeq ($(config),debug64) 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 \ @@ -89,11 +166,14 @@ ifeq ($(config),release64) 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 \ @@ -121,7 +201,7 @@ RESOURCES := \ all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) @: -$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIBS) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS) +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) @echo Archiving spasm_lib ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) @@ -165,6 +245,18 @@ $(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) $(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" endif +ifneq (,$(OBJRESP)) +$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +ifneq (,$(LDRESP)) +$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + $(OBJDIR)/src/asm/assembler.o: ../src/asm/assembler.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/spasm/solution/spasm_lib.vcxproj b/spasm/solution/spasm_lib.vcxproj index bf3908e..71e58a7 100644 --- a/spasm/solution/spasm_lib.vcxproj +++ b/spasm/solution/spasm_lib.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,59 +21,126 @@ {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} spasm_lib - 8.1 + 10.0 + 10.0.10240.0 Win32Proj + + 16.0 + StaticLibrary + true + v142 + true + + 16.0 StaticLibrary true - v140 - x64 + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + 16.0 StaticLibrary false - v140 - x64 + v142 + true + + + + + + + + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\Debug\spasm_lib\ + 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) Disabled _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + 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 EditAndContinue $(OutDir)spasm_lib.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -80,21 +155,55 @@ $(OutDir)spasm_lib.pdb - + %(AdditionalOptions) MaxSpeed _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + 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 ProgramDatabase $(OutDir)spasm_lib.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -112,18 +221,18 @@ - - - - - - + + + + + + diff --git a/spasm/solution/spasm_lib.vcxproj.filters b/spasm/solution/spasm_lib.vcxproj.filters index 6415708..c82311e 100644 --- a/spasm/solution/spasm_lib.vcxproj.filters +++ b/spasm/solution/spasm_lib.vcxproj.filters @@ -1,5 +1,5 @@ - + {2DAB880B-99B4-887C-2230-9F7C8E38947C} @@ -9,22 +9,22 @@ - + src\asm - + src\asm - + src\asm - + src\asm - + src\asm - + src\asm diff --git a/spasm/solution/sprt.make b/spasm/solution/sprt.make index 10f5b52..6c9b995 100644 --- a/spasm/solution/sprt.make +++ b/spasm/solution/sprt.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,70 @@ endif MAKEFILE = sprt.make +ifeq ($(config),debug) + OBJDIR = ../../JSImpl/build/obj/Debug/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 + 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_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) + 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),release) + OBJDIR = ../../JSImpl/build/obj/Release/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 + 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_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_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) + 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),debug64) OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/sprt TARGETDIR = ../../JSImpl/build/bin/Debug @@ -55,11 +119,14 @@ ifeq ($(config),debug64) 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 \ @@ -84,11 +151,14 @@ ifeq ($(config),release64) 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 \ @@ -111,7 +181,7 @@ RESOURCES := \ all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) @: -$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIBS) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS) +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) @echo Archiving sprt ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) @@ -155,6 +225,18 @@ $(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) $(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" endif +ifneq (,$(OBJRESP)) +$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +ifneq (,$(LDRESP)) +$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + $(OBJDIR)/src/spasm.o: ../src/spasm.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj index bd7f6c0..55cd65f 100644 --- a/spasm/solution/sprt.vcxproj +++ b/spasm/solution/sprt.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,59 +21,126 @@ {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} sprt - 8.1 + 10.0 + 10.0.10240.0 Win32Proj + + 16.0 + StaticLibrary + true + v142 + true + + 16.0 StaticLibrary true - v140 - x64 + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + 16.0 StaticLibrary false - v140 - x64 + v142 + true + + + + + + + + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\Debug\sprt\ + 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) Disabled _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + 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 EditAndContinue $(OutDir)sprt.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -80,21 +155,55 @@ $(OutDir)sprt.pdb - + %(AdditionalOptions) MaxSpeed _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + 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 ProgramDatabase $(OutDir)sprt.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/spasm/solution/sprt.vcxproj.filters b/spasm/solution/sprt.vcxproj.filters index d9f8e3a..51bfc92 100644 --- a/spasm/solution/sprt.vcxproj.filters +++ b/spasm/solution/sprt.vcxproj.filters @@ -1,5 +1,5 @@ - + {2DAB880B-99B4-887C-2230-9F7C8E38947C} diff --git a/spasm/solution/sprt.vcxproj.user b/spasm/solution/sprt.vcxproj.user index 99820f1..f927c73 100644 --- a/spasm/solution/sprt.vcxproj.user +++ b/spasm/solution/sprt.vcxproj.user @@ -1,9 +1,17 @@ - + + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger diff --git a/spasm/solution/sprun.make b/spasm/solution/sprun.make index 58b7320..60e73eb 100644 --- a/spasm/solution/sprun.make +++ b/spasm/solution/sprun.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,70 @@ endif MAKEFILE = sprun.make +ifeq ($(config),debug) + OBJDIR = ../../JSImpl/build/obj/Debug/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 + 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_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++14 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" + 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),release) + OBJDIR = ../../JSImpl/build/obj/Release/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 + 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_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_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" + 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 + ifeq ($(config),debug64) OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/sprun TARGETDIR = ../../JSImpl/build/bin/Debug @@ -55,11 +119,14 @@ ifeq ($(config),debug64) 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 \ @@ -84,11 +151,14 @@ ifeq ($(config),release64) 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 \ @@ -111,7 +181,7 @@ RESOURCES := \ all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) @: -$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIBS) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS) +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) @echo Linking sprun $(SILENT) $(LINKCMD) $(POSTBUILDCMDS) @@ -150,6 +220,18 @@ $(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) $(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" endif +ifneq (,$(OBJRESP)) +$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + +ifneq (,$(LDRESP)) +$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS) + $(SILENT) echo $^ + $(SILENT) echo $^ > $@ +endif + $(OBJDIR)/src/main.o: ../src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj index ee6678e..10bb330 100644 --- a/spasm/solution/sprun.vcxproj +++ b/spasm/solution/sprun.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,32 +21,62 @@ {FD605F10-6975-87C1-32F7-2A219ECA83F2} sprun - 8.1 + 10.0 + 10.0.10240.0 Win32Proj + + 16.0 + Application + true + v142 + true + + 16.0 Application true - v140 - x64 + v142 + true + + + 16.0 + Application + false + v142 + true + 16.0 Application false - v140 - x64 + v142 + true + + + + + + + + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\Debug\sprun\ + sprun + .exe + true + ..\..\JSImpl\build\bin\Debug\ ..\..\JSImpl\build\obj\Debug\x64\Debug\sprun\ @@ -46,6 +84,13 @@ .exe true + + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\Release\sprun\ + sprun + .exe + false + ..\..\JSImpl\build\bin\Release\ ..\..\JSImpl\build\obj\Release\x64\Release\sprun\ @@ -53,21 +98,53 @@ .exe false - + %(AdditionalOptions) Disabled _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + 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 EditAndContinue $(IntDir)sprun.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -76,26 +153,61 @@ Console true $(OutDir)sprun.pdb + ;%(AdditionalLibraryDirectories) $(OutDir)sprun.exe mainCRTStartup MachineX64 - + %(AdditionalOptions) MaxSpeed _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + 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 ProgramDatabase $(IntDir)sprun.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -106,6 +218,7 @@ $(OutDir)sprun.pdb true true + ;%(AdditionalLibraryDirectories) $(OutDir)sprun.exe mainCRTStartup MachineX64 diff --git a/spasm/solution/sprun.vcxproj.filters b/spasm/solution/sprun.vcxproj.filters index daeea8c..a140a04 100644 --- a/spasm/solution/sprun.vcxproj.filters +++ b/spasm/solution/sprun.vcxproj.filters @@ -1,5 +1,5 @@ - + {2DAB880B-99B4-887C-2230-9F7C8E38947C} diff --git a/spasm/solution/sprun.vcxproj.user b/spasm/solution/sprun.vcxproj.user index 99820f1..f927c73 100644 --- a/spasm/solution/sprun.vcxproj.user +++ b/spasm/solution/sprun.vcxproj.user @@ -1,9 +1,17 @@ - + + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger -- cgit v1.3.1-23-gd82d