Split spasm to lib and executable

- added solution folders

6 files changed, 106 insertions, 68 deletions

diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln
index 9915cf9..17799fc 100644
--- a/JSImpl/solution/JSImpl.sln
+++ b/JSImpl/solution/JSImpl.sln
@@ -1,15 +1,33 @@
 

 Microsoft Visual Studio Solution File, Format Version 12.00

 # Visual Studio 14

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spasm", "Spasm", "{9892E17D-8434-0C54-6DEF-1FA8593093A4}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSImpl", "JSImpl", "{C30B5025-2FEB-CEC0-3803-5A97A4613522}"

+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

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}"

 	ProjectSection(ProjectDependencies) = postProject

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF}

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1}

 		{B686840F-229B-ACC0-EB1C-502057F0A8F1} = {B686840F-229B-ACC0-EB1C-502057F0A8F1}

 		{30B03E7E-1C68-80CB-856F-592771461BBC} = {30B03E7E-1C68-80CB-856F-592771461BBC}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\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}"

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSLib", "JSLib.vcxproj", "{19EA680D-85FE-90BE-4E80-341EBA538DEF}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj", "{549B84BA-403D-AF90-29F8-C2E4153936E1}"

@@ -17,19 +35,13 @@ 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}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\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}"

-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}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm_lib", "..\..\spasm\solution\spasm_lib.vcxproj", "{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\solution\spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}"

 	ProjectSection(ProjectDependencies) = postProject

-		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 	EndProjectSection

 EndProject

 Global

