Regenerated project files

8 files changed, 43 insertions, 49 deletions

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

@@ -40,15 +38,15 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

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

-    <IntDir>..\build\obj\Debug\x64\Debug\spasm\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\spasm\</IntDir>

     <TargetName>spasm</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

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

-    <IntDir>..\build\obj\Release\x64\Release\spasm\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\spasm\</IntDir>

     <TargetName>spasm</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

@@ -112,20 +110,20 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\asm\assembler.cpp">

+    <ClCompile Include="..\src\asm\tokenizer.cpp">

     </ClCompile>

     <ClCompile Include="..\src\asm\bytecode.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\asm\assembler.cpp">

+    </ClCompile>

     <ClCompile Include="..\src\asm\lexer.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\asm\token.cpp">

+    </ClCompile>

     <ClCompile Include="..\src\asm\main.cpp">

     </ClCompile>

     <ClCompile Include="..\src\asm\symbol.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\asm\token.cpp">

-    </ClCompile>

-    <ClCompile Include="..\src\asm\tokenizer.cpp">

-    </ClCompile>

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

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 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\asm\assembler.cpp">

+    <ClCompile Include="..\src\asm\tokenizer.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

     <ClCompile Include="..\src\asm\bytecode.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\lexer.cpp">

+    <ClCompile Include="..\src\asm\assembler.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\main.cpp">

+    <ClCompile Include="..\src\asm\lexer.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\symbol.cpp">

+    <ClCompile Include="..\src\asm\token.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\token.cpp">

+    <ClCompile Include="..\src\asm\main.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\tokenizer.cpp">

+    <ClCompile Include="..\src\asm\symbol.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

   </ItemGroup>

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

@@ -40,14 +38,14 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

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

-    <IntDir>..\build\obj\Debug\x64\Debug\sprt\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\sprt\</IntDir>

     <TargetName>sprt</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

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

-    <IntDir>..\build\obj\Release\x64\Release\sprt\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\sprt\</IntDir>

     <TargetName>sprt</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

@@ -114,10 +112,10 @@
   <ItemGroup>

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

     </ClCompile>

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

-    </ClCompile>

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

     </ClCompile>

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

+    </ClCompile>

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

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 @@
     <ClCompile Include="..\src\dstack.cpp">

       <Filter>src</Filter>

     </ClCompile>

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

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

       <Filter>src</Filter>

     </ClCompile>

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

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

       <Filter>src</Filter>

     </ClCompile>

   </ItemGroup>

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

@@ -40,15 +38,15 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

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

-    <IntDir>..\build\obj\Debug\x64\Debug\sprun\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\sprun\</IntDir>

     <TargetName>sprun</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

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

-    <IntDir>..\build\obj\Release\x64\Release\sprun\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\sprun\</IntDir>

     <TargetName>sprun</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>