From c6661971b0d86c93a52ee3d34201560dc301fcb7 Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 5 Nov 2018 23:51:02 +0200 Subject: Regenerated project files --- JSImpl/solution/JSImpl.make | 4 ++-- JSImpl/solution/JSImpl.sln | 21 +++++++++++++++++++++ JSImpl/solution/JSImpl.vcxproj | 10 ++++------ JSImpl/solution/JSLib.make | 4 ++-- JSImpl/solution/JSLib.vcxproj | 22 ++++++++++------------ JSImpl/solution/JSLib.vcxproj.filters | 20 ++++++++++---------- JSImpl/solution/Makefile | 20 +++++++++++++++++++- JSImpl/solution/genie.lua | 4 ++++ JSImpl/test/Test.make | 4 ++-- JSImpl/test/Test.vcxproj | 10 ++++------ JSImpl/test/gmock.make | 4 ++-- JSImpl/test/gmock.vcxproj | 22 ++++++++++------------ JSImpl/test/gmock.vcxproj.filters | 22 +++++++++++----------- JSImpl/test/gtest.make | 4 ++-- JSImpl/test/gtest.vcxproj | 20 +++++++++----------- JSImpl/test/gtest.vcxproj.filters | 16 ++++++++-------- JSImpl/test/gtest_main.make | 4 ++-- JSImpl/test/gtest_main.vcxproj | 10 ++++------ spasm/solution/spasm.make | 8 ++++---- spasm/solution/spasm.vcxproj | 20 +++++++++----------- spasm/solution/spasm.vcxproj.filters | 12 ++++++------ spasm/solution/sprt.make | 8 ++++---- spasm/solution/sprt.vcxproj | 14 ++++++-------- spasm/solution/sprt.vcxproj.filters | 4 ++-- spasm/solution/sprun.make | 16 ++++++++-------- spasm/solution/sprun.vcxproj | 10 ++++------ 26 files changed, 169 insertions(+), 144 deletions(-) diff --git a/JSImpl/solution/JSImpl.make b/JSImpl/solution/JSImpl.make index 252ee49..47c1963 100644 --- a/JSImpl/solution/JSImpl.make +++ b/JSImpl/solution/JSImpl.make @@ -46,7 +46,7 @@ ifeq ($(config),debug64) OBJDIR = ../build/obj/Debug/x64/Debug/JSImpl TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/JSImpl - DEFINES += + 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 @@ -75,7 +75,7 @@ ifeq ($(config),release64) OBJDIR = ../build/obj/Release/x64/Release/JSImpl TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/JSImpl - DEFINES += + 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 diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln index bbd3b9f..d4acff7 100644 --- a/JSImpl/solution/JSImpl.sln +++ b/JSImpl/solution/JSImpl.sln @@ -22,6 +22,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\gmock.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\test\gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprt", "..\..\spasm\solution\sprt.vcxproj", "{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\solution\spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}" + ProjectSection(ProjectDependencies) = postProject + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -52,6 +61,18 @@ Global {30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.Build.0 = Debug|x64 {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.ActiveCfg = Release|x64 {30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.Build.0 = Release|x64 + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.ActiveCfg = Debug|x64 + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.Build.0 = Debug|x64 + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.ActiveCfg = Release|x64 + {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.Build.0 = Release|x64 + {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.ActiveCfg = Debug|x64 + {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.Build.0 = Debug|x64 + {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.ActiveCfg = Release|x64 + {69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.Build.0 = Release|x64 + {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.ActiveCfg = Debug|x64 + {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.Build.0 = Debug|x64 + {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.ActiveCfg = Release|x64 + {FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj index e2d50d1..8b58a96 100644 --- a/JSImpl/solution/JSImpl.vcxproj +++ b/JSImpl/solution/JSImpl.vcxproj @@ -21,13 +21,11 @@ Application true v140 - x64 Application false v140 - x64 @@ -57,7 +55,7 @@ %(AdditionalOptions) Disabled - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -70,7 +68,7 @@ $(IntDir)JSImpl.compile.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Console @@ -85,7 +83,7 @@ %(AdditionalOptions) MaxSpeed - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true MultiThreadedDLL @@ -98,7 +96,7 @@ $(IntDir)JSImpl.compile.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Console diff --git a/JSImpl/solution/JSLib.make b/JSImpl/solution/JSLib.make index 20eae8a..1bf0a01 100644 --- a/JSImpl/solution/JSLib.make +++ b/JSImpl/solution/JSLib.make @@ -46,7 +46,7 @@ ifeq ($(config),debug64) OBJDIR = ../build/obj/Debug/x64/Debug/JSLib TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/libJSLib.a - DEFINES += + 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 @@ -79,7 +79,7 @@ ifeq ($(config),release64) OBJDIR = ../build/obj/Release/x64/Release/JSLib TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/libJSLib.a - DEFINES += + 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 diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj index 69f19e0..bb5c860 100644 --- a/JSImpl/solution/JSLib.vcxproj +++ b/JSImpl/solution/JSLib.vcxproj @@ -21,13 +21,11 @@ StaticLibrary true v140 - x64 StaticLibrary false v140 - x64 @@ -55,7 +53,7 @@ %(AdditionalOptions) Disabled - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +66,7 @@ $(OutDir)JSLib.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(OutDir)JSLib.lib @@ -84,7 +82,7 @@ %(AdditionalOptions) MaxSpeed - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true MultiThreadedDLL @@ -97,7 +95,7 @@ $(OutDir)JSLib.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(OutDir)JSLib.lib @@ -113,23 +111,23 @@ - - - + + + - + - + - + diff --git a/JSImpl/solution/JSLib.vcxproj.filters b/JSImpl/solution/JSLib.vcxproj.filters index afcbbb9..a5801c7 100644 --- a/JSImpl/solution/JSLib.vcxproj.filters +++ b/JSImpl/solution/JSLib.vcxproj.filters @@ -9,25 +9,25 @@ src - + src - + src - + src - + src - + src - + src - + src @@ -35,16 +35,16 @@ - + src - + src src - + src diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile index 360d5a1..37c7a63 100644 --- a/JSImpl/solution/Makefile +++ b/JSImpl/solution/Makefile @@ -6,7 +6,7 @@ ifndef config endif export config -PROJECTS := JSImpl JSLib Test gmock gtest gtest_main +PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm sprt sprun .PHONY: all clean help $(PROJECTS) @@ -36,6 +36,18 @@ gtest_main: @echo "==== Building gtest_main ($(config)) ====" @${MAKE} --no-print-directory -C ../test -f gtest_main.make +sprt: + @echo "==== Building sprt ($(config)) ====" + @${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make + +spasm: + @echo "==== Building spasm ($(config)) ====" + @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make + +sprun: sprt + @echo "==== Building sprun ($(config)) ====" + @${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make + clean: @${MAKE} --no-print-directory -C . -f JSLib.make clean @${MAKE} --no-print-directory -C . -f JSImpl.make clean @@ -43,6 +55,9 @@ 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 ../../spasm/solution -f sprt.make clean + @${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make clean + @${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make clean help: @echo "Usage: make [config=name] [target]" @@ -60,5 +75,8 @@ help: @echo " gtest" @echo " gmock" @echo " gtest_main" + @echo " sprt" + @echo " spasm" + @echo " sprun" @echo "" @echo "For more information, see https://github.com/bkaradzic/genie" diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua index 8b34d97..28a8515 100644 --- a/JSImpl/solution/genie.lua +++ b/JSImpl/solution/genie.lua @@ -7,6 +7,9 @@ solution 'JSImpl' 'Cpp14', 'Symbols', } + defines { + '_SCL_SECURE_NO_WARNINGS', + } local root = '../build/' @@ -37,4 +40,5 @@ solution 'JSImpl' links 'JSLib' include '../test' + include '../../spasm/solution/' startproject 'Test' diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make index da8af69..4836496 100644 --- a/JSImpl/test/Test.make +++ b/JSImpl/test/Test.make @@ -46,7 +46,7 @@ ifeq ($(config),debug64) OBJDIR = ../build/obj/Debug/x64/Debug/Test TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/Test - DEFINES += + DEFINES += -D_SCL_SECURE_NO_WARNINGS INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 @@ -78,7 +78,7 @@ ifeq ($(config),release64) OBJDIR = ../build/obj/Release/x64/Release/Test TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/Test - DEFINES += + DEFINES += -D_SCL_SECURE_NO_WARNINGS INCLUDES += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj index 9c67eae..6bf7d68 100644 --- a/JSImpl/test/Test.vcxproj +++ b/JSImpl/test/Test.vcxproj @@ -21,13 +21,11 @@ Application true v140 - x64 Application false v140 - x64 @@ -58,7 +56,7 @@ %(AdditionalOptions) Disabled googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -71,7 +69,7 @@ $(IntDir)Test.compile.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories) @@ -88,7 +86,7 @@ %(AdditionalOptions) MaxSpeed googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true MultiThreadedDLL @@ -101,7 +99,7 @@ $(IntDir)Test.compile.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories) diff --git a/JSImpl/test/gmock.make b/JSImpl/test/gmock.make index 77b912c..590c3e4 100644 --- a/JSImpl/test/gmock.make +++ b/JSImpl/test/gmock.make @@ -46,7 +46,7 @@ ifeq ($(config),debug64) OBJDIR = ../build/obj/Debug/x64/Debug/gmock TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/libgmock.a - DEFINES += + 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 @@ -76,7 +76,7 @@ ifeq ($(config),release64) OBJDIR = ../build/obj/Release/x64/Release/gmock TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/libgmock.a - DEFINES += + 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 diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj index d2dd518..8fbaa69 100644 --- a/JSImpl/test/gmock.vcxproj +++ b/JSImpl/test/gmock.vcxproj @@ -21,13 +21,11 @@ StaticLibrary true v140 - x64 StaticLibrary false v140 - x64 @@ -56,7 +54,7 @@ %(AdditionalOptions) Disabled googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -69,7 +67,7 @@ $(OutDir)gmock.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) @@ -87,7 +85,7 @@ %(AdditionalOptions) MaxSpeed googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true MultiThreadedDLL @@ -100,7 +98,7 @@ $(OutDir)gmock.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories) @@ -116,17 +114,17 @@ + + - + + - + - - - - + diff --git a/JSImpl/test/gmock.vcxproj.filters b/JSImpl/test/gmock.vcxproj.filters index 7ecdd12..01914f2 100644 --- a/JSImpl/test/gmock.vcxproj.filters +++ b/JSImpl/test/gmock.vcxproj.filters @@ -18,37 +18,37 @@ - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock - + googletest\googlemock\include\gmock diff --git a/JSImpl/test/gtest.make b/JSImpl/test/gtest.make index 942964a..50c7757 100644 --- a/JSImpl/test/gtest.make +++ b/JSImpl/test/gtest.make @@ -46,7 +46,7 @@ ifeq ($(config),debug64) OBJDIR = ../build/obj/Debug/x64/Debug/gtest TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/libgtest.a - DEFINES += + 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 @@ -76,7 +76,7 @@ ifeq ($(config),release64) OBJDIR = ../build/obj/Release/x64/Release/gtest TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/libgtest.a - DEFINES += + 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 diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj index 85be299..623e8f5 100644 --- a/JSImpl/test/gtest.vcxproj +++ b/JSImpl/test/gtest.vcxproj @@ -21,13 +21,11 @@ StaticLibrary true v140 - x64 StaticLibrary false v140 - x64 @@ -56,7 +54,7 @@ %(AdditionalOptions) Disabled googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -69,7 +67,7 @@ $(OutDir)gtest.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) @@ -87,7 +85,7 @@ %(AdditionalOptions) MaxSpeed googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true MultiThreadedDLL @@ -100,7 +98,7 @@ $(OutDir)gtest.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) @@ -116,16 +114,16 @@ - + - - + - + - + + diff --git a/JSImpl/test/gtest.vcxproj.filters b/JSImpl/test/gtest.vcxproj.filters index 3a35c75..780060b 100644 --- a/JSImpl/test/gtest.vcxproj.filters +++ b/JSImpl/test/gtest.vcxproj.filters @@ -18,7 +18,7 @@ - + googletest\googletest\include\gtest @@ -27,25 +27,25 @@ 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 diff --git a/JSImpl/test/gtest_main.make b/JSImpl/test/gtest_main.make index 7b5cac2..4aa9a75 100644 --- a/JSImpl/test/gtest_main.make +++ b/JSImpl/test/gtest_main.make @@ -46,7 +46,7 @@ ifeq ($(config),debug64) OBJDIR = ../build/obj/Debug/x64/Debug/gtest_main TARGETDIR = ../build/bin/Debug TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += + 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 @@ -76,7 +76,7 @@ ifeq ($(config),release64) OBJDIR = ../build/obj/Release/x64/Release/gtest_main TARGETDIR = ../build/bin/Release TARGET = $(TARGETDIR)/libgtest_main.a - DEFINES += + 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 diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj index 0d93122..997d941 100644 --- a/JSImpl/test/gtest_main.vcxproj +++ b/JSImpl/test/gtest_main.vcxproj @@ -21,13 +21,11 @@ StaticLibrary true v140 - x64 StaticLibrary false v140 - x64 @@ -56,7 +54,7 @@ %(AdditionalOptions) Disabled googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -69,7 +67,7 @@ $(OutDir)gtest_main.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) @@ -87,7 +85,7 @@ %(AdditionalOptions) MaxSpeed googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true MultiThreadedDLL @@ -100,7 +98,7 @@ $(OutDir)gtest_main.pdb - + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories) diff --git a/spasm/solution/spasm.make b/spasm/solution/spasm.make index 4d90252..f2aa890 100644 --- a/spasm/solution/spasm.make +++ b/spasm/solution/spasm.make @@ -43,8 +43,8 @@ endif MAKEFILE = spasm.make ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/spasm - TARGETDIR = ../build/bin/Debug + 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) @@ -78,8 +78,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/spasm - TARGETDIR = ../build/bin/Release + 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) diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj index 801feb8..e39730e 100644 --- a/spasm/solution/spasm.vcxproj +++ b/spasm/solution/spasm.vcxproj @@ -21,13 +21,11 @@ Application true v140 - x64 Application false v140 - x64 @@ -40,15 +38,15 @@ - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\spasm\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x64\Debug\spasm\ spasm .exe true - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\spasm\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\spasm\ spasm .exe false @@ -112,20 +110,20 @@ - + + + + + - - - - diff --git a/spasm/solution/spasm.vcxproj.filters b/spasm/solution/spasm.vcxproj.filters index 77f6487..30cc8cb 100644 --- a/spasm/solution/spasm.vcxproj.filters +++ b/spasm/solution/spasm.vcxproj.filters @@ -9,25 +9,25 @@ - + src\asm src\asm - + src\asm - + src\asm - + src\asm - + src\asm - + src\asm diff --git a/spasm/solution/sprt.make b/spasm/solution/sprt.make index 8d85739..5607193 100644 --- a/spasm/solution/sprt.make +++ b/spasm/solution/sprt.make @@ -43,8 +43,8 @@ endif MAKEFILE = sprt.make ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/sprt - TARGETDIR = ../build/bin/Debug + 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) @@ -74,8 +74,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/sprt - TARGETDIR = ../build/bin/Release + 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) diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj index 760d501..5d4d050 100644 --- a/spasm/solution/sprt.vcxproj +++ b/spasm/solution/sprt.vcxproj @@ -21,13 +21,11 @@ StaticLibrary true v140 - x64 StaticLibrary false v140 - x64 @@ -40,14 +38,14 @@ - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\sprt\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x64\Debug\sprt\ sprt .lib - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\sprt\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\sprt\ sprt .lib @@ -114,10 +112,10 @@ - - + + diff --git a/spasm/solution/sprt.vcxproj.filters b/spasm/solution/sprt.vcxproj.filters index c111a28..5ed0d15 100644 --- a/spasm/solution/sprt.vcxproj.filters +++ b/spasm/solution/sprt.vcxproj.filters @@ -9,10 +9,10 @@ src - + src - + src diff --git a/spasm/solution/sprun.make b/spasm/solution/sprun.make index 7b9be59..58b7320 100644 --- a/spasm/solution/sprun.make +++ b/spasm/solution/sprun.make @@ -43,8 +43,8 @@ endif MAKEFILE = sprun.make ifeq ($(config),debug64) - OBJDIR = ../build/obj/Debug/x64/Debug/sprun - TARGETDIR = ../build/bin/Debug + 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) @@ -54,8 +54,8 @@ ifeq ($(config),debug64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Debug" -m64 - LDDEPS += ../build/bin/Debug/libsprt.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64 + LDDEPS += ../../JSImpl/build/bin/Debug/libsprt.a LIBS += $(LDDEPS) EXTERNAL_LIBS += LINKOBJS = $(OBJECTS) @@ -72,8 +72,8 @@ ifeq ($(config),debug64) endif ifeq ($(config),release64) - OBJDIR = ../build/obj/Release/x64/Release/sprun - TARGETDIR = ../build/bin/Release + 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) @@ -83,8 +83,8 @@ ifeq ($(config),release64) ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - ALL_LDFLAGS += $(LDFLAGS) -L"../build/bin/Release" -m64 - LDDEPS += ../build/bin/Release/libsprt.a + ALL_LDFLAGS += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64 + LDDEPS += ../../JSImpl/build/bin/Release/libsprt.a LIBS += $(LDDEPS) EXTERNAL_LIBS += LINKOBJS = $(OBJECTS) diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj index 08ee433..ea923b4 100644 --- a/spasm/solution/sprun.vcxproj +++ b/spasm/solution/sprun.vcxproj @@ -21,13 +21,11 @@ Application true v140 - x64 Application false v140 - x64 @@ -40,15 +38,15 @@ - ..\build\bin\Debug\ - ..\build\obj\Debug\x64\Debug\sprun\ + ..\..\JSImpl\build\bin\Debug\ + ..\..\JSImpl\build\obj\Debug\x64\Debug\sprun\ sprun .exe true - ..\build\bin\Release\ - ..\build\obj\Release\x64\Release\sprun\ + ..\..\JSImpl\build\bin\Release\ + ..\..\JSImpl\build\obj\Release\x64\Release\sprun\ sprun .exe false -- cgit v1.3.1-23-gd82d