From 028910e5b3340226d7943cedb229092b3cc514ed Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Sat, 2 Oct 2021 08:30:36 +0300 Subject: Generate project files in next to the solution - Also allows for the ninja generator of genie to work correctly --- JSImpl/solution/genie.lua | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'JSImpl/solution') diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua index 5d36fc8..0da986a 100644 --- a/JSImpl/solution/genie.lua +++ b/JSImpl/solution/genie.lua @@ -17,6 +17,11 @@ solution 'JSImpl' local root = '../build/' + if _ACTION ~= 'ninja' then + location '.' + else + location './ninja' + end configuration 'Debug' targetdir(root .. 'bin/Debug') @@ -36,6 +41,7 @@ solution 'JSImpl' kind 'StaticLib' language 'C++' uuid(os.uuid('JSLib')) + location(solution().location) files '../src/*.cpp' removefiles '../src/main.cpp' files '../src/*.h' @@ -44,6 +50,7 @@ solution 'JSImpl' kind 'ConsoleApp' language 'C++' uuid(os.uuid('JSImpl')) + location(solution().location) files '../src/main.cpp' links 'JSLib' -- cgit v1.3.1-23-gd82d From 5eff6e2dc1e01f9b8c891f1096ab6d3af0abe769 Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Sat, 2 Oct 2021 09:14:40 +0300 Subject: Regenerate projects to be next to solutions --- JSImpl/solution/JSImpl.sln | 22 +- JSImpl/solution/Makefile | 44 ++-- JSImpl/solution/Test.make | 287 ++++++++++++++++++++ JSImpl/solution/Test.vcxproj | 274 ++++++++++++++++++++ JSImpl/solution/Test.vcxproj.filters | 28 ++ JSImpl/solution/dummy_gc.make | 243 +++++++++++++++++ JSImpl/solution/dummy_gc.vcxproj | 241 +++++++++++++++++ JSImpl/solution/dummy_gc.vcxproj.filters | 16 ++ JSImpl/solution/gmock.make | 252 ++++++++++++++++++ JSImpl/solution/gmock.vcxproj | 253 ++++++++++++++++++ JSImpl/solution/gmock.vcxproj.filters | 63 +++++ JSImpl/solution/gtest.make | 252 ++++++++++++++++++ JSImpl/solution/gtest.vcxproj | 252 ++++++++++++++++++ JSImpl/solution/gtest.vcxproj.filters | 60 +++++ JSImpl/solution/gtest_main.make | 252 ++++++++++++++++++ JSImpl/solution/gtest_main.vcxproj | 240 +++++++++++++++++ JSImpl/solution/gtest_main.vcxproj.filters | 22 ++ JSImpl/solution/leak_gc.make | 243 +++++++++++++++++ JSImpl/solution/leak_gc.vcxproj | 241 +++++++++++++++++ JSImpl/solution/leak_gc.vcxproj.filters | 16 ++ JSImpl/solution/spasm.make | 243 +++++++++++++++++ JSImpl/solution/spasm.vcxproj | 241 +++++++++++++++++ JSImpl/solution/spasm.vcxproj.filters | 19 ++ JSImpl/solution/spasm_lib.make | 288 +++++++++++++++++++++ JSImpl/solution/spasm_lib.vcxproj | 242 +++++++++++++++++ JSImpl/solution/spasm_lib.vcxproj.filters | 34 +++ JSImpl/solution/sprt.make | 248 ++++++++++++++++++ JSImpl/solution/sprt.vcxproj | 232 +++++++++++++++++ JSImpl/solution/sprt.vcxproj.filters | 16 ++ JSImpl/solution/sprun.make | 243 +++++++++++++++++ JSImpl/solution/sprun.vcxproj | 241 +++++++++++++++++ JSImpl/solution/sprun.vcxproj.filters | 16 ++ JSImpl/solution/test_bench.make | 256 ++++++++++++++++++ JSImpl/solution/test_bench.vcxproj | 234 +++++++++++++++++ JSImpl/solution/test_bench.vcxproj.filters | 19 ++ JSImpl/test/Test.make | 287 -------------------- JSImpl/test/Test.vcxproj | 274 -------------------- JSImpl/test/Test.vcxproj.filters | 11 - JSImpl/test/gmock.make | 252 ------------------ JSImpl/test/gmock.vcxproj | 253 ------------------ JSImpl/test/gmock.vcxproj.filters | 60 ----- JSImpl/test/gtest.make | 252 ------------------ JSImpl/test/gtest.vcxproj | 252 ------------------ JSImpl/test/gtest.vcxproj.filters | 57 ---- JSImpl/test/gtest_main.make | 252 ------------------ JSImpl/test/gtest_main.vcxproj | 240 ----------------- JSImpl/test/gtest_main.vcxproj.filters | 19 -- gctest/solution/dummy_gc.make | 40 +-- gctest/solution/dummy_gc.vcxproj | 20 +- gctest/solution/leak_gc.make | 40 +-- gctest/solution/leak_gc.vcxproj | 20 +- gctest/solution/test_bench.make | 16 +- gctest/solution/test_bench.vcxproj | 20 +- gctest/src/minitrace/msvc/minitrace.vcxproj | 278 -------------------- .../src/minitrace/msvc/minitrace.vcxproj.filters | 10 - spasm/solution/spasm.make | 243 ----------------- spasm/solution/spasm.vcxproj | 245 ------------------ spasm/solution/spasm.vcxproj.filters | 16 -- spasm/solution/spasm.vcxproj.user | 19 -- spasm/solution/spasm_lib.make | 288 --------------------- spasm/solution/spasm_lib.vcxproj | 246 ------------------ spasm/solution/spasm_lib.vcxproj.filters | 31 --- spasm/solution/sprt.make | 248 ------------------ spasm/solution/sprt.vcxproj | 236 ----------------- spasm/solution/sprt.vcxproj.filters | 13 - spasm/solution/sprt.vcxproj.user | 19 -- spasm/solution/sprun.make | 243 ----------------- spasm/solution/sprun.vcxproj | 245 ------------------ spasm/solution/sprun.vcxproj.filters | 13 - spasm/solution/sprun.vcxproj.user | 19 -- 70 files changed, 5912 insertions(+), 4738 deletions(-) create mode 100644 JSImpl/solution/Test.make create mode 100644 JSImpl/solution/Test.vcxproj create mode 100644 JSImpl/solution/Test.vcxproj.filters create mode 100644 JSImpl/solution/dummy_gc.make create mode 100644 JSImpl/solution/dummy_gc.vcxproj create mode 100644 JSImpl/solution/dummy_gc.vcxproj.filters create mode 100644 JSImpl/solution/gmock.make create mode 100644 JSImpl/solution/gmock.vcxproj create mode 100644 JSImpl/solution/gmock.vcxproj.filters create mode 100644 JSImpl/solution/gtest.make create mode 100644 JSImpl/solution/gtest.vcxproj create mode 100644 JSImpl/solution/gtest.vcxproj.filters create mode 100644 JSImpl/solution/gtest_main.make create mode 100644 JSImpl/solution/gtest_main.vcxproj create mode 100644 JSImpl/solution/gtest_main.vcxproj.filters create mode 100644 JSImpl/solution/leak_gc.make create mode 100644 JSImpl/solution/leak_gc.vcxproj create mode 100644 JSImpl/solution/leak_gc.vcxproj.filters create mode 100644 JSImpl/solution/spasm.make create mode 100644 JSImpl/solution/spasm.vcxproj create mode 100644 JSImpl/solution/spasm.vcxproj.filters create mode 100644 JSImpl/solution/spasm_lib.make create mode 100644 JSImpl/solution/spasm_lib.vcxproj create mode 100644 JSImpl/solution/spasm_lib.vcxproj.filters create mode 100644 JSImpl/solution/sprt.make create mode 100644 JSImpl/solution/sprt.vcxproj create mode 100644 JSImpl/solution/sprt.vcxproj.filters create mode 100644 JSImpl/solution/sprun.make create mode 100644 JSImpl/solution/sprun.vcxproj create mode 100644 JSImpl/solution/sprun.vcxproj.filters create mode 100644 JSImpl/solution/test_bench.make create mode 100644 JSImpl/solution/test_bench.vcxproj create mode 100644 JSImpl/solution/test_bench.vcxproj.filters delete mode 100644 JSImpl/test/Test.make delete mode 100644 JSImpl/test/Test.vcxproj delete mode 100644 JSImpl/test/Test.vcxproj.filters delete mode 100644 JSImpl/test/gmock.make delete mode 100644 JSImpl/test/gmock.vcxproj delete mode 100644 JSImpl/test/gmock.vcxproj.filters delete mode 100644 JSImpl/test/gtest.make delete mode 100644 JSImpl/test/gtest.vcxproj delete mode 100644 JSImpl/test/gtest.vcxproj.filters delete mode 100644 JSImpl/test/gtest_main.make delete mode 100644 JSImpl/test/gtest_main.vcxproj delete mode 100644 JSImpl/test/gtest_main.vcxproj.filters delete mode 100644 gctest/src/minitrace/msvc/minitrace.vcxproj delete mode 100644 gctest/src/minitrace/msvc/minitrace.vcxproj.filters delete mode 100644 spasm/solution/spasm.make delete mode 100644 spasm/solution/spasm.vcxproj delete mode 100644 spasm/solution/spasm.vcxproj.filters delete mode 100644 spasm/solution/spasm.vcxproj.user delete mode 100644 spasm/solution/spasm_lib.make delete mode 100644 spasm/solution/spasm_lib.vcxproj delete mode 100644 spasm/solution/spasm_lib.vcxproj.filters delete mode 100644 spasm/solution/sprt.make delete mode 100644 spasm/solution/sprt.vcxproj delete mode 100644 spasm/solution/sprt.vcxproj.filters delete mode 100644 spasm/solution/sprt.vcxproj.user delete mode 100644 spasm/solution/sprun.make delete mode 100644 spasm/solution/sprun.vcxproj delete mode 100644 spasm/solution/sprun.vcxproj.filters delete mode 100644 spasm/solution/sprun.vcxproj.user (limited to 'JSImpl/solution') diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln index 89a91b3..5fcaac4 100644 --- a/JSImpl/solution/JSImpl.sln +++ b/JSImpl/solution/JSImpl.sln @@ -9,12 +9,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSImpl", "JSImpl", "{C30B50 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gctest", "gctest", "{5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}" ProjectSection(ProjectDependencies) = postProject {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}" ProjectSection(ProjectDependencies) = postProject {19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF} {30B03E7E-1C68-80CB-856F-592771461BBC} = {30B03E7E-1C68-80CB-856F-592771461BBC} @@ -24,11 +24,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxpro {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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\gmock.vcxproj", "{B686840F-229B-ACC0-EB1C-502057F0A8F1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{B686840F-229B-ACC0-EB1C-502057F0A8F1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\test\gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSLib", "JSLib.vcxproj", "{19EA680D-85FE-90BE-4E80-341EBA538DEF}" EndProject @@ -37,23 +37,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj", {19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprt", "..\..\spasm\solution\sprt.vcxproj", "{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprt", "sprt.vcxproj", "{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm_lib", "..\..\spasm\solution\spasm_lib.vcxproj", "{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm_lib", "spasm_lib.vcxproj", "{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\solution\spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}" ProjectSection(ProjectDependencies) = postProject {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "..\..\gctest\solution\test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "..\..\gctest\solution\leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}" ProjectSection(ProjectDependencies) = postProject {A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "..\..\gctest\solution\dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}" ProjectSection(ProjectDependencies) = postProject {A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325} EndProjectSection diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile index 78a826a..e1ea347 100644 --- a/JSImpl/solution/Makefile +++ b/JSImpl/solution/Makefile @@ -14,19 +14,19 @@ all: $(PROJECTS) Test: sprt spasm_lib JSLib gtest gmock gtest_main @echo "==== Building Test ($(config)) ====" - @${MAKE} --no-print-directory -C ../test -f Test.make + @${MAKE} --no-print-directory -C . -f Test.make gtest: @echo "==== Building gtest ($(config)) ====" - @${MAKE} --no-print-directory -C ../test -f gtest.make + @${MAKE} --no-print-directory -C . -f gtest.make gmock: @echo "==== Building gmock ($(config)) ====" - @${MAKE} --no-print-directory -C ../test -f gmock.make + @${MAKE} --no-print-directory -C . -f gmock.make gtest_main: @echo "==== Building gtest_main ($(config)) ====" - @${MAKE} --no-print-directory -C ../test -f gtest_main.make + @${MAKE} --no-print-directory -C . -f gtest_main.make JSLib: @echo "==== Building JSLib ($(config)) ====" @@ -38,46 +38,46 @@ JSImpl: JSLib sprt: @echo "==== Building sprt ($(config)) ====" - @${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make + @${MAKE} --no-print-directory -C . -f sprt.make spasm_lib: @echo "==== Building spasm_lib ($(config)) ====" - @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make + @${MAKE} --no-print-directory -C . -f spasm_lib.make spasm: spasm_lib @echo "==== Building spasm ($(config)) ====" - @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make + @${MAKE} --no-print-directory -C . -f spasm.make sprun: sprt @echo "==== Building sprun ($(config)) ====" - @${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make + @${MAKE} --no-print-directory -C . -f sprun.make test_bench: @echo "==== Building test_bench ($(config)) ====" - @${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make + @${MAKE} --no-print-directory -C . -f test_bench.make leak_gc: test_bench @echo "==== Building leak_gc ($(config)) ====" - @${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make + @${MAKE} --no-print-directory -C . -f leak_gc.make dummy_gc: test_bench @echo "==== Building dummy_gc ($(config)) ====" - @${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make + @${MAKE} --no-print-directory -C . -f dummy_gc.make clean: - @${MAKE} --no-print-directory -C ../test -f Test.make clean - @${MAKE} --no-print-directory -C ../test -f gtest.make clean - @${MAKE} --no-print-directory -C ../test -f gmock.make clean - @${MAKE} --no-print-directory -C ../test -f gtest_main.make clean + @${MAKE} --no-print-directory -C . -f Test.make clean + @${MAKE} --no-print-directory -C . -f gtest.make clean + @${MAKE} --no-print-directory -C . -f gmock.make clean + @${MAKE} --no-print-directory -C . -f gtest_main.make clean @${MAKE} --no-print-directory -C . -f JSLib.make clean @${MAKE} --no-print-directory -C . -f JSImpl.make clean - @${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make clean - @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make clean - @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make clean - @${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make clean - @${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make clean - @${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make clean - @${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make clean + @${MAKE} --no-print-directory -C . -f sprt.make clean + @${MAKE} --no-print-directory -C . -f spasm_lib.make clean + @${MAKE} --no-print-directory -C . -f spasm.make clean + @${MAKE} --no-print-directory -C . -f sprun.make clean + @${MAKE} --no-print-directory -C . -f test_bench.make clean + @${MAKE} --no-print-directory -C . -f leak_gc.make clean + @${MAKE} --no-print-directory -C . -f dummy_gc.make clean help: @echo "Usage: make [config=name] [target]" diff --git a/JSImpl/solution/Test.make b/JSImpl/solution/Test.make new file mode 100644 index 0000000..495a888 --- /dev/null +++ b/JSImpl/solution/Test.make @@ -0,0 +1,287 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = Test.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/Test + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/Test + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest/include" -I"../test/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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m32 + LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a + LDDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a + LDRESP = + LIBS += $(LDDEPS) -lpthread + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/ASTInterpreterTests.o \ + $(OBJDIR)/test/CodeGenerationTests.o \ + $(OBJDIR)/test/LexerTests.o \ + $(OBJDIR)/test/ParserTests.o \ + $(OBJDIR)/test/empty.o \ + $(OBJDIR)/test/sprtTests.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/Test + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/Test + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest/include" -I"../test/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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." -m32 + LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a + LDDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a + LDRESP = + LIBS += $(LDDEPS) -lpthread + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/ASTInterpreterTests.o \ + $(OBJDIR)/test/CodeGenerationTests.o \ + $(OBJDIR)/test/LexerTests.o \ + $(OBJDIR)/test/ParserTests.o \ + $(OBJDIR)/test/empty.o \ + $(OBJDIR)/test/sprtTests.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/Test + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/Test + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest/include" -I"../test/googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m64 + LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a + LDDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a + LDRESP = + LIBS += $(LDDEPS) -lpthread + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/ASTInterpreterTests.o \ + $(OBJDIR)/test/CodeGenerationTests.o \ + $(OBJDIR)/test/LexerTests.o \ + $(OBJDIR)/test/ParserTests.o \ + $(OBJDIR)/test/empty.o \ + $(OBJDIR)/test/sprtTests.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/Test + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/Test + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest/include" -I"../test/googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." -m64 + LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a + LDDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a + LDRESP = + LIBS += $(LDDEPS) -lpthread + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/ASTInterpreterTests.o \ + $(OBJDIR)/test/CodeGenerationTests.o \ + $(OBJDIR)/test/LexerTests.o \ + $(OBJDIR)/test/ParserTests.o \ + $(OBJDIR)/test/empty.o \ + $(OBJDIR)/test/sprtTests.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/test \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Linking Test + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning Test +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/test/ASTInterpreterTests.o: ../test/ASTInterpreterTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/test/CodeGenerationTests.o: ../test/CodeGenerationTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/test/LexerTests.o: ../test/LexerTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/test/ParserTests.o: ../test/ParserTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/test/empty.o: ../test/empty.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/test/sprtTests.o: ../test/sprtTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/Test.vcxproj b/JSImpl/solution/Test.vcxproj new file mode 100644 index 0000000..63a2306 --- /dev/null +++ b/JSImpl/solution/Test.vcxproj @@ -0,0 +1,274 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F} + Test + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + false + v142 + true + + + 16.0 + Application + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\Test\ + Test + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\Test\ + Test + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\Test\ + Test + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\Test\ + Test + .exe + false + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)Test.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)Test.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)Test.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)Test.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)Test.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)Test.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)Test.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)Test.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)Test.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)Test.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) + + + Console + true + $(OutDir)Test.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)Test.exe + mainCRTStartup + MachineX64 + + + + + + + + + + + + + + + + + + + {19EA680D-85FE-90BE-4E80-341EBA538DEF} + + + {30B03E7E-1C68-80CB-856F-592771461BBC} + + + {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} + + + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} + + + {B686840F-229B-ACC0-EB1C-502057F0A8F1} + + + {EC34880F-5849-B0C0-21CB-53208D9EACF1} + + + + + + diff --git a/JSImpl/solution/Test.vcxproj.filters b/JSImpl/solution/Test.vcxproj.filters new file mode 100644 index 0000000..cd184ce --- /dev/null +++ b/JSImpl/solution/Test.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {65689E7C-519F-9F0D-FA8B-8510E6A11B0F} + + + + + test + + + test + + + test + + + test + + + test + + + test + + + diff --git a/JSImpl/solution/dummy_gc.make b/JSImpl/solution/dummy_gc.make new file mode 100644 index 0000000..a11c028 --- /dev/null +++ b/JSImpl/solution/dummy_gc.make @@ -0,0 +1,243 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = dummy_gc.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/dummy_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/dummy_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/dummy_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/dummy_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/dummy_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/dummy_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/dummy_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/dummy_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_dummy.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/gctest/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Linking dummy_gc + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning dummy_gc +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/gctest/src/gc_dummy.o: ../../gctest/src/gc_dummy.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/dummy_gc.vcxproj b/JSImpl/solution/dummy_gc.vcxproj new file mode 100644 index 0000000..3cc8316 --- /dev/null +++ b/JSImpl/solution/dummy_gc.vcxproj @@ -0,0 +1,241 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293} + dummy_gc + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + false + v142 + true + + + 16.0 + Application + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\dummy_gc\ + dummy_gc + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\dummy_gc\ + dummy_gc + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\dummy_gc\ + dummy_gc + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\dummy_gc\ + dummy_gc + .exe + false + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)dummy_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)dummy_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)dummy_gc.exe + mainCRTStartup + MachineX64 + + + + + + + + + {A41847E7-90D0-8834-F9D7-6190E5AE2325} + + + + + + diff --git a/JSImpl/solution/dummy_gc.vcxproj.filters b/JSImpl/solution/dummy_gc.vcxproj.filters new file mode 100644 index 0000000..8234682 --- /dev/null +++ b/JSImpl/solution/dummy_gc.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {4F3063FF-3BD2-8DD5-248D-A12910CE1426} + + + {F32A4563-DFE2-86B0-48EA-5F0C34C121A1} + + + + + gctest\src + + + diff --git a/JSImpl/solution/gmock.make b/JSImpl/solution/gmock.make new file mode 100644 index 0000000..e171c1e --- /dev/null +++ b/JSImpl/solution/gmock.make @@ -0,0 +1,252 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = gmock.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/gmock + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libgmock.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/gmock + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libgmock.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/gmock + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libgmock.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/gmock + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libgmock.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/test/googletest/googlemock/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Archiving gmock +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) +endif + $(SILENT) $(LINKCMD) $(LINKOBJS) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning gmock +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/test/googletest/googlemock/src/gmock-all.o: ../test/googletest/googlemock/src/gmock-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/test/googletest/googlemock/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/gmock.vcxproj b/JSImpl/solution/gmock.vcxproj new file mode 100644 index 0000000..a792ffa --- /dev/null +++ b/JSImpl/solution/gmock.vcxproj @@ -0,0 +1,253 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B686840F-229B-ACC0-EB1C-502057F0A8F1} + gmock + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\gmock\ + gmock + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\gmock\ + gmock + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\gmock\ + gmock + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\gmock\ + gmock + .lib + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + MachineX86 + + + Windows + true + $(OutDir)gmock.pdb + + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + MachineX64 + + + Windows + true + $(OutDir)gmock.pdb + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + MachineX86 + + + Windows + true + $(OutDir)gmock.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)gmock.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gmock.lib + MachineX64 + + + Windows + true + $(OutDir)gmock.pdb + true + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSImpl/solution/gmock.vcxproj.filters b/JSImpl/solution/gmock.vcxproj.filters new file mode 100644 index 0000000..7c25639 --- /dev/null +++ b/JSImpl/solution/gmock.vcxproj.filters @@ -0,0 +1,63 @@ + + + + + {65689E7C-519F-9F0D-FA8B-8510E6A11B0F} + + + {3EADE347-AA38-510C-B349-D4001F54AD0C} + + + {41EA1C81-2DFA-C851-96B3-2D7082E2B7EA} + + + {E58D4E3E-D1B3-18A5-BAF9-9D70A6BE3D71} + + + {412E1FB2-2D6A-221C-967C-3A1382D7CA36} + + + {6E3BF3ED-5AB8-E630-8335-E7446F1183C4} + + + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + test\googletest\googlemock\include\gmock + + + + + test\googletest\googlemock\src + + + diff --git a/JSImpl/solution/gtest.make b/JSImpl/solution/gtest.make new file mode 100644 index 0000000..474f7be --- /dev/null +++ b/JSImpl/solution/gtest.make @@ -0,0 +1,252 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = gtest.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/gtest + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libgtest.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/gtest + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libgtest.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/gtest + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libgtest.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/gtest + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libgtest.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest-all.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/test/googletest/googletest/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Archiving gtest +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) +endif + $(SILENT) $(LINKCMD) $(LINKOBJS) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning gtest +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/test/googletest/googletest/src/gtest-all.o: ../test/googletest/googletest/src/gtest-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/test/googletest/googletest/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/gtest.vcxproj b/JSImpl/solution/gtest.vcxproj new file mode 100644 index 0000000..d0df4d8 --- /dev/null +++ b/JSImpl/solution/gtest.vcxproj @@ -0,0 +1,252 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {EC34880F-5849-B0C0-21CB-53208D9EACF1} + gtest + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\gtest\ + gtest + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\gtest\ + gtest + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\gtest\ + gtest + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\gtest\ + gtest + .lib + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + MachineX86 + + + Windows + true + $(OutDir)gtest.pdb + + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + MachineX64 + + + Windows + true + $(OutDir)gtest.pdb + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + MachineX86 + + + Windows + true + $(OutDir)gtest.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)gtest.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest.lib + MachineX64 + + + Windows + true + $(OutDir)gtest.pdb + true + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSImpl/solution/gtest.vcxproj.filters b/JSImpl/solution/gtest.vcxproj.filters new file mode 100644 index 0000000..68d19e3 --- /dev/null +++ b/JSImpl/solution/gtest.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {65689E7C-519F-9F0D-FA8B-8510E6A11B0F} + + + {3EADE347-AA38-510C-B349-D4001F54AD0C} + + + {77982081-63A8-CC51-CC61-3170B890BBEA} + + + {1B674AD8-078D-143F-F0D2-990ADC97390B} + + + {77B2302C-63EE-3396-CC00-4C8DB85BDCB0} + + + {5A3EE434-46BB-D777-6F38-D88B5B14740B} + + + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + test\googletest\googletest\include\gtest + + + + + test\googletest\googletest\src + + + diff --git a/JSImpl/solution/gtest_main.make b/JSImpl/solution/gtest_main.make new file mode 100644 index 0000000..ab25f0b --- /dev/null +++ b/JSImpl/solution/gtest_main.make @@ -0,0 +1,252 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = gtest_main.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/gtest_main + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libgtest_main.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest_main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/gtest_main + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libgtest_main.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest_main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/gtest_main + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libgtest_main.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest_main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/gtest_main + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libgtest_main.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + INCLUDES += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include" + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/test/googletest/googletest/src/gtest_main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/test/googletest/googletest/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Archiving gtest_main +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) +endif + $(SILENT) $(LINKCMD) $(LINKOBJS) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning gtest_main +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/test/googletest/googletest/src/gtest_main.o: ../test/googletest/googletest/src/gtest_main.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/test/googletest/googletest/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/gtest_main.vcxproj b/JSImpl/solution/gtest_main.vcxproj new file mode 100644 index 0000000..5531dc1 --- /dev/null +++ b/JSImpl/solution/gtest_main.vcxproj @@ -0,0 +1,240 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {30B03E7E-1C68-80CB-856F-592771461BBC} + gtest_main + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\gtest_main\ + gtest_main + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\gtest_main\ + gtest_main + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\gtest_main\ + gtest_main + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\gtest_main\ + gtest_main + .lib + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + MachineX86 + + + Windows + true + $(OutDir)gtest_main.pdb + + + + + %(AdditionalOptions) + Disabled + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + MachineX64 + + + Windows + true + $(OutDir)gtest_main.pdb + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + MachineX86 + + + Windows + true + $(OutDir)gtest_main.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)gtest_main.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories) + + + $(OutDir)gtest_main.lib + MachineX64 + + + Windows + true + $(OutDir)gtest_main.pdb + true + true + + + + + + + + + + diff --git a/JSImpl/solution/gtest_main.vcxproj.filters b/JSImpl/solution/gtest_main.vcxproj.filters new file mode 100644 index 0000000..f0131fd --- /dev/null +++ b/JSImpl/solution/gtest_main.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {65689E7C-519F-9F0D-FA8B-8510E6A11B0F} + + + {3EADE347-AA38-510C-B349-D4001F54AD0C} + + + {77982081-63A8-CC51-CC61-3170B890BBEA} + + + {1B674AD8-078D-143F-F0D2-990ADC97390B} + + + + + test\googletest\googletest\src + + + diff --git a/JSImpl/solution/leak_gc.make b/JSImpl/solution/leak_gc.make new file mode 100644 index 0000000..141ea6b --- /dev/null +++ b/JSImpl/solution/leak_gc.make @@ -0,0 +1,243 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = leak_gc.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/leak_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/leak_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/leak_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/leak_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/leak_gc + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/leak_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/leak_gc + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/leak_gc + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/gc_leak.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/gctest/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Linking leak_gc + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning leak_gc +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/gctest/src/gc_leak.o: ../../gctest/src/gc_leak.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/leak_gc.vcxproj b/JSImpl/solution/leak_gc.vcxproj new file mode 100644 index 0000000..7ba5b98 --- /dev/null +++ b/JSImpl/solution/leak_gc.vcxproj @@ -0,0 +1,241 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8BDD0170-F7BC-800B-00D5-0BE26C33E76C} + leak_gc + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + false + v142 + true + + + 16.0 + Application + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\leak_gc\ + leak_gc + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\leak_gc\ + leak_gc + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\leak_gc\ + leak_gc + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\leak_gc\ + leak_gc + .exe + false + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)leak_gc.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)leak_gc.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)leak_gc.exe + mainCRTStartup + MachineX64 + + + + + + + + + {A41847E7-90D0-8834-F9D7-6190E5AE2325} + + + + + + diff --git a/JSImpl/solution/leak_gc.vcxproj.filters b/JSImpl/solution/leak_gc.vcxproj.filters new file mode 100644 index 0000000..c04d52b --- /dev/null +++ b/JSImpl/solution/leak_gc.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {4F3063FF-3BD2-8DD5-248D-A12910CE1426} + + + {F32A4563-DFE2-86B0-48EA-5F0C34C121A1} + + + + + gctest\src + + + diff --git a/JSImpl/solution/spasm.make b/JSImpl/solution/spasm.make new file mode 100644 index 0000000..27fa261 --- /dev/null +++ b/JSImpl/solution/spasm.make @@ -0,0 +1,243 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = spasm.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/spasm + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libspasm_lib.a + LDDEPS += ../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)/spasm/src/asm/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/spasm + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libspasm_lib.a + LDDEPS += ../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)/spasm/src/asm/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/spasm + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/spasm + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libspasm_lib.a + LDDEPS += ../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)/spasm/src/asm/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/spasm + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/spasm + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libspasm_lib.a + LDDEPS += ../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)/spasm/src/asm/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/spasm/src/asm \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Linking spasm + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning spasm +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/spasm/src/asm/main.o: ../../spasm/src/asm/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/spasm.vcxproj b/JSImpl/solution/spasm.vcxproj new file mode 100644 index 0000000..dabe74a --- /dev/null +++ b/JSImpl/solution/spasm.vcxproj @@ -0,0 +1,241 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {69185F10-D52C-87C1-9EAE-2A210A8283F2} + spasm + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + false + v142 + true + + + 16.0 + Application + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\spasm\ + spasm + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\spasm\ + spasm + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\spasm\ + spasm + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\spasm\ + spasm + .exe + false + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)spasm.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)spasm.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)spasm.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)spasm.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)spasm.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)spasm.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)spasm.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)spasm.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)spasm.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)spasm.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)spasm.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)spasm.exe + mainCRTStartup + MachineX64 + + + + + + + + + {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} + + + + + + diff --git a/JSImpl/solution/spasm.vcxproj.filters b/JSImpl/solution/spasm.vcxproj.filters new file mode 100644 index 0000000..17e26cc --- /dev/null +++ b/JSImpl/solution/spasm.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {69185F10-D52C-87C1-9EAE-2A210A8283F2} + + + {0D90CBE1-79FA-7F58-C238-31FE2EE25DAD} + + + {4AED32FE-B6AD-AE34-7FE8-F7B1EB67F310} + + + + + spasm\src\asm + + + diff --git a/JSImpl/solution/spasm_lib.make b/JSImpl/solution/spasm_lib.make new file mode 100644 index 0000000..5377633 --- /dev/null +++ b/JSImpl/solution/spasm_lib.make @@ -0,0 +1,288 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = spasm_lib.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/spasm_lib + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/asm/assembler.o \ + $(OBJDIR)/spasm/src/asm/bytecode.o \ + $(OBJDIR)/spasm/src/asm/lexer.o \ + $(OBJDIR)/spasm/src/asm/symbol.o \ + $(OBJDIR)/spasm/src/asm/token.o \ + $(OBJDIR)/spasm/src/asm/tokenizer.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/spasm_lib + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/asm/assembler.o \ + $(OBJDIR)/spasm/src/asm/bytecode.o \ + $(OBJDIR)/spasm/src/asm/lexer.o \ + $(OBJDIR)/spasm/src/asm/symbol.o \ + $(OBJDIR)/spasm/src/asm/token.o \ + $(OBJDIR)/spasm/src/asm/tokenizer.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/spasm_lib + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libspasm_lib.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/asm/assembler.o \ + $(OBJDIR)/spasm/src/asm/bytecode.o \ + $(OBJDIR)/spasm/src/asm/lexer.o \ + $(OBJDIR)/spasm/src/asm/symbol.o \ + $(OBJDIR)/spasm/src/asm/token.o \ + $(OBJDIR)/spasm/src/asm/tokenizer.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/spasm_lib + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libspasm_lib.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/asm/assembler.o \ + $(OBJDIR)/spasm/src/asm/bytecode.o \ + $(OBJDIR)/spasm/src/asm/lexer.o \ + $(OBJDIR)/spasm/src/asm/symbol.o \ + $(OBJDIR)/spasm/src/asm/token.o \ + $(OBJDIR)/spasm/src/asm/tokenizer.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/spasm/src/asm \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Archiving spasm_lib +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) +endif + $(SILENT) $(LINKCMD) $(LINKOBJS) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning spasm_lib +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/spasm/src/asm/assembler.o: ../../spasm/src/asm/assembler.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/spasm/src/asm/bytecode.o: ../../spasm/src/asm/bytecode.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/spasm/src/asm/lexer.o: ../../spasm/src/asm/lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/spasm/src/asm/symbol.o: ../../spasm/src/asm/symbol.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/spasm/src/asm/token.o: ../../spasm/src/asm/token.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/spasm/src/asm/tokenizer.o: ../../spasm/src/asm/tokenizer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/spasm_lib.vcxproj b/JSImpl/solution/spasm_lib.vcxproj new file mode 100644 index 0000000..68f208a --- /dev/null +++ b/JSImpl/solution/spasm_lib.vcxproj @@ -0,0 +1,242 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} + spasm_lib + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\spasm_lib\ + spasm_lib + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\spasm_lib\ + spasm_lib + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\spasm_lib\ + spasm_lib + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\spasm_lib\ + spasm_lib + .lib + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)spasm_lib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)spasm_lib.lib + MachineX86 + + + Windows + true + $(OutDir)spasm_lib.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)spasm_lib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)spasm_lib.lib + MachineX64 + + + Windows + true + $(OutDir)spasm_lib.pdb + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)spasm_lib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)spasm_lib.lib + MachineX86 + + + Windows + true + $(OutDir)spasm_lib.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)spasm_lib.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)spasm_lib.lib + MachineX64 + + + Windows + true + $(OutDir)spasm_lib.pdb + true + true + + + + + + + + + + + + + + + + + + + + diff --git a/JSImpl/solution/spasm_lib.vcxproj.filters b/JSImpl/solution/spasm_lib.vcxproj.filters new file mode 100644 index 0000000..76e6e4a --- /dev/null +++ b/JSImpl/solution/spasm_lib.vcxproj.filters @@ -0,0 +1,34 @@ + + + + + {69185F10-D52C-87C1-9EAE-2A210A8283F2} + + + {0D90CBE1-79FA-7F58-C238-31FE2EE25DAD} + + + {4AED32FE-B6AD-AE34-7FE8-F7B1EB67F310} + + + + + spasm\src\asm + + + spasm\src\asm + + + spasm\src\asm + + + spasm\src\asm + + + spasm\src\asm + + + spasm\src\asm + + + diff --git a/JSImpl/solution/sprt.make b/JSImpl/solution/sprt.make new file mode 100644 index 0000000..1edc73e --- /dev/null +++ b/JSImpl/solution/sprt.make @@ -0,0 +1,248 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = sprt.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/sprt + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/spasm.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/sprt + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/spasm.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/sprt + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libsprt.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/spasm.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/sprt + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libsprt.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/spasm/src/spasm.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/spasm/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Archiving sprt +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) +endif + $(SILENT) $(LINKCMD) $(LINKOBJS) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning sprt +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/spasm/src/spasm.o: ../../spasm/src/spasm.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/sprt.vcxproj b/JSImpl/solution/sprt.vcxproj new file mode 100644 index 0000000..e663532 --- /dev/null +++ b/JSImpl/solution/sprt.vcxproj @@ -0,0 +1,232 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} + sprt + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\sprt\ + sprt + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\sprt\ + sprt + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\sprt\ + sprt + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\sprt\ + sprt + .lib + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)sprt.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)sprt.lib + MachineX86 + + + Windows + true + $(OutDir)sprt.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(OutDir)sprt.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)sprt.lib + MachineX64 + + + Windows + true + $(OutDir)sprt.pdb + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)sprt.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)sprt.lib + MachineX86 + + + Windows + true + $(OutDir)sprt.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(OutDir)sprt.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + $(OutDir)sprt.lib + MachineX64 + + + Windows + true + $(OutDir)sprt.pdb + true + true + + + + + + + + + + diff --git a/JSImpl/solution/sprt.vcxproj.filters b/JSImpl/solution/sprt.vcxproj.filters new file mode 100644 index 0000000..a916177 --- /dev/null +++ b/JSImpl/solution/sprt.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {69185F10-D52C-87C1-9EAE-2A210A8283F2} + + + {0D90CBE1-79FA-7F58-C238-31FE2EE25DAD} + + + + + spasm\src + + + diff --git a/JSImpl/solution/sprun.make b/JSImpl/solution/sprun.make new file mode 100644 index 0000000..93d59fa --- /dev/null +++ b/JSImpl/solution/sprun.make @@ -0,0 +1,243 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = sprun.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/sprun + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libsprt.a + LDDEPS += ../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)/spasm/src/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/sprun + TARGETDIR = ../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 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libsprt.a + LDDEPS += ../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)/spasm/src/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/sprun + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/sprun + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libsprt.a + LDDEPS += ../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)/spasm/src/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/sprun + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/sprun + DEFINES += -D_SCL_SECURE_NO_WARNINGS + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libsprt.a + LDDEPS += ../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)/spasm/src/main.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/spasm/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Linking sprun + $(SILENT) $(LINKCMD) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning sprun +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/spasm/src/main.o: ../../spasm/src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/sprun.vcxproj b/JSImpl/solution/sprun.vcxproj new file mode 100644 index 0000000..d4bfefc --- /dev/null +++ b/JSImpl/solution/sprun.vcxproj @@ -0,0 +1,241 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FD605F10-6975-87C1-32F7-2A219ECA83F2} + sprun + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + true + v142 + true + + + 16.0 + Application + false + v142 + true + + + 16.0 + Application + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\sprun\ + sprun + .exe + true + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\sprun\ + sprun + .exe + true + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\sprun\ + sprun + .exe + false + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\sprun\ + sprun + .exe + false + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)sprun.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)sprun.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)sprun.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level4 + true + stdcpp17 + EditAndContinue + $(IntDir)sprun.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)sprun.pdb + ;%(AdditionalLibraryDirectories) + $(OutDir)sprun.exe + mainCRTStartup + MachineX64 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)sprun.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)sprun.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)sprun.exe + mainCRTStartup + MachineX86 + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level4 + true + stdcpp17 + ProgramDatabase + $(IntDir)sprun.compile.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + $(OutDir)sprun.pdb + true + true + ;%(AdditionalLibraryDirectories) + $(OutDir)sprun.exe + mainCRTStartup + MachineX64 + + + + + + + + + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} + + + + + + diff --git a/JSImpl/solution/sprun.vcxproj.filters b/JSImpl/solution/sprun.vcxproj.filters new file mode 100644 index 0000000..62f9194 --- /dev/null +++ b/JSImpl/solution/sprun.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {69185F10-D52C-87C1-9EAE-2A210A8283F2} + + + {0D90CBE1-79FA-7F58-C238-31FE2EE25DAD} + + + + + spasm\src + + + diff --git a/JSImpl/solution/test_bench.make b/JSImpl/solution/test_bench.make new file mode 100644 index 0000000..460d693 --- /dev/null +++ b/JSImpl/solution/test_bench.make @@ -0,0 +1,256 @@ +# GNU Make project makefile autogenerated by GENie +ifndef config + config=debug32 +endif + +ifndef verbose + SILENT = @ +endif + +SHELLTYPE := msdos +ifeq (,$(ComSpec)$(COMSPEC)) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(SHELL))) + SHELLTYPE := posix +endif +ifeq (/bin,$(findstring /bin,$(MAKESHELL))) + SHELLTYPE := posix +endif + +ifeq (posix,$(SHELLTYPE)) + MKDIR = $(SILENT) mkdir -p "$(1)" + COPY = $(SILENT) cp -fR "$(1)" "$(2)" + RM = $(SILENT) rm -f "$(1)" +else + MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 + COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 +endif + +CC = gcc +CXX = g++ +AR = ar + +ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) + else + RESCOMP = windres + endif +endif + +MAKEFILE = test_bench.make + +ifeq ($(config),debug32) + OBJDIR = ../build/obj/Debug/x32/Debug/test_bench + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/main.o \ + $(OBJDIR)/gctest/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release32) + OBJDIR = ../build/obj/Release/x32/Release/test_bench + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m32 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/main.o \ + $(OBJDIR)/gctest/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),debug64) + OBJDIR = ../build/obj/Debug/x64/Debug/test_bench + TARGETDIR = ../build/bin/Debug + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/main.o \ + $(OBJDIR)/gctest/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +ifeq ($(config),release64) + OBJDIR = ../build/obj/Release/x64/Release/test_bench + TARGETDIR = ../build/bin/Release + TARGET = $(TARGETDIR)/libtest_bench.a + DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) + ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 + ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) + ALL_LDFLAGS += $(LDFLAGS) -m64 + LIBDEPS += + LDDEPS += + LDRESP = + LIBS += $(LDDEPS) + EXTERNAL_LIBS += + LINKOBJS = $(OBJECTS) + LINKCMD = $(AR) -rcs $(TARGET) + OBJRESP = + OBJECTS := \ + $(OBJDIR)/gctest/src/main.o \ + $(OBJDIR)/gctest/src/minitrace.o \ + + define PREBUILDCMDS + endef + define PRELINKCMDS + endef + define POSTBUILDCMDS + endef +endif + +OBJDIRS := \ + $(OBJDIR) \ + $(OBJDIR)/gctest/src \ + +RESOURCES := \ + +.PHONY: clean prebuild prelink + +all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) + @: + +$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) + @echo Archiving test_bench +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) +endif + $(SILENT) $(LINKCMD) $(LINKOBJS) + $(POSTBUILDCMDS) + +$(TARGETDIR): + @echo Creating $(TARGETDIR) + -$(call MKDIR,$(TARGETDIR)) + +$(OBJDIRS): + @echo Creating $(@) + -$(call MKDIR,$@) + +clean: + @echo Cleaning test_bench +ifeq (posix,$(SHELLTYPE)) + $(SILENT) rm -f $(TARGET) + $(SILENT) rm -rf $(OBJDIR) +else + $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) + $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) +endif + +prebuild: + $(PREBUILDCMDS) + +prelink: + $(PRELINKCMDS) + +ifneq (,$(PCH)) +$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" + +$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) + @echo $(notdir $<) + $(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)/gctest/src/main.o: ../../gctest/src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +$(OBJDIR)/gctest/src/minitrace.o: ../../gctest/src/minitrace.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src + @echo $(notdir $<) + $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) +ifneq (,$(PCH)) + -include $(OBJDIR)/$(notdir $(PCH)).d + -include $(OBJDIR)/$(notdir $(PCH))_objc.d +endif diff --git a/JSImpl/solution/test_bench.vcxproj b/JSImpl/solution/test_bench.vcxproj new file mode 100644 index 0000000..88ac6fa --- /dev/null +++ b/JSImpl/solution/test_bench.vcxproj @@ -0,0 +1,234 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A41847E7-90D0-8834-F9D7-6190E5AE2325} + test_bench + 10.0 + 10.0.10240.0 + Win32Proj + + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + true + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + 16.0 + StaticLibrary + false + v142 + true + + + + + + + + + + + + + + + + + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\test_bench\ + test_bench + .lib + + + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\test_bench\ + test_bench + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\test_bench\ + test_bench + .lib + + + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\test_bench\ + test_bench + .lib + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level3 + true + stdcpp17 + EditAndContinue + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX86 + + + Windows + true + $(OutDir)test_bench.pdb + + + + + %(AdditionalOptions) + Disabled + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + EnableFastChecks + MultiThreadedDebugDLL + true + + Level3 + true + stdcpp17 + EditAndContinue + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX64 + + + Windows + true + $(OutDir)test_bench.pdb + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level3 + true + stdcpp17 + ProgramDatabase + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX86 + + + Windows + true + $(OutDir)test_bench.pdb + true + true + + + + + %(AdditionalOptions) + MaxSpeed + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + false + true + true + MultiThreadedDLL + true + + Level3 + true + stdcpp17 + ProgramDatabase + $(OutDir)test_bench.pdb + Caret + + + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions) + + + $(OutDir)test_bench.lib + MachineX64 + + + Windows + true + $(OutDir)test_bench.pdb + true + true + + + + + + + + + + + + diff --git a/JSImpl/solution/test_bench.vcxproj.filters b/JSImpl/solution/test_bench.vcxproj.filters new file mode 100644 index 0000000..c1f7270 --- /dev/null +++ b/JSImpl/solution/test_bench.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {4F3063FF-3BD2-8DD5-248D-A12910CE1426} + + + {F32A4563-DFE2-86B0-48EA-5F0C34C121A1} + + + + + gctest\src + + + gctest\src + + + diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make deleted file mode 100644 index 5701630..0000000 --- a/JSImpl/test/Test.make +++ /dev/null @@ -1,287 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = Test.make - -ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/Test - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/Test - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m32 - LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a - LDDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a - LDRESP = - LIBS += $(LDDEPS) -lpthread - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/ASTInterpreterTests.o \ - $(OBJDIR)/CodeGenerationTests.o \ - $(OBJDIR)/LexerTests.o \ - $(OBJDIR)/ParserTests.o \ - $(OBJDIR)/empty.o \ - $(OBJDIR)/sprtTests.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/Test - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/Test - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." -m32 - LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a - LDDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a - LDRESP = - LIBS += $(LDDEPS) -lpthread - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/ASTInterpreterTests.o \ - $(OBJDIR)/CodeGenerationTests.o \ - $(OBJDIR)/LexerTests.o \ - $(OBJDIR)/ParserTests.o \ - $(OBJDIR)/empty.o \ - $(OBJDIR)/sprtTests.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/Test - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/Test - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m64 - LIBDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a - LDDEPS += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a - LDRESP = - LIBS += $(LDDEPS) -lpthread - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/ASTInterpreterTests.o \ - $(OBJDIR)/CodeGenerationTests.o \ - $(OBJDIR)/LexerTests.o \ - $(OBJDIR)/ParserTests.o \ - $(OBJDIR)/empty.o \ - $(OBJDIR)/sprtTests.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/Test - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/Test - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -L"." -m64 - LIBDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a - LDDEPS += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a - LDRESP = - LIBS += $(LDDEPS) -lpthread - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/ASTInterpreterTests.o \ - $(OBJDIR)/CodeGenerationTests.o \ - $(OBJDIR)/LexerTests.o \ - $(OBJDIR)/ParserTests.o \ - $(OBJDIR)/empty.o \ - $(OBJDIR)/sprtTests.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/. \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Linking Test - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning Test -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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)/ASTInterpreterTests.o: ASTInterpreterTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/. - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - -$(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 "$<" - -$(OBJDIR)/ParserTests.o: ParserTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/. - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - -$(OBJDIR)/empty.o: empty.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/. - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - -$(OBJDIR)/sprtTests.o: sprtTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/. - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj deleted file mode 100644 index 1b61e01..0000000 --- a/JSImpl/test/Test.vcxproj +++ /dev/null @@ -1,274 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {45DC8C7C-3113-8E0D-DAFF-7310C6150A0F} - Test - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - Application - true - v142 - true - - - 16.0 - Application - true - v142 - true - - - 16.0 - Application - false - v142 - true - - - 16.0 - Application - false - v142 - true - - - - - - - - - - - - - - - - - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x32\Debug\Test\ - Test - .exe - true - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\Test\ - Test - .exe - true - - - ..\build\bin\Release\ - ..\build\obj\Release\x32\Release\Test\ - Test - .exe - false - - - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\Test\ - Test - .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 - stdcpp17 - EditAndContinue - $(IntDir)Test.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - - - Console - true - $(OutDir)Test.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)Test.exe - mainCRTStartup - MachineX86 - - - - - %(AdditionalOptions) - Disabled - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(IntDir)Test.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - - - Console - true - $(OutDir)Test.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)Test.exe - mainCRTStartup - MachineX64 - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(IntDir)Test.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - - - Console - true - $(OutDir)Test.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)Test.exe - mainCRTStartup - MachineX86 - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(IntDir)Test.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories) - - - Console - true - $(OutDir)Test.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)Test.exe - mainCRTStartup - MachineX64 - - - - - - - - - - - - - - - - - - - {19EA680D-85FE-90BE-4E80-341EBA538DEF} - - - {30B03E7E-1C68-80CB-856F-592771461BBC} - - - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} - - - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} - - - {B686840F-229B-ACC0-EB1C-502057F0A8F1} - - - {EC34880F-5849-B0C0-21CB-53208D9EACF1} - - - - - - diff --git a/JSImpl/test/Test.vcxproj.filters b/JSImpl/test/Test.vcxproj.filters deleted file mode 100644 index 50fcfb0..0000000 --- a/JSImpl/test/Test.vcxproj.filters +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/JSImpl/test/gmock.make b/JSImpl/test/gmock.make deleted file mode 100644 index 879ceb3..0000000 --- a/JSImpl/test/gmock.make +++ /dev/null @@ -1,252 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = gmock.make - -ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/gmock - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgmock.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googlemock/src/gmock-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/gmock - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgmock.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googlemock/src/gmock-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/gmock - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgmock.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googlemock/src/gmock-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/gmock - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgmock.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googlemock/src/gmock-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/googletest/googlemock/src \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Archiving gmock -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) -endif - $(SILENT) $(LINKCMD) $(LINKOBJS) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning gmock -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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 "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj deleted file mode 100644 index 5847c81..0000000 --- a/JSImpl/test/gmock.vcxproj +++ /dev/null @@ -1,253 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B686840F-229B-ACC0-EB1C-502057F0A8F1} - gmock - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - StaticLibrary - true - v142 - true - - - 16.0 - StaticLibrary - true - v142 - true - - - 16.0 - StaticLibrary - false - v142 - true - - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - - - - - - - - - - - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x32\Debug\gmock\ - gmock - .lib - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\gmock\ - gmock - .lib - - - ..\build\bin\Release\ - ..\build\obj\Release\x32\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 - stdcpp17 - EditAndContinue - $(OutDir)gmock.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gmock.lib - MachineX86 - - - Windows - true - $(OutDir)gmock.pdb - - - - - %(AdditionalOptions) - Disabled - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(OutDir)gmock.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gmock.lib - MachineX64 - - - Windows - true - $(OutDir)gmock.pdb - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)gmock.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gmock.lib - MachineX86 - - - Windows - true - $(OutDir)gmock.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)gmock.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gmock.lib - MachineX64 - - - Windows - true - $(OutDir)gmock.pdb - true - true - - - - - - - - - - - - - - - - - - - - - - - diff --git a/JSImpl/test/gmock.vcxproj.filters b/JSImpl/test/gmock.vcxproj.filters deleted file mode 100644 index cbfa3cf..0000000 --- a/JSImpl/test/gmock.vcxproj.filters +++ /dev/null @@ -1,60 +0,0 @@ - - - - - {E2296FC4-CEE1-B011-37E9-896D23C04B02} - - - {65B8EA6D-D124-A668-9A18-3EC60644C8D0} - - - {09CEDE5B-7590-12E6-BE40-A1722A42EBC3} - - - {65E05AA0-D1F8-41CA-9AA5-D163067DD663} - - - {92F8DC2D-FEB1-47D8-8711-62B2F3C9FD47} - - - - - 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 - - - - - googletest\googlemock\src - - - diff --git a/JSImpl/test/gtest.make b/JSImpl/test/gtest.make deleted file mode 100644 index e0fc567..0000000 --- a/JSImpl/test/gtest.make +++ /dev/null @@ -1,252 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = gtest.make - -ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/gtest - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgtest.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/gtest - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgtest.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/gtest - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgtest.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/gtest - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgtest.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest-all.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/googletest/googletest/src \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Archiving gtest -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) -endif - $(SILENT) $(LINKCMD) $(LINKOBJS) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning gtest -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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 "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj deleted file mode 100644 index 15f24e8..0000000 --- a/JSImpl/test/gtest.vcxproj +++ /dev/null @@ -1,252 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EC34880F-5849-B0C0-21CB-53208D9EACF1} - gtest - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - StaticLibrary - true - v142 - true - - - 16.0 - StaticLibrary - true - v142 - true - - - 16.0 - StaticLibrary - false - v142 - true - - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - - - - - - - - - - - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x32\Debug\gtest\ - gtest - .lib - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\gtest\ - gtest - .lib - - - ..\build\bin\Release\ - ..\build\obj\Release\x32\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 - stdcpp17 - EditAndContinue - $(OutDir)gtest.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest.lib - MachineX86 - - - Windows - true - $(OutDir)gtest.pdb - - - - - %(AdditionalOptions) - Disabled - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(OutDir)gtest.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest.lib - MachineX64 - - - Windows - true - $(OutDir)gtest.pdb - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)gtest.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest.lib - MachineX86 - - - Windows - true - $(OutDir)gtest.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)gtest.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest.lib - MachineX64 - - - Windows - true - $(OutDir)gtest.pdb - true - true - - - - - - - - - - - - - - - - - - - - - - diff --git a/JSImpl/test/gtest.vcxproj.filters b/JSImpl/test/gtest.vcxproj.filters deleted file mode 100644 index 5f8e24b..0000000 --- a/JSImpl/test/gtest.vcxproj.filters +++ /dev/null @@ -1,57 +0,0 @@ - - - - - {E2296FC4-CEE1-B011-37E9-896D23C04B02} - - - {9B66EE6D-07D3-A968-D0C6-41C63CF2CBD0} - - - {3FA7DAF5-AB69-0E80-F419-9D0C601BE75D} - - - {9B646C1A-077D-5344-D029-E3DD3C01E8DD} - - - {7EFBCD74-EAB4-381F-7314-53F9DFCCEE8E} - - - - - 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 - - - googletest\googletest\include\gtest - - - googletest\googletest\include\gtest - - - googletest\googletest\include\gtest - - - - - googletest\googletest\src - - - diff --git a/JSImpl/test/gtest_main.make b/JSImpl/test/gtest_main.make deleted file mode 100644 index 87cbc27..0000000 --- a/JSImpl/test/gtest_main.make +++ /dev/null @@ -1,252 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = gtest_main.make - -ifeq ($(config),debug32) - OBJDIR = ../build/obj/Debug/x32/Debug/gtest_main - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest_main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release32) - OBJDIR = ../build/obj/Release/x32/Release/gtest_main - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest_main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/gtest_main - TARGETDIR = ../build/bin/Debug - TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest_main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/gtest_main - TARGETDIR = ../build/bin/Release - TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - INCLUDES += -I"googletest/googletest" -I"googletest/googletest/include" - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/googletest/googletest/src/gtest_main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/googletest/googletest/src \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Archiving gtest_main -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) -endif - $(SILENT) $(LINKCMD) $(LINKOBJS) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning gtest_main -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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 "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj deleted file mode 100644 index 6c6df7c..0000000 --- a/JSImpl/test/gtest_main.vcxproj +++ /dev/null @@ -1,240 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {30B03E7E-1C68-80CB-856F-592771461BBC} - gtest_main - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - StaticLibrary - true - v142 - true - - - 16.0 - StaticLibrary - true - v142 - true - - - 16.0 - StaticLibrary - false - v142 - true - - - 16.0 - StaticLibrary - false - v142 - true - - - - - - - - - - - - - - - - - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x32\Debug\gtest_main\ - gtest_main - .lib - - - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\gtest_main\ - gtest_main - .lib - - - ..\build\bin\Release\ - ..\build\obj\Release\x32\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 - stdcpp17 - EditAndContinue - $(OutDir)gtest_main.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest_main.lib - MachineX86 - - - Windows - true - $(OutDir)gtest_main.pdb - - - - - %(AdditionalOptions) - Disabled - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(OutDir)gtest_main.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest_main.lib - MachineX64 - - - Windows - true - $(OutDir)gtest_main.pdb - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)gtest_main.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest_main.lib - MachineX86 - - - Windows - true - $(OutDir)gtest_main.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)gtest_main.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - - - $(OutDir)gtest_main.lib - MachineX64 - - - Windows - true - $(OutDir)gtest_main.pdb - true - true - - - - - - - - - - diff --git a/JSImpl/test/gtest_main.vcxproj.filters b/JSImpl/test/gtest_main.vcxproj.filters deleted file mode 100644 index 55a8bc8..0000000 --- a/JSImpl/test/gtest_main.vcxproj.filters +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {E2296FC4-CEE1-B011-37E9-896D23C04B02} - - - {9B66EE6D-07D3-A968-D0C6-41C63CF2CBD0} - - - {3FA7DAF5-AB69-0E80-F419-9D0C601BE75D} - - - - - googletest\googletest\src - - - diff --git a/gctest/solution/dummy_gc.make b/gctest/solution/dummy_gc.make index 7b308c8..f50e834 100644 --- a/gctest/solution/dummy_gc.make +++ b/gctest/solution/dummy_gc.make @@ -43,8 +43,8 @@ endif MAKEFILE = dummy_gc.make ifeq ($(config),debug32) - OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/dummy_gc - TARGETDIR = ../../JSImpl/build/bin/Debug + OBJDIR = ../build/obj/Debug/x32/Debug/dummy_gc + TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -54,9 +54,9 @@ ifeq ($(config),debug32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 - LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -75,8 +75,8 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/dummy_gc - TARGETDIR = ../../JSImpl/build/bin/Release + OBJDIR = ../build/obj/Release/x32/Release/dummy_gc + TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -86,9 +86,9 @@ ifeq ($(config),release32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 - LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -107,8 +107,8 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/dummy_gc - TARGETDIR = ../../JSImpl/build/bin/Debug + OBJDIR = ../build/obj/Debug/x64/Debug/dummy_gc + TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -118,9 +118,9 @@ ifeq ($(config),debug64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 - LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -139,8 +139,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/dummy_gc - TARGETDIR = ../../JSImpl/build/bin/Release + OBJDIR = ../build/obj/Release/x64/Release/dummy_gc + TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/dummy_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -150,9 +150,9 @@ ifeq ($(config),release64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 - LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += diff --git a/gctest/solution/dummy_gc.vcxproj b/gctest/solution/dummy_gc.vcxproj index f10ece1..aeb0afa 100644 --- a/gctest/solution/dummy_gc.vcxproj +++ b/gctest/solution/dummy_gc.vcxproj @@ -31,7 +31,6 @@ Application true v142 - x64 true @@ -39,7 +38,6 @@ Application true v142 - x64 true @@ -47,7 +45,6 @@ Application false v142 - x64 true @@ -55,7 +52,6 @@ Application false v142 - x64 true @@ -75,29 +71,29 @@ - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x32\Debug\dummy_gc\ + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\dummy_gc\ dummy_gc .exe true - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\dummy_gc\ + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\dummy_gc\ dummy_gc .exe true - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x32\Release\dummy_gc\ + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\dummy_gc\ dummy_gc .exe false - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\dummy_gc\ + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\dummy_gc\ dummy_gc .exe false diff --git a/gctest/solution/leak_gc.make b/gctest/solution/leak_gc.make index 4414edf..87e7c7f 100644 --- a/gctest/solution/leak_gc.make +++ b/gctest/solution/leak_gc.make @@ -43,8 +43,8 @@ endif MAKEFILE = leak_gc.make ifeq ($(config),debug32) - OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/leak_gc - TARGETDIR = ../../JSImpl/build/bin/Debug + OBJDIR = ../build/obj/Debug/x32/Debug/leak_gc + TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -54,9 +54,9 @@ ifeq ($(config),debug32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 - LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m32 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -75,8 +75,8 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/leak_gc - TARGETDIR = ../../JSImpl/build/bin/Release + OBJDIR = ../build/obj/Release/x32/Release/leak_gc + TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -86,9 +86,9 @@ ifeq ($(config),release32) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 - LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m32 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -107,8 +107,8 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/leak_gc - TARGETDIR = ../../JSImpl/build/bin/Debug + OBJDIR = ../build/obj/Debug/x64/Debug/leak_gc + TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -118,9 +118,9 @@ ifeq ($(config),debug64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 - LIBDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Debug/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 + LIBDEPS += ../build/bin/Debug/libtest_bench.a + LDDEPS += ../build/bin/Debug/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += @@ -139,8 +139,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/leak_gc - TARGETDIR = ../../JSImpl/build/bin/Release + OBJDIR = ../build/obj/Release/x64/Release/leak_gc + TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/leak_gc DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -150,9 +150,9 @@ ifeq ($(config),release64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 - LIBDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a - LDDEPS += ../../JSImpl/build/bin/Release/libtest_bench.a + ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 + LIBDEPS += ../build/bin/Release/libtest_bench.a + LDDEPS += ../build/bin/Release/libtest_bench.a LDRESP = LIBS += $(LDDEPS) EXTERNAL_LIBS += diff --git a/gctest/solution/leak_gc.vcxproj b/gctest/solution/leak_gc.vcxproj index eeba8db..f3e49a6 100644 --- a/gctest/solution/leak_gc.vcxproj +++ b/gctest/solution/leak_gc.vcxproj @@ -31,7 +31,6 @@ Application true v142 - x64 true @@ -39,7 +38,6 @@ Application true v142 - x64 true @@ -47,7 +45,6 @@ Application false v142 - x64 true @@ -55,7 +52,6 @@ Application false v142 - x64 true @@ -75,29 +71,29 @@ - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x32\Debug\leak_gc\ + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\leak_gc\ leak_gc .exe true - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\leak_gc\ + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\leak_gc\ leak_gc .exe true - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x32\Release\leak_gc\ + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\leak_gc\ leak_gc .exe false - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\leak_gc\ + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\leak_gc\ leak_gc .exe false diff --git a/gctest/solution/test_bench.make b/gctest/solution/test_bench.make index f58b981..f9a3344 100644 --- a/gctest/solution/test_bench.make +++ b/gctest/solution/test_bench.make @@ -43,8 +43,8 @@ endif MAKEFILE = test_bench.make ifeq ($(config),debug32) - OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/test_bench - TARGETDIR = ../../JSImpl/build/bin/Debug + OBJDIR = ../build/obj/Debug/x32/Debug/test_bench + TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -76,8 +76,8 @@ ifeq ($(config),debug32) endif ifeq ($(config),release32) - OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/test_bench - TARGETDIR = ../../JSImpl/build/bin/Release + OBJDIR = ../build/obj/Release/x32/Release/test_bench + TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -109,8 +109,8 @@ ifeq ($(config),release32) endif ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/test_bench - TARGETDIR = ../../JSImpl/build/bin/Debug + OBJDIR = ../build/obj/Debug/x64/Debug/test_bench + TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) @@ -142,8 +142,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/test_bench - TARGETDIR = ../../JSImpl/build/bin/Release + OBJDIR = ../build/obj/Release/x64/Release/test_bench + TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/libtest_bench.a DEFINES += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) diff --git a/gctest/solution/test_bench.vcxproj b/gctest/solution/test_bench.vcxproj index 5625175..b25e5ff 100644 --- a/gctest/solution/test_bench.vcxproj +++ b/gctest/solution/test_bench.vcxproj @@ -31,7 +31,6 @@ StaticLibrary true v142 - x64 true @@ -39,7 +38,6 @@ StaticLibrary true v142 - x64 true @@ -47,7 +45,6 @@ StaticLibrary false v142 - x64 true @@ -55,7 +52,6 @@ StaticLibrary false v142 - x64 true @@ -75,26 +71,26 @@ - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x32\Debug\test_bench\ + ..\build\bin\Debug\ + ..\build\obj\Debug\x32\Debug\test_bench\ test_bench .lib - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\test_bench\ + ..\build\bin\Debug\ + ..\build\obj\Debug\x64\Debug\test_bench\ test_bench .lib - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x32\Release\test_bench\ + ..\build\bin\Release\ + ..\build\obj\Release\x32\Release\test_bench\ test_bench .lib - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\test_bench\ + ..\build\bin\Release\ + ..\build\obj\Release\x64\Release\test_bench\ test_bench .lib diff --git a/gctest/src/minitrace/msvc/minitrace.vcxproj b/gctest/src/minitrace/msvc/minitrace.vcxproj deleted file mode 100644 index 362922f..0000000 --- a/gctest/src/minitrace/msvc/minitrace.vcxproj +++ /dev/null @@ -1,278 +0,0 @@ - - - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - {5554FDA1-8300-4DD4-AF89-0084AD76CD82} - Win32Proj - minitrace - 10.0.17763.0 - - - - Application - true - v141 - Unicode - - - Application - true - v141 - Unicode - - - Application - true - v141 - Unicode - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - Application - false - v141 - true - Unicode - - - Application - false - v141 - true - Unicode - - - Application - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - - - Level3 - Disabled - MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/gctest/src/minitrace/msvc/minitrace.vcxproj.filters b/gctest/src/minitrace/msvc/minitrace.vcxproj.filters deleted file mode 100644 index daffed3..0000000 --- a/gctest/src/minitrace/msvc/minitrace.vcxproj.filters +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/spasm/solution/spasm.make b/spasm/solution/spasm.make deleted file mode 100644 index 9a6687d..0000000 --- a/spasm/solution/spasm.make +++ /dev/null @@ -1,243 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = spasm.make - -ifeq ($(config),debug32) - OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/spasm - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/spasm - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 - 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),release32) - OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/spasm - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/spasm - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 - LIBDEPS += ../../JSImpl/build/bin/Release/libspasm_lib.a - LDDEPS += ../../JSImpl/build/bin/Release/libspasm_lib.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/spasm - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/spasm - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 - LIBDEPS += ../../JSImpl/build/bin/Debug/libspasm_lib.a - LDDEPS += ../../JSImpl/build/bin/Debug/libspasm_lib.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/spasm - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/spasm - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 - LIBDEPS += ../../JSImpl/build/bin/Release/libspasm_lib.a - LDDEPS += ../../JSImpl/build/bin/Release/libspasm_lib.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/src/asm \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Linking spasm - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning spasm -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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 "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj deleted file mode 100644 index e74771d..0000000 --- a/spasm/solution/spasm.vcxproj +++ /dev/null @@ -1,245 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {69185F10-D52C-87C1-9EAE-2A210A8283F2} - spasm - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - Application - true - v142 - x64 - true - - - 16.0 - Application - true - v142 - x64 - true - - - 16.0 - Application - false - v142 - x64 - true - - - 16.0 - Application - false - v142 - x64 - true - - - - - - - - - - - - - - - - - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x32\Debug\spasm\ - spasm - .exe - true - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\spasm\ - spasm - .exe - true - - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x32\Release\spasm\ - spasm - .exe - false - - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\spasm\ - spasm - .exe - false - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(IntDir)spasm.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)spasm.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)spasm.exe - mainCRTStartup - MachineX86 - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(IntDir)spasm.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)spasm.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)spasm.exe - mainCRTStartup - MachineX64 - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(IntDir)spasm.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)spasm.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)spasm.exe - mainCRTStartup - MachineX86 - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(IntDir)spasm.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)spasm.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)spasm.exe - mainCRTStartup - MachineX64 - - - - - - - - - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} - - - - - - diff --git a/spasm/solution/spasm.vcxproj.filters b/spasm/solution/spasm.vcxproj.filters deleted file mode 100644 index d75f1a8..0000000 --- a/spasm/solution/spasm.vcxproj.filters +++ /dev/null @@ -1,16 +0,0 @@ - - - - - {2DAB880B-99B4-887C-2230-9F7C8E38947C} - - - {6A9848A9-D677-C744-DF8F-521B4BEE2DA6} - - - - - src\asm - - - diff --git a/spasm/solution/spasm.vcxproj.user b/spasm/solution/spasm.vcxproj.user deleted file mode 100644 index f927c73..0000000 --- a/spasm/solution/spasm.vcxproj.user +++ /dev/null @@ -1,19 +0,0 @@ - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - diff --git a/spasm/solution/spasm_lib.make b/spasm/solution/spasm_lib.make deleted file mode 100644 index f52e8d0..0000000 --- a/spasm/solution/spasm_lib.make +++ /dev/null @@ -1,288 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = spasm_lib.make - -ifeq ($(config),debug32) - OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/spasm_lib - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/libspasm_lib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/assembler.o \ - $(OBJDIR)/src/asm/bytecode.o \ - $(OBJDIR)/src/asm/lexer.o \ - $(OBJDIR)/src/asm/symbol.o \ - $(OBJDIR)/src/asm/token.o \ - $(OBJDIR)/src/asm/tokenizer.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release32) - OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/spasm_lib - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/libspasm_lib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/assembler.o \ - $(OBJDIR)/src/asm/bytecode.o \ - $(OBJDIR)/src/asm/lexer.o \ - $(OBJDIR)/src/asm/symbol.o \ - $(OBJDIR)/src/asm/token.o \ - $(OBJDIR)/src/asm/tokenizer.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/spasm_lib - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/libspasm_lib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/assembler.o \ - $(OBJDIR)/src/asm/bytecode.o \ - $(OBJDIR)/src/asm/lexer.o \ - $(OBJDIR)/src/asm/symbol.o \ - $(OBJDIR)/src/asm/token.o \ - $(OBJDIR)/src/asm/tokenizer.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/spasm_lib - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/libspasm_lib.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/asm/assembler.o \ - $(OBJDIR)/src/asm/bytecode.o \ - $(OBJDIR)/src/asm/lexer.o \ - $(OBJDIR)/src/asm/symbol.o \ - $(OBJDIR)/src/asm/token.o \ - $(OBJDIR)/src/asm/tokenizer.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/src/asm \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Archiving spasm_lib -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) -endif - $(SILENT) $(LINKCMD) $(LINKOBJS) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning spasm_lib -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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 "$<" - -$(OBJDIR)/src/asm/bytecode.o: ../src/asm/bytecode.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - -$(OBJDIR)/src/asm/lexer.o: ../src/asm/lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - -$(OBJDIR)/src/asm/symbol.o: ../src/asm/symbol.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - -$(OBJDIR)/src/asm/token.o: ../src/asm/token.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - -$(OBJDIR)/src/asm/tokenizer.o: ../src/asm/tokenizer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/spasm/solution/spasm_lib.vcxproj b/spasm/solution/spasm_lib.vcxproj deleted file mode 100644 index bcb4ab9..0000000 --- a/spasm/solution/spasm_lib.vcxproj +++ /dev/null @@ -1,246 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3F16CDE1-AB80-8158-F4BE-32FE60685FAD} - spasm_lib - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - StaticLibrary - true - v142 - x64 - true - - - 16.0 - StaticLibrary - true - v142 - x64 - true - - - 16.0 - StaticLibrary - false - v142 - x64 - true - - - 16.0 - StaticLibrary - false - v142 - x64 - true - - - - - - - - - - - - - - - - - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x32\Debug\spasm_lib\ - spasm_lib - .lib - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\spasm_lib\ - spasm_lib - .lib - - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x32\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 - stdcpp17 - EditAndContinue - $(OutDir)spasm_lib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)spasm_lib.lib - MachineX86 - - - Windows - true - $(OutDir)spasm_lib.pdb - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(OutDir)spasm_lib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)spasm_lib.lib - MachineX64 - - - Windows - true - $(OutDir)spasm_lib.pdb - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)spasm_lib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)spasm_lib.lib - MachineX86 - - - Windows - true - $(OutDir)spasm_lib.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)spasm_lib.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)spasm_lib.lib - MachineX64 - - - Windows - true - $(OutDir)spasm_lib.pdb - true - true - - - - - - - - - - - - - - - - - - - - diff --git a/spasm/solution/spasm_lib.vcxproj.filters b/spasm/solution/spasm_lib.vcxproj.filters deleted file mode 100644 index 82b5f56..0000000 --- a/spasm/solution/spasm_lib.vcxproj.filters +++ /dev/null @@ -1,31 +0,0 @@ - - - - - {2DAB880B-99B4-887C-2230-9F7C8E38947C} - - - {6A9848A9-D677-C744-DF8F-521B4BEE2DA6} - - - - - src\asm - - - src\asm - - - src\asm - - - src\asm - - - src\asm - - - src\asm - - - diff --git a/spasm/solution/sprt.make b/spasm/solution/sprt.make deleted file mode 100644 index b093263..0000000 --- a/spasm/solution/sprt.make +++ /dev/null @@ -1,248 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = sprt.make - -ifeq ($(config),debug32) - OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/sprt - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/libsprt.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/spasm.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release32) - OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/sprt - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/libsprt.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m32 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/spasm.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/sprt - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/libsprt.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/spasm.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/sprt - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/libsprt.a - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -m64 - LIBDEPS += - LDDEPS += - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(AR) -rcs $(TARGET) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/spasm.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/src \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Archiving sprt -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) -endif - $(SILENT) $(LINKCMD) $(LINKOBJS) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning sprt -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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 "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj deleted file mode 100644 index 6e7737f..0000000 --- a/spasm/solution/sprt.vcxproj +++ /dev/null @@ -1,236 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} - sprt - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - StaticLibrary - true - v142 - x64 - true - - - 16.0 - StaticLibrary - true - v142 - x64 - true - - - 16.0 - StaticLibrary - false - v142 - x64 - true - - - 16.0 - StaticLibrary - false - v142 - x64 - true - - - - - - - - - - - - - - - - - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x32\Debug\sprt\ - sprt - .lib - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\sprt\ - sprt - .lib - - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x32\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 - stdcpp17 - EditAndContinue - $(OutDir)sprt.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)sprt.lib - MachineX86 - - - Windows - true - $(OutDir)sprt.pdb - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(OutDir)sprt.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)sprt.lib - MachineX64 - - - Windows - true - $(OutDir)sprt.pdb - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)sprt.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)sprt.lib - MachineX86 - - - Windows - true - $(OutDir)sprt.pdb - true - true - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(OutDir)sprt.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - $(OutDir)sprt.lib - MachineX64 - - - Windows - true - $(OutDir)sprt.pdb - true - true - - - - - - - - - - diff --git a/spasm/solution/sprt.vcxproj.filters b/spasm/solution/sprt.vcxproj.filters deleted file mode 100644 index 51bfc92..0000000 --- a/spasm/solution/sprt.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {2DAB880B-99B4-887C-2230-9F7C8E38947C} - - - - - src - - - diff --git a/spasm/solution/sprt.vcxproj.user b/spasm/solution/sprt.vcxproj.user deleted file mode 100644 index f927c73..0000000 --- a/spasm/solution/sprt.vcxproj.user +++ /dev/null @@ -1,19 +0,0 @@ - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - diff --git a/spasm/solution/sprun.make b/spasm/solution/sprun.make deleted file mode 100644 index 39498b7..0000000 --- a/spasm/solution/sprun.make +++ /dev/null @@ -1,243 +0,0 @@ -# GNU Make project makefile autogenerated by GENie -ifndef config - config=debug32 -endif - -ifndef verbose - SILENT = @ -endif - -SHELLTYPE := msdos -ifeq (,$(ComSpec)$(COMSPEC)) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - SHELLTYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(MAKESHELL))) - SHELLTYPE := posix -endif - -ifeq (posix,$(SHELLTYPE)) - MKDIR = $(SILENT) mkdir -p "$(1)" - COPY = $(SILENT) cp -fR "$(1)" "$(2)" - RM = $(SILENT) rm -f "$(1)" -else - MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0 - COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" - RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 -endif - -CC = gcc -CXX = g++ -AR = ar - -ifndef RESCOMP - ifdef WINDRES - RESCOMP = $(WINDRES) - else - RESCOMP = windres - endif -endif - -MAKEFILE = sprun.make - -ifeq ($(config),debug32) - OBJDIR = ../../JSImpl/build/obj/Debug/x32/Debug/sprun - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/sprun - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32 - 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),release32) - OBJDIR = ../../JSImpl/build/obj/Release/x32/Release/sprun - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/sprun - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32 - LIBDEPS += ../../JSImpl/build/bin/Release/libsprt.a - LDDEPS += ../../JSImpl/build/bin/Release/libsprt.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),debug64) - OBJDIR = ../../JSImpl/build/obj/Debug/x64/Debug/sprun - TARGETDIR = ../../JSImpl/build/bin/Debug - TARGET = $(TARGETDIR)/sprun - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 - LIBDEPS += ../../JSImpl/build/bin/Debug/libsprt.a - LDDEPS += ../../JSImpl/build/bin/Debug/libsprt.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -ifeq ($(config),release64) - OBJDIR = ../../JSImpl/build/obj/Release/x64/Release/sprun - TARGETDIR = ../../JSImpl/build/bin/Release - TARGET = $(TARGETDIR)/sprun - DEFINES += -D_SCL_SECURE_NO_WARNINGS - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) - ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 - ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 - LIBDEPS += ../../JSImpl/build/bin/Release/libsprt.a - LDDEPS += ../../JSImpl/build/bin/Release/libsprt.a - LDRESP = - LIBS += $(LDDEPS) - EXTERNAL_LIBS += - LINKOBJS = $(OBJECTS) - LINKCMD = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - OBJRESP = - OBJECTS := \ - $(OBJDIR)/src/main.o \ - - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -endif - -OBJDIRS := \ - $(OBJDIR) \ - $(OBJDIR)/src \ - -RESOURCES := \ - -.PHONY: clean prebuild prelink - -all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET) - @: - -$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS) - @echo Linking sprun - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) - -$(call MKDIR,$(TARGETDIR)) - -$(OBJDIRS): - @echo Creating $(@) - -$(call MKDIR,$@) - -clean: - @echo Cleaning sprun -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<" - -$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR) - @echo $(notdir $<) - $(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 "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d - -include $(OBJDIR)/$(notdir $(PCH))_objc.d -endif diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj deleted file mode 100644 index 15ab7f9..0000000 --- a/spasm/solution/sprun.vcxproj +++ /dev/null @@ -1,245 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FD605F10-6975-87C1-32F7-2A219ECA83F2} - sprun - 10.0 - 10.0.10240.0 - Win32Proj - - - - 16.0 - Application - true - v142 - x64 - true - - - 16.0 - Application - true - v142 - x64 - true - - - 16.0 - Application - false - v142 - x64 - true - - - 16.0 - Application - false - v142 - x64 - true - - - - - - - - - - - - - - - - - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x32\Debug\sprun\ - sprun - .exe - true - - - ..\..\JSImpl\build\bin\Debug\ - ..\..\JSImpl\build\obj\Debug\x64\Debug\sprun\ - sprun - .exe - true - - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x32\Release\sprun\ - sprun - .exe - false - - - ..\..\JSImpl\build\bin\Release\ - ..\..\JSImpl\build\obj\Release\x64\Release\sprun\ - sprun - .exe - false - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(IntDir)sprun.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)sprun.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)sprun.exe - mainCRTStartup - MachineX86 - - - - - %(AdditionalOptions) - Disabled - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level4 - true - stdcpp17 - EditAndContinue - $(IntDir)sprun.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)sprun.pdb - ;%(AdditionalLibraryDirectories) - $(OutDir)sprun.exe - mainCRTStartup - MachineX64 - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(IntDir)sprun.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)sprun.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)sprun.exe - mainCRTStartup - MachineX86 - - - - - %(AdditionalOptions) - MaxSpeed - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - true - true - MultiThreadedDLL - true - - Level4 - true - stdcpp17 - ProgramDatabase - $(IntDir)sprun.compile.pdb - Caret - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - Console - true - $(OutDir)sprun.pdb - true - true - ;%(AdditionalLibraryDirectories) - $(OutDir)sprun.exe - mainCRTStartup - MachineX64 - - - - - - - - - {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} - - - - - - diff --git a/spasm/solution/sprun.vcxproj.filters b/spasm/solution/sprun.vcxproj.filters deleted file mode 100644 index a140a04..0000000 --- a/spasm/solution/sprun.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {2DAB880B-99B4-887C-2230-9F7C8E38947C} - - - - - src - - - diff --git a/spasm/solution/sprun.vcxproj.user b/spasm/solution/sprun.vcxproj.user deleted file mode 100644 index f927c73..0000000 --- a/spasm/solution/sprun.vcxproj.user +++ /dev/null @@ -1,19 +0,0 @@ - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - - WindowsLocalDebugger - - - -- cgit v1.3.1-23-gd82d