From 615397eb2c179787e23867e86907113d7c169c88 Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Sun, 4 Oct 2020 08:36:11 +0300 Subject: Add 32-bit platforms to projects and CI --- JSImpl/solution/genie.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'JSImpl/solution') diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua index aa5889d..247f72d 100644 --- a/JSImpl/solution/genie.lua +++ b/JSImpl/solution/genie.lua @@ -1,6 +1,5 @@ solution 'JSImpl' configurations {'Debug', 'Release'} - platforms { 'x64' } flags { 'FatalWarnings', 'ExtraWarnings', -- cgit v1.3.1-23-gd82d 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 --- JSImpl/solution/JSImpl.make | 86 ++++++++++++++- JSImpl/solution/JSImpl.sln | 52 ++++++++- JSImpl/solution/JSImpl.vcxproj | 129 ++++++++++++++++++++-- JSImpl/solution/JSImpl.vcxproj.filters | 2 +- JSImpl/solution/JSLib.make | 104 +++++++++++++++++- JSImpl/solution/JSLib.vcxproj | 176 +++++++++++++++++++++++++------ JSImpl/solution/JSLib.vcxproj.filters | 38 +++---- JSImpl/solution/Makefile | 4 +- JSImpl/test/Test.make | 102 +++++++++++++++++- JSImpl/test/Test.vcxproj | 157 +++++++++++++++++++++++---- JSImpl/test/Test.vcxproj.filters | 5 +- JSImpl/test/empty.cpp | 4 +- JSImpl/test/gmock.make | 88 +++++++++++++++- JSImpl/test/gmock.vcxproj | 139 +++++++++++++++++++++--- JSImpl/test/gmock.vcxproj.filters | 24 ++--- JSImpl/test/gtest.make | 88 +++++++++++++++- JSImpl/test/gtest.vcxproj | 139 +++++++++++++++++++++--- JSImpl/test/gtest.vcxproj.filters | 16 +-- JSImpl/test/gtest_main.make | 88 +++++++++++++++- JSImpl/test/gtest_main.vcxproj | 129 ++++++++++++++++++++-- JSImpl/test/gtest_main.vcxproj.filters | 2 +- 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 +- 36 files changed, 2279 insertions(+), 217 deletions(-) (limited to 'JSImpl/solution') diff --git a/JSImpl/solution/JSImpl.make b/JSImpl/solution/JSImpl.make index 47c1963..f79241f 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=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,70 @@ endif MAKEFILE = JSImpl.make +ifeq ($(config),debug) + OBJDIR = ../build/obj/Debug/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++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"../build/bin/Debug" + 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),release) + OBJDIR = ../build/obj/Release/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++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"../build/bin/Release" + 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 @@ -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"../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 \ @@ -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"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libJSLib.a LDDEPS += ../build/bin/Release/libJSLib.a + LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += LINKOBJS = $(OBJECTS) LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = OBJECTS := \ $(OBJDIR)/src/main.o \ @@ -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 JSImpl $(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/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln index 17799fc..bb2638e 100644 --- a/JSImpl/solution/JSImpl.sln +++ b/JSImpl/solution/JSImpl.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 +# Visual Studio Version 16 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spasm", "Spasm", "{9892E17D-8434-0C54-6DEF-1FA8593093A4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}" @@ -14,12 +14,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\soluti EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}" ProjectSection(ProjectDependencies) = postProject - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} {19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF} - {EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1} - {B686840F-229B-ACC0-EB1C-502057F0A8F1} = {B686840F-229B-ACC0-EB1C-502057F0A8F1} {30B03E7E-1C68-80CB-856F-592771461BBC} = {30B03E7E-1C68-80CB-856F-592771461BBC} + {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} + {B686840F-229B-ACC0-EB1C-502057F0A8F1} = {B686840F-229B-ACC0-EB1C-502057F0A8F1} + {EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}" @@ -46,48 +46,90 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\soluti 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 diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj index 0aa8deb..8db08cc 100644 --- a/JSImpl/solution/JSImpl.vcxproj +++ b/JSImpl/solution/JSImpl.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,32 +21,62 @@ {549B84BA-403D-AF90-29F8-C2E4153936E1} JSImpl - 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 + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\Debug\JSImpl\ + JSImpl + .exe + true + ..\build\bin\Debug\ ..\build\obj\Debug\x64\Debug\JSImpl\ @@ -46,6 +84,13 @@ .exe true + + ..\build\bin\Release\ + ..\build\obj\Release\Release\JSImpl\ + JSImpl + .exe + false + ..\build\bin\Release\ ..\build\obj\Release\x64\Release\JSImpl\ @@ -53,21 +98,53 @@ .exe false - + %(AdditionalOptions) Disabled _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + Level4 + true + stdcpp14 + EditAndContinue + $(IntDir)JSImpl.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)JSImpl.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)JSImpl.exe + mainCRTStartup + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false true + EnableFastChecks + MultiThreadedDebugDLL true Level4 true + stdcpp14 EditAndContinue $(IntDir)JSImpl.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -76,26 +153,61 @@ Console true $(OutDir)JSImpl.pdb + ;%(AdditionalLibraryDirectories) $(OutDir)JSImpl.exe mainCRTStartup MachineX64 - + %(AdditionalOptions) MaxSpeed _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + Level4 + true + stdcpp14 + ProgramDatabase + $(IntDir)JSImpl.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)JSImpl.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)JSImpl.exe + mainCRTStartup + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true true + MultiThreadedDLL true Level4 true + stdcpp14 ProgramDatabase $(IntDir)JSImpl.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -106,6 +218,7 @@ $(OutDir)JSImpl.pdb true true + ;%(AdditionalLibraryDirectories) $(OutDir)JSImpl.exe mainCRTStartup MachineX64 diff --git a/JSImpl/solution/JSImpl.vcxproj.filters b/JSImpl/solution/JSImpl.vcxproj.filters index daeea8c..a140a04 100644 --- a/JSImpl/solution/JSImpl.vcxproj.filters +++ b/JSImpl/solution/JSImpl.vcxproj.filters @@ -1,5 +1,5 @@ - + {2DAB880B-99B4-887C-2230-9F7C8E38947C} diff --git a/JSImpl/solution/JSLib.make b/JSImpl/solution/JSLib.make index dd5157d..9770cb0 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=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,82 @@ endif MAKEFILE = JSLib.make +ifeq ($(config),debug) + OBJDIR = ../build/obj/Debug/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++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/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),release) + OBJDIR = ../build/obj/Release/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++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/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 @@ -55,16 +131,20 @@ 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/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 \ @@ -89,16 +169,20 @@ 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/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 \ @@ -121,7 +205,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 JSLib ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) @@ -165,6 +249,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/ASTInterpreter.o: ../src/ASTInterpreter.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" @@ -181,6 +277,10 @@ $(OBJDIR)/src/Expression.o: ../src/Expression.cpp $(GCH) $(MAKEFILE) | $(OBJDIR) @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" +$(OBJDIR)/src/JSONParser.o: ../src/JSONParser.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + $(OBJDIR)/src/Lexer.o: ../src/Lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj index 054b726..67600b0 100644 --- a/JSImpl/solution/JSLib.vcxproj +++ b/JSImpl/solution/JSLib.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,98 +21,197 @@ {19EA680D-85FE-90BE-4E80-341EBA538DEF} JSLib - 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 + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\Debug\JSLib\ + JSLib + .lib + ..\build\bin\Debug\ ..\build\obj\Debug\x64\Debug\JSLib\ JSLib .lib + + ..\build\bin\Release\ + ..\build\obj\Release\Release\JSLib\ + JSLib + .lib + ..\build\bin\Release\ ..\build\obj\Release\x64\Release\JSLib\ JSLib .lib - + %(AdditionalOptions) Disabled _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + Level4 + true + stdcpp14 + EditAndContinue + $(OutDir)JSLib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)JSLib.lib + + + Windows + true + $(OutDir)JSLib.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false true + EnableFastChecks + MultiThreadedDebugDLL true - - + Level4 true + stdcpp14 EditAndContinue $(OutDir)JSLib.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - $(OutDir)JSLib.lib - MachineX64 - + + $(OutDir)JSLib.lib + MachineX64 + Windows true $(OutDir)JSLib.pdb - + %(AdditionalOptions) MaxSpeed _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + Level4 + true + stdcpp14 + ProgramDatabase + $(OutDir)JSLib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)JSLib.lib + + + Windows + true + $(OutDir)JSLib.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true true + MultiThreadedDLL true - - + Level4 true + stdcpp14 ProgramDatabase $(OutDir)JSLib.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - $(OutDir)JSLib.lib - MachineX64 - + + $(OutDir)JSLib.lib + MachineX64 + Windows true @@ -114,34 +221,35 @@ - + + + + + - - - - - - + + - - - - - - + + + + + + + - \ No newline at end of file + diff --git a/JSImpl/solution/JSLib.vcxproj.filters b/JSImpl/solution/JSLib.vcxproj.filters index e38ebc7..d4af527 100644 --- a/JSImpl/solution/JSLib.vcxproj.filters +++ b/JSImpl/solution/JSLib.vcxproj.filters @@ -1,66 +1,66 @@ - + {2DAB880B-99B4-887C-2230-9F7C8E38947C} - + src - + src - + src - + src - + src - + src - + src - + src src - + src - + src - + src - + src - + src - + src - + src - + src - + src - \ No newline at end of file + diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile index 00cafb3..fe89e52 100644 --- a/JSImpl/solution/Makefile +++ b/JSImpl/solution/Makefile @@ -2,7 +2,7 @@ # Type "make help" for usage help ifndef config - config=debug64 + config=debug endif export config @@ -68,6 +68,8 @@ help: @echo "Usage: make [config=name] [target]" @echo "" @echo "CONFIGURATIONS:" + @echo " debug" + @echo " release" @echo " debug64" @echo " release64" @echo "" diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make index e1a6ad4..68e167d 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=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,80 @@ endif MAKEFILE = Test.make +ifeq ($(config),debug) + OBJDIR = ../build/obj/Debug/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++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"../build/bin/Debug" -L"." + LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a + LDDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a + LDRESP = + LIBS += $(LDDEPS) -lpthread + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/CodeGenerationTests.o \ + $(OBJDIR)/LexerTests.o \ + $(OBJDIR)/ParserTests.o \ + $(OBJDIR)/empty.o \ + $(OBJDIR)/sprtTests.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release) + OBJDIR = ../build/obj/Release/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++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"../build/bin/Release" -L"." + LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a + LDDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a + LDRESP = + LIBS += $(LDDEPS) -lpthread + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/CodeGenerationTests.o \ + $(OBJDIR)/LexerTests.o \ + $(OBJDIR)/ParserTests.o \ + $(OBJDIR)/empty.o \ + $(OBJDIR)/sprtTests.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + ifeq ($(config),debug64) OBJDIR = ../build/obj/Debug/x64/Debug/Test TARGETDIR = ../build/bin/Debug @@ -56,12 +130,16 @@ 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"../build/bin/Debug" -L"." -m64 + LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a LDDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a + LDRESP = LIBS += $(LDDEPS) -lpthread EXTERNAL_LIBS += LINKOBJS = $(OBJECTS) LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = OBJECTS := \ + $(OBJDIR)/CodeGenerationTests.o \ $(OBJDIR)/LexerTests.o \ $(OBJDIR)/ParserTests.o \ $(OBJDIR)/empty.o \ @@ -89,12 +167,16 @@ 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"../build/bin/Release" -L"." -m64 + LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a LDDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a + LDRESP = LIBS += $(LDDEPS) -lpthread EXTERNAL_LIBS += LINKOBJS = $(OBJECTS) LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = OBJECTS := \ + $(OBJDIR)/CodeGenerationTests.o \ $(OBJDIR)/LexerTests.o \ $(OBJDIR)/ParserTests.o \ $(OBJDIR)/empty.o \ @@ -119,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 Linking Test $(SILENT) $(LINKCMD) $(POSTBUILDCMDS) @@ -158,6 +240,22 @@ $(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)/CodeGenerationTests.o: CodeGenerationTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/. + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + $(OBJDIR)/LexerTests.o: LexerTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/. @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj index c099f1c..3abf38f 100644 --- a/JSImpl/test/Test.vcxproj +++ b/JSImpl/test/Test.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,32 +21,62 @@ {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F} Test - 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 + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\Debug\Test\ + Test + .exe + true + ..\build\bin\Debug\ ..\build\obj\Debug\x64\Debug\Test\ @@ -46,6 +84,13 @@ .exe true + + ..\build\bin\Release\ + ..\build\obj\Release\Release\Test\ + Test + .exe + false + ..\build\bin\Release\ ..\build\obj\Release\x64\Release\Test\ @@ -53,22 +98,56 @@ .exe false - + %(AdditionalOptions) Disabled googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + Level4 + true + stdcpp14 + EditAndContinue + $(IntDir)Test.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)Test.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)Test.exe + mainCRTStartup + + + + + %(AdditionalOptions) + Disabled + googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false true + EnableFastChecks + MultiThreadedDebugDLL true Level4 true + stdcpp14 EditAndContinue $(IntDir)Test.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -78,12 +157,13 @@ Console true $(OutDir)Test.pdb + ;%(AdditionalLibraryDirectories) $(OutDir)Test.exe mainCRTStartup MachineX64 - + %(AdditionalOptions) MaxSpeed @@ -91,14 +171,50 @@ _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + Level4 + true + stdcpp14 + ProgramDatabase + $(IntDir)Test.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)Test.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)Test.exe + mainCRTStartup + + + + + %(AdditionalOptions) + MaxSpeed + googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true true + MultiThreadedDLL true Level4 true + stdcpp14 ProgramDatabase $(IntDir)Test.compile.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -110,39 +226,42 @@ $(OutDir)Test.pdb true true + ;%(AdditionalLibraryDirectories) $(OutDir)Test.exe mainCRTStartup MachineX64 - - + + + + - - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} + + {19EA680D-85FE-90BE-4E80-341EBA538DEF} + + + {30B03E7E-1C68-80CB-856F-592771461BBC} {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} - - {19EA680D-85FE-90BE-4E80-341EBA538DEF} - - - {EC34880F-5849-B0C0-21CB-53208D9EACF1} + + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} {B686840F-229B-ACC0-EB1C-502057F0A8F1} - - {30B03E7E-1C68-80CB-856F-592771461BBC} + + {EC34880F-5849-B0C0-21CB-53208D9EACF1} diff --git a/JSImpl/test/Test.vcxproj.filters b/JSImpl/test/Test.vcxproj.filters index b7e0456..412f2b7 100644 --- a/JSImpl/test/Test.vcxproj.filters +++ b/JSImpl/test/Test.vcxproj.filters @@ -1,9 +1,10 @@ - + - + + diff --git a/JSImpl/test/empty.cpp b/JSImpl/test/empty.cpp index 8bf7d13..a7e2aac 100644 --- a/JSImpl/test/empty.cpp +++ b/JSImpl/test/empty.cpp @@ -10,7 +10,7 @@ TEST(Empty, Empty) int get_op(int8_t *& PC) { return *(PC++); } -size_t get_arg(int8_t*& PC, int size) { +uint64_t get_arg(int8_t*& PC, int size) { switch (size) { case 0: return *(PC++); @@ -19,7 +19,7 @@ size_t get_arg(int8_t*& PC, int size) { case 2: return *(((unsigned int*&)PC)++); case 3: - return *(((size_t*&)PC)++); + return *(((uint64_t*&)PC)++); } return 0; } diff --git a/JSImpl/test/gmock.make b/JSImpl/test/gmock.make index 590c3e4..73e4eac 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=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,72 @@ endif MAKEFILE = gmock.make +ifeq ($(config),debug) + OBJDIR = ../build/obj/Debug/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++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)/googletest/googlemock/src/gmock-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release) + OBJDIR = ../build/obj/Release/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++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)/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 @@ -56,11 +122,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)/googletest/googlemock/src/gmock-all.o \ @@ -86,11 +155,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)/googletest/googlemock/src/gmock-all.o \ @@ -113,7 +185,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 gmock ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) @@ -157,6 +229,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)/googletest/googlemock/src/gmock-all.o: googletest/googlemock/src/gmock-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/googletest/googlemock/src @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj index f4e2bec..5a4490e 100644 --- a/JSImpl/test/gmock.vcxproj +++ b/JSImpl/test/gmock.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,60 +21,129 @@ {B686840F-229B-ACC0-EB1C-502057F0A8F1} gmock - 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 + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\Debug\gmock\ + gmock + .lib + ..\build\bin\Debug\ ..\build\obj\Debug\x64\Debug\gmock\ gmock .lib + + ..\build\bin\Release\ + ..\build\obj\Release\Release\gmock\ + gmock + .lib + ..\build\bin\Release\ ..\build\obj\Release\x64\Release\gmock\ gmock .lib - + %(AdditionalOptions) Disabled googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + Level4 + true + stdcpp14 + EditAndContinue + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + + + Windows + true + $(OutDir)gmock.pdb + + + + + %(AdditionalOptions) + Disabled + googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false true + EnableFastChecks + MultiThreadedDebugDLL true Level4 true + stdcpp14 EditAndContinue $(OutDir)gmock.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -82,7 +159,7 @@ $(OutDir)gmock.pdb - + %(AdditionalOptions) MaxSpeed @@ -90,14 +167,50 @@ _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + Level4 + true + stdcpp14 + ProgramDatabase + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + + + Windows + true + $(OutDir)gmock.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true true + MultiThreadedDLL true Level4 true + stdcpp14 ProgramDatabase $(OutDir)gmock.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -116,17 +229,17 @@ - + + + - - - - + + diff --git a/JSImpl/test/gmock.vcxproj.filters b/JSImpl/test/gmock.vcxproj.filters index 7ecdd12..cbfa3cf 100644 --- a/JSImpl/test/gmock.vcxproj.filters +++ b/JSImpl/test/gmock.vcxproj.filters @@ -1,5 +1,5 @@ - + {E2296FC4-CEE1-B011-37E9-896D23C04B02} @@ -18,37 +18,37 @@ - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock diff --git a/JSImpl/test/gtest.make b/JSImpl/test/gtest.make index 50c7757..44e1cb0 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=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,72 @@ endif MAKEFILE = gtest.make +ifeq ($(config),debug) + OBJDIR = ../build/obj/Debug/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++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)/googletest/googletest/src/gtest-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release) + OBJDIR = ../build/obj/Release/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++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)/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 @@ -56,11 +122,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)/googletest/googletest/src/gtest-all.o \ @@ -86,11 +155,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)/googletest/googletest/src/gtest-all.o \ @@ -113,7 +185,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 gtest ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) @@ -157,6 +229,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)/googletest/googletest/src/gtest-all.o: googletest/googletest/src/gtest-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/googletest/googletest/src @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj index 7adfade..5e12d95 100644 --- a/JSImpl/test/gtest.vcxproj +++ b/JSImpl/test/gtest.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,60 +21,129 @@ {EC34880F-5849-B0C0-21CB-53208D9EACF1} gtest - 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 + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\Debug\gtest\ + gtest + .lib + ..\build\bin\Debug\ ..\build\obj\Debug\x64\Debug\gtest\ gtest .lib + + ..\build\bin\Release\ + ..\build\obj\Release\Release\gtest\ + gtest + .lib + ..\build\bin\Release\ ..\build\obj\Release\x64\Release\gtest\ gtest .lib - + %(AdditionalOptions) Disabled googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + Level4 + true + stdcpp14 + EditAndContinue + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + + + Windows + true + $(OutDir)gtest.pdb + + + + + %(AdditionalOptions) + Disabled + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false true + EnableFastChecks + MultiThreadedDebugDLL true Level4 true + stdcpp14 EditAndContinue $(OutDir)gtest.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -82,7 +159,7 @@ $(OutDir)gtest.pdb - + %(AdditionalOptions) MaxSpeed @@ -90,14 +167,50 @@ _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + Level4 + true + stdcpp14 + ProgramDatabase + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + + + Windows + true + $(OutDir)gtest.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true true + MultiThreadedDLL true Level4 true + stdcpp14 ProgramDatabase $(OutDir)gtest.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -116,15 +229,15 @@ - + - - - - + + + + diff --git a/JSImpl/test/gtest.vcxproj.filters b/JSImpl/test/gtest.vcxproj.filters index 3a35c75..5f8e24b 100644 --- a/JSImpl/test/gtest.vcxproj.filters +++ b/JSImpl/test/gtest.vcxproj.filters @@ -1,5 +1,5 @@ - + {E2296FC4-CEE1-B011-37E9-896D23C04B02} @@ -18,7 +18,7 @@ - + googletest\googletest\include\gtest @@ -27,22 +27,22 @@ googletest\googletest\include\gtest - + googletest\googletest\include\gtest - + googletest\googletest\include\gtest - + googletest\googletest\include\gtest - + googletest\googletest\include\gtest - + googletest\googletest\include\gtest - + googletest\googletest\include\gtest diff --git a/JSImpl/test/gtest_main.make b/JSImpl/test/gtest_main.make index 4aa9a75..8a0d8af 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=debug64 + config=debug endif ifndef verbose @@ -42,6 +42,72 @@ endif MAKEFILE = gtest_main.make +ifeq ($(config),debug) + OBJDIR = ../build/obj/Debug/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++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)/googletest/googletest/src/gtest_main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release) + OBJDIR = ../build/obj/Release/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++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)/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 @@ -56,11 +122,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)/googletest/googletest/src/gtest_main.o \ @@ -86,11 +155,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)/googletest/googletest/src/gtest_main.o \ @@ -113,7 +185,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 gtest_main ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) @@ -157,6 +229,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)/googletest/googletest/src/gtest_main.o: googletest/googletest/src/gtest_main.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/googletest/googletest/src @echo $(notdir $<) $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj index 2ce7ce4..aeec05d 100644 --- a/JSImpl/test/gtest_main.vcxproj +++ b/JSImpl/test/gtest_main.vcxproj @@ -1,10 +1,18 @@ - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -13,60 +21,129 @@ {30B03E7E-1C68-80CB-856F-592771461BBC} gtest_main - 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 + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\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\ + gtest_main + .lib + ..\build\bin\Release\ ..\build\obj\Release\x64\Release\gtest_main\ gtest_main .lib - + %(AdditionalOptions) Disabled googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false + true EnableFastChecks MultiThreadedDebugDLL + true + + Level4 + true + stdcpp14 + EditAndContinue + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + + + Windows + true + $(OutDir)gtest_main.pdb + + + + + %(AdditionalOptions) + Disabled + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false true + EnableFastChecks + MultiThreadedDebugDLL true Level4 true + stdcpp14 EditAndContinue $(OutDir)gtest_main.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -82,7 +159,7 @@ $(OutDir)gtest_main.pdb - + %(AdditionalOptions) MaxSpeed @@ -90,14 +167,50 @@ _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true + true MultiThreadedDLL + true + + Level4 + true + stdcpp14 + ProgramDatabase + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + + + Windows + true + $(OutDir)gtest_main.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true true + MultiThreadedDLL true Level4 true + stdcpp14 ProgramDatabase $(OutDir)gtest_main.pdb + Caret _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/JSImpl/test/gtest_main.vcxproj.filters b/JSImpl/test/gtest_main.vcxproj.filters index 6ed8d96..55a8bc8 100644 --- a/JSImpl/test/gtest_main.vcxproj.filters +++ b/JSImpl/test/gtest_main.vcxproj.filters @@ -1,5 +1,5 @@ - + {E2296FC4-CEE1-B011-37E9-896D23C04B02} 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