From 11bd787e7d7676caa8e3c7a49305ba7c19d5c9ed Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 16 Nov 2020 23:32:16 +0200 Subject: Fix missing configurations in build --- JSImpl/solution/JSImpl.make | 98 ++++++++++++++++++++++++++------ JSImpl/solution/JSImpl.sln | 42 ++++++++++++++ JSImpl/solution/JSImpl.vcxproj | 112 +++++++++++++++++++++++++++++++++++- JSImpl/solution/JSLib.make | 110 ++++++++++++++++++++++++++++++------ JSImpl/solution/JSLib.vcxproj | 110 +++++++++++++++++++++++++++++++++++- JSImpl/solution/Makefile | 8 ++- JSImpl/solution/genie.lua | 1 + JSImpl/test/Test.make | 110 ++++++++++++++++++++++++++++++------ JSImpl/test/Test.vcxproj | 116 +++++++++++++++++++++++++++++++++++++- JSImpl/test/gmock.make | 100 ++++++++++++++++++++++++++------ JSImpl/test/gmock.vcxproj | 114 ++++++++++++++++++++++++++++++++++++- JSImpl/test/gtest.make | 100 ++++++++++++++++++++++++++------ JSImpl/test/gtest.vcxproj | 114 ++++++++++++++++++++++++++++++++++++- JSImpl/test/gtest_main.make | 100 ++++++++++++++++++++++++++------ JSImpl/test/gtest_main.vcxproj | 114 ++++++++++++++++++++++++++++++++++++- appveyor.yml | 2 +- spasm/solution/spasm.make | 98 ++++++++++++++++++++++++++------ spasm/solution/spasm.vcxproj | 112 +++++++++++++++++++++++++++++++++++- spasm/solution/spasm.vcxproj.user | 8 +++ spasm/solution/spasm_lib.make | 108 +++++++++++++++++++++++++++++------ spasm/solution/spasm_lib.vcxproj | 110 +++++++++++++++++++++++++++++++++++- spasm/solution/sprt.make | 98 ++++++++++++++++++++++++++------ spasm/solution/sprt.vcxproj | 110 +++++++++++++++++++++++++++++++++++- spasm/solution/sprt.vcxproj.user | 8 +++ spasm/solution/sprun.make | 98 ++++++++++++++++++++++++++------ spasm/solution/sprun.vcxproj | 112 +++++++++++++++++++++++++++++++++++- spasm/solution/sprun.vcxproj.user | 8 +++ 27 files changed, 2027 insertions(+), 194 deletions(-) diff --git a/JSImpl/solution/JSImpl.make b/JSImpl/solution/JSImpl.make index 355d4a1..972348c 100644 --- a/JSImpl/solution/JSImpl.make +++ b/JSImpl/solution/JSImpl.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug + config=debug32 endif ifndef verbose @@ -42,19 +42,19 @@ endif MAKEFILE = JSImpl.make -ifeq ($(config),debug) - OBJDIR = ../build/obj/Debug/Debug/JSImpl +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/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 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - 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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 LIBDEPS += ../build/bin/Debug/libJSLib.a LDDEPS += ../build/bin/Debug/libJSLib.a LDRESP = @@ -74,19 +74,83 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../build/obj/Release/Release/JSImpl +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/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 - 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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + 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 + +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++17 + 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++17 + 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++17 + 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++17 + 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 = diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln index 850831a..bb2638e 100644 --- a/JSImpl/solution/JSImpl.sln +++ b/JSImpl/solution/JSImpl.sln @@ -47,49 +47,91 @@ 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 diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj index a2bc858..b6bc265 100644 --- a/JSImpl/solution/JSImpl.vcxproj +++ b/JSImpl/solution/JSImpl.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {549B84BA-403D-AF90-29F8-C2E4153936E1} @@ -25,6 +33,13 @@ v142 true + + 16.0 + Application + true + v142 + true + 16.0 Application @@ -32,26 +47,53 @@ v142 true + + 16.0 + Application + false + v142 + true + + + + + + + ..\build\bin\Debug\ - ..\build\obj\Debug\Debug\JSImpl\ + ..\build\obj\Debug\x32\Debug\JSImpl\ + JSImpl + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\JSImpl\ JSImpl .exe true ..\build\bin\Release\ - ..\build\obj\Release\Release\JSImpl\ + ..\build\obj\Release\x32\Release\JSImpl\ + JSImpl + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\JSImpl\ JSImpl .exe false @@ -84,6 +126,38 @@ ;%(AdditionalLibraryDirectories) $(OutDir)JSImpl.exe mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)JSImpl.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)JSImpl.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)JSImpl.exe + mainCRTStartup + MachineX64 @@ -116,6 +190,40 @@ ;%(AdditionalLibraryDirectories) $(OutDir)JSImpl.exe mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)JSImpl.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)JSImpl.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)JSImpl.exe + mainCRTStartup + MachineX64 diff --git a/JSImpl/solution/JSLib.make b/JSImpl/solution/JSLib.make index 6d92807..0ea5f48 100644 --- a/JSImpl/solution/JSLib.make +++ b/JSImpl/solution/JSLib.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug + config=debug32 endif ifndef verbose @@ -42,19 +42,19 @@ endif MAKEFILE = JSLib.make -ifeq ($(config),debug) - OBJDIR = ../build/obj/Debug/Debug/JSLib +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/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 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - 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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 LIBDEPS += LDDEPS += LDRESP = @@ -80,19 +80,95 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../build/obj/Release/Release/JSLib +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/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 - 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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 + 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),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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 LIBDEPS += LDDEPS += LDRESP = diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj index b56083a..3f78839 100644 --- a/JSImpl/solution/JSLib.vcxproj +++ b/JSImpl/solution/JSLib.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {19EA680D-85FE-90BE-4E80-341EBA538DEF} @@ -25,6 +33,13 @@ v142 true + + 16.0 + StaticLibrary + true + v142 + true + 16.0 StaticLibrary @@ -32,25 +47,50 @@ v142 true + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + ..\build\bin\Debug\ - ..\build\obj\Debug\Debug\JSLib\ + ..\build\obj\Debug\x32\Debug\JSLib\ + JSLib + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\JSLib\ JSLib .lib ..\build\bin\Release\ - ..\build\obj\Release\Release\JSLib\ + ..\build\obj\Release\x32\Release\JSLib\ + JSLib + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\JSLib\ JSLib .lib @@ -77,6 +117,38 @@ $(OutDir)JSLib.lib + MachineX86 + + + Windows + true + $(OutDir)JSLib.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)JSLib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)JSLib.lib + MachineX64 Windows @@ -107,6 +179,40 @@ $(OutDir)JSLib.lib + MachineX86 + + + Windows + true + $(OutDir)JSLib.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)JSLib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)JSLib.lib + MachineX64 Windows diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile index fd12d74..45157d1 100644 --- a/JSImpl/solution/Makefile +++ b/JSImpl/solution/Makefile @@ -2,7 +2,7 @@ # Type "make help" for usage help ifndef config - config=debug + config=debug32 endif export config @@ -68,8 +68,10 @@ help: @echo "Usage: make [config=name] [target]" @echo "" @echo "CONFIGURATIONS:" - @echo " debug" - @echo " release" + @echo " debug32" + @echo " release32" + @echo " debug64" + @echo " release64" @echo "" @echo "TARGETS:" @echo " all (default)" diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua index 777446b..10d31de 100644 --- a/JSImpl/solution/genie.lua +++ b/JSImpl/solution/genie.lua @@ -1,5 +1,6 @@ solution 'JSImpl' configurations {'Debug', 'Release'} + platforms { 'x32', 'x64' } flags { 'FatalWarnings', 'ExtraWarnings', diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make index 0510fa2..5701630 100644 --- a/JSImpl/test/Test.make +++ b/JSImpl/test/Test.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug + config=debug32 endif ifndef verbose @@ -42,20 +42,20 @@ endif MAKEFILE = Test.make -ifeq ($(config),debug) - OBJDIR = ../build/obj/Debug/Debug/Test +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/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 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - 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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m32 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 = @@ -80,20 +80,96 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../build/obj/Release/Release/Test +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/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 - 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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." -m32 + 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)/ASTInterpreterTests.o \ + $(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),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++17 + 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++17 + 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)/ASTInterpreterTests.o \ + $(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++17 + 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++17 + 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 = diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj index c33f333..1b61e01 100644 --- a/JSImpl/test/Test.vcxproj +++ b/JSImpl/test/Test.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F} @@ -25,6 +33,13 @@ v142 true + + 16.0 + Application + true + v142 + true + 16.0 Application @@ -32,26 +47,53 @@ v142 true + + 16.0 + Application + false + v142 + true + + + + + + + ..\build\bin\Debug\ - ..\build\obj\Debug\Debug\Test\ + ..\build\obj\Debug\x32\Debug\Test\ + Test + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\Test\ Test .exe true ..\build\bin\Release\ - ..\build\obj\Release\Release\Test\ + ..\build\obj\Release\x32\Release\Test\ + Test + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\Test\ Test .exe false @@ -86,6 +128,40 @@ ;%(AdditionalLibraryDirectories) $(OutDir)Test.exe mainCRTStartup + MachineX86 + + + + + %(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 + stdcpp17 + 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 + MachineX64 @@ -120,6 +196,42 @@ ;%(AdditionalLibraryDirectories) $(OutDir)Test.exe mainCRTStartup + MachineX86 + + + + + %(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 + stdcpp17 + 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 + MachineX64 diff --git a/JSImpl/test/gmock.make b/JSImpl/test/gmock.make index 37d54df..879ceb3 100644 --- a/JSImpl/test/gmock.make +++ b/JSImpl/test/gmock.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug + config=debug32 endif ifndef verbose @@ -42,20 +42,20 @@ endif MAKEFILE = gmock.make -ifeq ($(config),debug) - OBJDIR = ../build/obj/Debug/Debug/gmock +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/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 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - 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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 LIBDEPS += LDDEPS += LDRESP = @@ -75,20 +75,86 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../build/obj/Release/Release/gmock +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/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 - 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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 + 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),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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 LIBDEPS += LDDEPS += LDRESP = diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj index 44afba9..5847c81 100644 --- a/JSImpl/test/gmock.vcxproj +++ b/JSImpl/test/gmock.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {B686840F-229B-ACC0-EB1C-502057F0A8F1} @@ -25,6 +33,13 @@ v142 true + + 16.0 + StaticLibrary + true + v142 + true + 16.0 StaticLibrary @@ -32,25 +47,50 @@ v142 true + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + ..\build\bin\Debug\ - ..\build\obj\Debug\Debug\gmock\ + ..\build\obj\Debug\x32\Debug\gmock\ + gmock + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\gmock\ gmock .lib ..\build\bin\Release\ - ..\build\obj\Release\Release\gmock\ + ..\build\obj\Release\x32\Release\gmock\ + gmock + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\gmock\ gmock .lib @@ -79,6 +119,40 @@ $(OutDir)gmock.lib + MachineX86 + + + 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 + stdcpp17 + EditAndContinue + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + MachineX64 Windows @@ -111,6 +185,42 @@ $(OutDir)gmock.lib + MachineX86 + + + 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 + stdcpp17 + ProgramDatabase + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + MachineX64 Windows diff --git a/JSImpl/test/gtest.make b/JSImpl/test/gtest.make index 675ddd5..e0fc567 100644 --- a/JSImpl/test/gtest.make +++ b/JSImpl/test/gtest.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug + config=debug32 endif ifndef verbose @@ -42,20 +42,20 @@ endif MAKEFILE = gtest.make -ifeq ($(config),debug) - OBJDIR = ../build/obj/Debug/Debug/gtest +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/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 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - 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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 LIBDEPS += LDDEPS += LDRESP = @@ -75,20 +75,86 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../build/obj/Release/Release/gtest +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/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 - 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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 + 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),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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 LIBDEPS += LDDEPS += LDRESP = diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj index 229231e..15f24e8 100644 --- a/JSImpl/test/gtest.vcxproj +++ b/JSImpl/test/gtest.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {EC34880F-5849-B0C0-21CB-53208D9EACF1} @@ -25,6 +33,13 @@ v142 true + + 16.0 + StaticLibrary + true + v142 + true + 16.0 StaticLibrary @@ -32,25 +47,50 @@ v142 true + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + ..\build\bin\Debug\ - ..\build\obj\Debug\Debug\gtest\ + ..\build\obj\Debug\x32\Debug\gtest\ + gtest + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\gtest\ gtest .lib ..\build\bin\Release\ - ..\build\obj\Release\Release\gtest\ + ..\build\obj\Release\x32\Release\gtest\ + gtest + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\gtest\ gtest .lib @@ -79,6 +119,40 @@ $(OutDir)gtest.lib + MachineX86 + + + 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 + stdcpp17 + EditAndContinue + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + MachineX64 Windows @@ -111,6 +185,42 @@ $(OutDir)gtest.lib + MachineX86 + + + 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 + stdcpp17 + ProgramDatabase + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + MachineX64 Windows diff --git a/JSImpl/test/gtest_main.make b/JSImpl/test/gtest_main.make index ecc5583..87cbc27 100644 --- a/JSImpl/test/gtest_main.make +++ b/JSImpl/test/gtest_main.make @@ -1,6 +1,6 @@ # GNU Make project makefile autogenerated by GENie ifndef config - config=debug + config=debug32 endif ifndef verbose @@ -42,20 +42,20 @@ endif MAKEFILE = gtest_main.make -ifeq ($(config),debug) - OBJDIR = ../build/obj/Debug/Debug/gtest_main +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/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 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - 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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 LIBDEPS += LDDEPS += LDRESP = @@ -75,20 +75,86 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../build/obj/Release/Release/gtest_main +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/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 - 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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 + 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),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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 LIBDEPS += LDDEPS += LDRESP = diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj index c39b848..6c6df7c 100644 --- a/JSImpl/test/gtest_main.vcxproj +++ b/JSImpl/test/gtest_main.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {30B03E7E-1C68-80CB-856F-592771461BBC} @@ -25,6 +33,13 @@ v142 true + + 16.0 + StaticLibrary + true + v142 + true + 16.0 StaticLibrary @@ -32,25 +47,50 @@ v142 true + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + ..\build\bin\Debug\ - ..\build\obj\Debug\Debug\gtest_main\ + ..\build\obj\Debug\x32\Debug\gtest_main\ + 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\ + ..\build\obj\Release\x32\Release\gtest_main\ + gtest_main + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\gtest_main\ gtest_main .lib @@ -79,6 +119,40 @@ $(OutDir)gtest_main.lib + MachineX86 + + + 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 + stdcpp17 + EditAndContinue + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + MachineX64 Windows @@ -111,6 +185,42 @@ $(OutDir)gtest_main.lib + MachineX86 + + + 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 + stdcpp17 + ProgramDatabase + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + MachineX64 Windows diff --git a/appveyor.yml b/appveyor.yml index b657fe2..be1ffe1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,7 @@ for: only: - image: Ubuntu build_script: - - make -C $APPVEYOR_BUILD_FOLDER/JSImpl/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/Win32//' | sed -e 's/x64/64/'` + - make -C $APPVEYOR_BUILD_FOLDER/JSImpl/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/Win32/32/' | sed -e 's/x64/64/'` test_script: - '$APPVEYOR_BUILD_FOLDER/JSImpl/build/bin/$CONFIGURATION/Test' after_test: diff --git a/spasm/solution/spasm.make b/spasm/solution/spasm.make index 8f27eff..9a6687d 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=debug + config=debug32 endif ifndef verbose @@ -42,19 +42,19 @@ endif MAKEFILE = spasm.make -ifeq ($(config),debug) - OBJDIR = ../../JSImpl/build/obj/Debug/Debug/spasm +ifeq ($(config),debug32) + OBJDIR = ../../JSImpl/build/obj/Debug/x32/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++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 LIBDEPS += ../../JSImpl/build/bin/Debug/libspasm_lib.a LDDEPS += ../../JSImpl/build/bin/Debug/libspasm_lib.a LDRESP = @@ -74,19 +74,83 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../../JSImpl/build/obj/Release/Release/spasm +ifeq ($(config),release32) + OBJDIR = ../../JSImpl/build/obj/Release/x32/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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 + 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 + 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++17 + 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++17 + 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++17 + 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++17 + 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 = diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj index 0f6cd48..c4d1cc3 100644 --- a/spasm/solution/spasm.vcxproj +++ b/spasm/solution/spasm.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {69185F10-D52C-87C1-9EAE-2A210A8283F2} @@ -25,6 +33,13 @@ v142 true + + 16.0 + Application + true + v142 + true + 16.0 Application @@ -32,26 +47,53 @@ v142 true + + 16.0 + Application + false + v142 + true + + + + + + + ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\Debug\spasm\ + ..\..\JSImpl\build\obj\Debug\x32\Debug\spasm\ + spasm + .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\ + ..\..\JSImpl\build\obj\Release\x32\Release\spasm\ + spasm + .exe + false + + + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\spasm\ spasm .exe false @@ -84,6 +126,38 @@ ;%(AdditionalLibraryDirectories) $(OutDir)spasm.exe mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)spasm.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)spasm.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)spasm.exe + mainCRTStartup + MachineX64 @@ -116,6 +190,40 @@ ;%(AdditionalLibraryDirectories) $(OutDir)spasm.exe mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)spasm.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)spasm.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)spasm.exe + mainCRTStartup + MachineX64 diff --git a/spasm/solution/spasm.vcxproj.user b/spasm/solution/spasm.vcxproj.user index 648ac8e..f927c73 100644 --- a/spasm/solution/spasm.vcxproj.user +++ b/spasm/solution/spasm.vcxproj.user @@ -4,8 +4,16 @@ WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + diff --git a/spasm/solution/spasm_lib.make b/spasm/solution/spasm_lib.make index d2f9572..f52e8d0 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=debug + config=debug32 endif ifndef verbose @@ -42,19 +42,19 @@ endif MAKEFILE = spasm_lib.make -ifeq ($(config),debug) - OBJDIR = ../../JSImpl/build/obj/Debug/Debug/spasm_lib +ifeq ($(config),debug32) + OBJDIR = ../../JSImpl/build/obj/Debug/x32/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++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 LIBDEPS += LDDEPS += LDRESP = @@ -79,19 +79,93 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../../JSImpl/build/obj/Release/Release/spasm_lib +ifeq ($(config),release32) + OBJDIR = ../../JSImpl/build/obj/Release/x32/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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 + 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 + 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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 LIBDEPS += LDDEPS += LDRESP = diff --git a/spasm/solution/spasm_lib.vcxproj b/spasm/solution/spasm_lib.vcxproj index 8e25b5a..72bd81e 100644 --- a/spasm/solution/spasm_lib.vcxproj +++ b/spasm/solution/spasm_lib.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} @@ -25,6 +33,13 @@ v142 true + + 16.0 + StaticLibrary + true + v142 + true + 16.0 StaticLibrary @@ -32,25 +47,50 @@ v142 true + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\Debug\spasm_lib\ + ..\..\JSImpl\build\obj\Debug\x32\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\ + ..\..\JSImpl\build\obj\Release\x32\Release\spasm_lib\ + spasm_lib + .lib + + + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\spasm_lib\ spasm_lib .lib @@ -77,6 +117,38 @@ $(OutDir)spasm_lib.lib + MachineX86 + + + Windows + true + $(OutDir)spasm_lib.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)spasm_lib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)spasm_lib.lib + MachineX64 Windows @@ -107,6 +179,40 @@ $(OutDir)spasm_lib.lib + MachineX86 + + + Windows + true + $(OutDir)spasm_lib.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)spasm_lib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)spasm_lib.lib + MachineX64 Windows diff --git a/spasm/solution/sprt.make b/spasm/solution/sprt.make index 502c222..b093263 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=debug + config=debug32 endif ifndef verbose @@ -42,19 +42,19 @@ endif MAKEFILE = sprt.make -ifeq ($(config),debug) - OBJDIR = ../../JSImpl/build/obj/Debug/Debug/sprt +ifeq ($(config),debug32) + OBJDIR = ../../JSImpl/build/obj/Debug/x32/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++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 LIBDEPS += LDDEPS += LDRESP = @@ -74,19 +74,83 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../../JSImpl/build/obj/Release/Release/sprt +ifeq ($(config),release32) + OBJDIR = ../../JSImpl/build/obj/Release/x32/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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -m32 + 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 + 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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/src/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++17 + 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++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 LIBDEPS += LDDEPS += LDRESP = diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj index 235ceb6..acc26ef 100644 --- a/spasm/solution/sprt.vcxproj +++ b/spasm/solution/sprt.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} @@ -25,6 +33,13 @@ v142 true + + 16.0 + StaticLibrary + true + v142 + true + 16.0 StaticLibrary @@ -32,25 +47,50 @@ v142 true + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\Debug\sprt\ + ..\..\JSImpl\build\obj\Debug\x32\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\ + ..\..\JSImpl\build\obj\Release\x32\Release\sprt\ + sprt + .lib + + + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\sprt\ sprt .lib @@ -77,6 +117,38 @@ $(OutDir)sprt.lib + MachineX86 + + + Windows + true + $(OutDir)sprt.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)sprt.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)sprt.lib + MachineX64 Windows @@ -107,6 +179,40 @@ $(OutDir)sprt.lib + MachineX86 + + + Windows + true + $(OutDir)sprt.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)sprt.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)sprt.lib + MachineX64 Windows diff --git a/spasm/solution/sprt.vcxproj.user b/spasm/solution/sprt.vcxproj.user index 648ac8e..f927c73 100644 --- a/spasm/solution/sprt.vcxproj.user +++ b/spasm/solution/sprt.vcxproj.user @@ -4,8 +4,16 @@ WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + diff --git a/spasm/solution/sprun.make b/spasm/solution/sprun.make index af64163..39498b7 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=debug + config=debug32 endif ifndef verbose @@ -42,19 +42,19 @@ endif MAKEFILE = sprun.make -ifeq ($(config),debug) - OBJDIR = ../../JSImpl/build/obj/Debug/Debug/sprun +ifeq ($(config),debug32) + OBJDIR = ../../JSImpl/build/obj/Debug/x32/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++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -std=c++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 LIBDEPS += ../../JSImpl/build/bin/Debug/libsprt.a LDDEPS += ../../JSImpl/build/bin/Debug/libsprt.a LDRESP = @@ -74,19 +74,83 @@ ifeq ($(config),debug) endef endif -ifeq ($(config),release) - OBJDIR = ../../JSImpl/build/obj/Release/Release/sprun +ifeq ($(config),release32) + OBJDIR = ../../JSImpl/build/obj/Release/x32/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++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++17 + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 + 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 + 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++17 + 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++17 + 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++17 + 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++17 + 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 = diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj index b22971a..a86c487 100644 --- a/spasm/solution/sprun.vcxproj +++ b/spasm/solution/sprun.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {FD605F10-6975-87C1-32F7-2A219ECA83F2} @@ -25,6 +33,13 @@ v142 true + + 16.0 + Application + true + v142 + true + 16.0 Application @@ -32,26 +47,53 @@ v142 true + + 16.0 + Application + false + v142 + true + + + + + + + ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\Debug\sprun\ + ..\..\JSImpl\build\obj\Debug\x32\Debug\sprun\ + sprun + .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\ + ..\..\JSImpl\build\obj\Release\x32\Release\sprun\ + sprun + .exe + false + + + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\sprun\ sprun .exe false @@ -84,6 +126,38 @@ ;%(AdditionalLibraryDirectories) $(OutDir)sprun.exe mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)sprun.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)sprun.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)sprun.exe + mainCRTStartup + MachineX64 @@ -116,6 +190,40 @@ ;%(AdditionalLibraryDirectories) $(OutDir)sprun.exe mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)sprun.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)sprun.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)sprun.exe + mainCRTStartup + MachineX64 diff --git a/spasm/solution/sprun.vcxproj.user b/spasm/solution/sprun.vcxproj.user index 648ac8e..f927c73 100644 --- a/spasm/solution/sprun.vcxproj.user +++ b/spasm/solution/sprun.vcxproj.user @@ -4,8 +4,16 @@ WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + WindowsLocalDebugger + + -- cgit v1.3.1-23-gd82d