Merge pull request #116 from SofiaCPP/feature/ninja

Feature/ninja

7 files changed, 79 insertions, 84 deletions

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 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,29 +71,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

diff --git a/gctest/solution/genie.lua b/gctest/solution/genie.lua
index 8a1473a..394417a 100644
--- a/gctest/solution/genie.lua
+++ b/gctest/solution/genie.lua
@@ -19,6 +19,12 @@ if not solution() then
 

     local root = '../build/'

 

+    if _ACTION ~= 'ninja' then

+        location '.'

+    else

+        location './ninja'

+    end

+

     configuration 'Debug'

         targetdir(root .. 'bin/Debug')

         objdir(root .. 'obj/Debug')

@@ -44,6 +50,7 @@ function setup()
     configuration 'gcc'

         removeflags 'ExtraWarnings'

     configuration '*'

+    location(solution().location)

 end

 

     project 'test_bench'

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 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,29 +71,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

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 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,26 +71,26 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\test_bench\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\test_bench\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\test_bench\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\test_bench\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>