From 107e06f9403d0ad26a04a099b45c2d746ef08c6f Mon Sep 17 00:00:00 2001
From: Dimitar Trendafilov <trendafilov.dn@gmail.com>
Date: Mon, 20 Sep 2021 22:09:59 +0300
Subject: Include gctest to the main solution

---
 JSImpl/solution/genie.lua |  3 +++
 appveyor.yml              |  5 +----
 gctest/solution/genie.lua | 25 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua
index e3720a4..5d36fc8 100644
--- a/JSImpl/solution/genie.lua
+++ b/JSImpl/solution/genie.lua
@@ -49,3 +49,6 @@ solution 'JSImpl'
 
     group 'Spasm'
         include '../../spasm/solution/'
+
+    group 'gctest'
+        include '../../gctest/solution/'
diff --git a/appveyor.yml b/appveyor.yml
index eb21f68..9cde8fd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,9 +18,7 @@ platform:
   - x64
 
 build:
-  project:
-      - JSImpl/solution/JSImpl.sln
-      - gctest/solution/gctest.sln
+  project: JSImpl/solution/JSImpl.sln
   verbosity: minimal
   parallel: true
 
@@ -31,7 +29,6 @@ for:
       - image: Ubuntu
   build_script:
     - make -C $APPVEYOR_BUILD_FOLDER/JSImpl/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/x64/64/'`
-    - make -C $APPVEYOR_BUILD_FOLDER/gctest/solution -j config=`echo ${CONFIGURATION} | sed -e 'y/DR/dr/'``echo ${PLATFORM} | sed -e 's/x64/64/'`
   test_script:
     - '$APPVEYOR_BUILD_FOLDER/JSImpl/build/bin/$CONFIGURATION/Test'
   after_test:
diff --git a/gctest/solution/genie.lua b/gctest/solution/genie.lua
index 2f56616..a63f1f5 100644
--- a/gctest/solution/genie.lua
+++ b/gctest/solution/genie.lua
@@ -1,20 +1,20 @@
-solution 'gctest'
+if not solution() then
+    solution 'gctest'
     if _ACTION ~= 'jcdb' then
         platforms { 'x32', 'x64' }
         configurations {'Debug', 'Release'}
     else
         configurations {'Debug'}
+        platforms { 'x64' }
     end
     flags {
         'FatalWarnings',
         'ExtraWarnings',
-        'Cpp17',
         'Symbols',
     }
+
     defines {
-        '_SCL_SECURE_NO_WARNINGS',
-        '_CRT_SECURE_NO_WARNINGS',
-        'MTR_ENABLED',
+            '_SCL_SECURE_NO_WARNINGS',
     }
 
     local root = '../build/'
@@ -27,11 +27,23 @@ solution 'gctest'
         flags 'OptimizeSpeed'
         targetdir(root .. 'bin/Release')
         objdir(root .. 'obj/Release')
+    configuration '*'
+end
+
+function setup()
+    flags 'Cpp17'
+    defines {
+        '_SCL_SECURE_NO_WARNINGS',
+        '_CRT_SECURE_NO_WARNINGS',
+        'MTR_ENABLED',
+    }
+
     -- GCC generates a warning for uninitialized data in
     -- std::normal_distribution
     configuration 'gcc'
         removeflags 'ExtraWarnings'
     configuration '*'
+end
 
     project 'test_bench'
         kind 'StaticLib'
@@ -41,16 +53,19 @@ solution 'gctest'
             '../src/minitrace.cpp',
         }
         removeflags 'ExtraWarnings'
+        setup()
 
     project 'leak_gc'
         kind 'ConsoleApp'
         language 'C++'
         files '../src/gc_leak.cpp'
         links 'test_bench'
+        setup()
 
     project 'dummy_gc'
         kind 'ConsoleApp'
         language 'C++'
         files '../src/gc_dummy.cpp'
         links 'test_bench'
+        setup()
 
-- 
cgit v1.3.1-26-gb76a