@@ -38,18 +50,14 @@ Global
 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{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

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.ActiveCfg = Debug|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.Build.0 = Debug|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.ActiveCfg = Release|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.Build.0 = Release|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.ActiveCfg = Debug|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.Build.0 = Debug|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.ActiveCfg = Release|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.Build.0 = Release|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.ActiveCfg = Debug|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.Build.0 = Debug|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.ActiveCfg = Release|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.Build.0 = Release|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.ActiveCfg = Debug|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.Build.0 = Debug|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.ActiveCfg = Release|x64

@@ -62,22 +70,39 @@ 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

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.ActiveCfg = Debug|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.Build.0 = Debug|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.ActiveCfg = Release|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.Build.0 = Release|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.ActiveCfg = Debug|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.Build.0 = Debug|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.ActiveCfg = Release|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.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

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.ActiveCfg = Debug|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.Build.0 = Debug|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|x64.ActiveCfg = Release|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.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

 	EndGlobalSection

 	GlobalSection(NestedProjects) = preSolution

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

+		{EC34880F-5849-B0C0-21CB-53208D9EACF1} = {1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}

+		{B686840F-229B-ACC0-EB1C-502057F0A8F1} = {1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}

+		{30B03E7E-1C68-80CB-856F-592771461BBC} = {1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {C30B5025-2FEB-CEC0-3803-5A97A4613522}

+		{549B84BA-403D-AF90-29F8-C2E4153936E1} = {C30B5025-2FEB-CEC0-3803-5A97A4613522}

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

+		{69185F10-D52C-87C1-9EAE-2A210A8283F2} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

 	EndGlobalSection

 EndGlobal

diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj
index 8b58a96..0aa8deb 100644
--- a/JSImpl/solution/JSImpl.vcxproj
+++ b/JSImpl/solution/JSImpl.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj
index bb5c860..1d0f63a 100644
--- a/JSImpl/solution/JSLib.vcxproj
+++ b/JSImpl/solution/JSLib.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -111,23 +113,23 @@
   </ItemDefinitionGroup>

   <ItemGroup>

     <ClInclude Include="..\src\ASTInterpreter.h" />

+    <ClInclude Include="..\src\ASTPrinter.h" />

+    <ClInclude Include="..\src\CommonTypes.h" />

     <ClInclude Include="..\src\Expression.h" />

+    <ClInclude Include="..\src\ExpressionDefinitions.h" />

     <ClInclude Include="..\src\ExpressionsFwd.h" />

-    <ClInclude Include="..\src\ASTPrinter.h" />

     <ClInclude Include="..\src\ExpressionVisitor.h" />

     <ClInclude Include="..\src\Lexer.h" />

-    <ClInclude Include="..\src\CommonTypes.h" />

-    <ClInclude Include="..\src\ExpressionDefinitions.h" />

     <ClInclude Include="..\src\Parser.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\Lexer.cpp">

-    </ClCompile>

     <ClCompile Include="..\src\ASTInterpreter.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\ASTPrinter.cpp">

+    </ClCompile>

     <ClCompile Include="..\src\Expression.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\ASTPrinter.cpp">

+    <ClCompile Include="..\src\Lexer.cpp">

     </ClCompile>

     <ClCompile Include="..\src\Parser.cpp">

     </ClCompile>

diff --git a/JSImpl/solution/JSLib.vcxproj.filters b/JSImpl/solution/JSLib.vcxproj.filters
index a5801c7..afcbbb9 100644
--- a/JSImpl/solution/JSLib.vcxproj.filters
+++ b/JSImpl/solution/JSLib.vcxproj.filters
@@ -9,25 +9,25 @@
     <ClInclude Include="..\src\ASTInterpreter.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\Expression.h">

+    <ClInclude Include="..\src\ASTPrinter.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionsFwd.h">

+    <ClInclude Include="..\src\CommonTypes.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ASTPrinter.h">

+    <ClInclude Include="..\src\Expression.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionVisitor.h">

+    <ClInclude Include="..\src\ExpressionDefinitions.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\Lexer.h">

+    <ClInclude Include="..\src\ExpressionsFwd.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\CommonTypes.h">

+    <ClInclude Include="..\src\ExpressionVisitor.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionDefinitions.h">

+    <ClInclude Include="..\src\Lexer.h">

       <Filter>src</Filter>

     </ClInclude>

     <ClInclude Include="..\src\Parser.h">

@@ -35,16 +35,16 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\Lexer.cpp">

+    <ClCompile Include="..\src\ASTInterpreter.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ASTInterpreter.cpp">

+    <ClCompile Include="..\src\ASTPrinter.cpp">

       <Filter>src</Filter>

     </ClCompile>

     <ClCompile Include="..\src\Expression.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ASTPrinter.cpp">

+    <ClCompile Include="..\src\Lexer.cpp">

       <Filter>src</Filter>

     </ClCompile>

     <ClCompile Include="..\src\Parser.cpp">

diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile
index b920fc7..00cafb3 100644
--- a/JSImpl/solution/Makefile
+++ b/JSImpl/solution/Makefile
@@ -6,21 +6,13 @@ ifndef config
 endif
 export config
 
-PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm sprt sprun
+PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm spasm_lib sprt sprun
 
 .PHONY: all clean help $(PROJECTS)
 
 all: $(PROJECTS)
 
-JSLib: 
-	@echo "==== Building JSLib ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f JSLib.make
-
-JSImpl: JSLib
-	@echo "==== Building JSImpl ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f JSImpl.make
-
-Test: sprt JSLib gtest gmock gtest_main
+Test: sprt spasm_lib JSLib gtest gmock gtest_main
 	@echo "==== Building Test ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../test -f Test.make
 
@@ -36,11 +28,23 @@ gtest_main:
 	@echo "==== Building gtest_main ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../test -f gtest_main.make
 
+JSLib: 
+	@echo "==== Building JSLib ($(config)) ===="
+	@${MAKE} --no-print-directory -C . -f JSLib.make
+
+JSImpl: JSLib
+	@echo "==== Building JSImpl ($(config)) ===="
+	@${MAKE} --no-print-directory -C . -f JSImpl.make
+
 sprt: 
 	@echo "==== Building sprt ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make
 
-spasm: 
+spasm_lib: 
+	@echo "==== Building spasm_lib ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make
+
+spasm: spasm_lib
 	@echo "==== Building spasm ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make
 
@@ -49,13 +53,14 @@ sprun: sprt
 	@${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
 	@${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 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
 
@@ -69,13 +74,14 @@ help:
 	@echo "TARGETS:"
 	@echo "   all (default)"
 	@echo "   clean"
-	@echo "   JSLib"
-	@echo "   JSImpl"
 	@echo "   Test"
 	@echo "   gtest"
 	@echo "   gmock"
 	@echo "   gtest_main"
+	@echo "   JSLib"
+	@echo "   JSImpl"
 	@echo "   sprt"
+	@echo "   spasm_lib"
 	@echo "   spasm"
 	@echo "   sprun"
 	@echo ""
diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua
index 28a8515..aa5889d 100644
--- a/JSImpl/solution/genie.lua
+++ b/JSImpl/solution/genie.lua
@@ -24,21 +24,24 @@ solution 'JSImpl'
         objdir(root .. 'obj/Release')
     configuration '*'
 
-    project 'JSLib'
-        kind 'StaticLib'
-        language 'C++'
-        uuid(os.uuid('JSLib'))
-        files '../src/*.cpp'
-        removefiles '../src/main.cpp'
-        files '../src/*.h'
-
-    project 'JSImpl'
-        kind 'ConsoleApp'
-        language 'C++'
-        uuid(os.uuid('JSImpl'))
-        files '../src/main.cpp'
-        links 'JSLib'
-
     include '../test'
-    include '../../spasm/solution/'
     startproject 'Test'
+
+    group 'JSImpl'
+        project 'JSLib'
+            kind 'StaticLib'
+            language 'C++'
+            uuid(os.uuid('JSLib'))
+            files '../src/*.cpp'
+            removefiles '../src/main.cpp'
+            files '../src/*.h'
+
+        project 'JSImpl'
+            kind 'ConsoleApp'
+            language 'C++'
+            uuid(os.uuid('JSImpl'))
+            files '../src/main.cpp'
+            links 'JSLib'
+
+    group 'Spasm'
+        include '../../spasm/solution/'