Update libaegisub project

aegisub/build/libaegisub/libaegisub.vcxproj

@@ -38,7 +38,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\..\libaegisub\</SrcDir>
+    <SrcDir>..\..\libaegisub\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
@@ -64,7 +64,6 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\charset.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\charset_conv.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\charset_conv_win.h" />
-    <ClInclude Include="$(SrcDir)include\libaegisub\colour.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\exception.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\hotkey.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\io.h" />
@@ -76,7 +75,6 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\mru.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\option.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\option_value.h" />
-    <ClInclude Include="$(SrcDir)include\libaegisub\path.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\signal.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\thesaurus.h" />
@@ -84,12 +82,16 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\util.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\util_osx.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\util_win.h" />
-    <ClInclude Include="$(SrcDir)include\libaegisub\validator.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\vfr.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\cajun\elements.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\cajun\reader.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\cajun\visitor.h" />
     <ClInclude Include="$(SrcDir)include\libaegisub\cajun\writer.h" />
+    <ClInclude Include="$(SrcDir)common\parser.h" />
+    <ClInclude Include="$(SrcDir)include\libaegisub\ass\dialogue_parser.h" />
+    <ClInclude Include="$(SrcDir)include\libaegisub\background_runner.h" />
+    <ClInclude Include="$(SrcDir)include\libaegisub\color.h" />
+    <ClInclude Include="$(SrcDir)include\libaegisub\spellchecker.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(SrcDir)windows\lagi_pre.cpp">
@@ -110,17 +112,17 @@
     <ClCompile Include="$(SrcDir)common\mru.cpp" />
     <ClCompile Include="$(SrcDir)common\option.cpp" />
     <ClCompile Include="$(SrcDir)common\option_visit.cpp" />
-    <ClCompile Include="$(SrcDir)common\path.cpp" />
     <ClCompile Include="$(SrcDir)common\thesaurus.cpp" />
     <ClCompile Include="$(SrcDir)common\util.cpp" />
-    <ClCompile Include="$(SrcDir)common\validator.cpp" />
     <ClCompile Include="$(SrcDir)common\vfr.cpp" />
     <ClCompile Include="$(SrcDir)windows\access.cpp" />
     <ClCompile Include="$(SrcDir)windows\charset_conv_win.cpp" />
-    <ClCompile Include="$(SrcDir)windows\io.cpp" />
     <ClCompile Include="$(SrcDir)windows\log_win.cpp" />
-    <ClCompile Include="$(SrcDir)windows\path_win.cpp" />
     <ClCompile Include="$(SrcDir)windows\util_win.cpp" />
+    <ClCompile Include="$(SrcDir)ass\dialogue_parser.cpp" />
+    <ClCompile Include="$(SrcDir)common\color.cpp" />
+    <ClCompile Include="$(SrcDir)common\parser.cpp" />
+    <ClCompile Include="..\..\libaegisub\common\io.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(SrcDir)include\libaegisub\charsets.def" />

aegisub/build/libaegisub/libaegisub.vcxproj.filters

@@ -18,6 +18,9 @@
     <Filter Include="cajun">
       <UniqueIdentifier>{1d2e187a-1681-4c30-8912-a4b5a5d0ab9d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ASS">
+      <UniqueIdentifier>{c97bd8a3-ebb7-4c43-9ca0-4ab8479d9388}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(SrcDir)common\charset_6937.h">
@@ -44,9 +47,6 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\charset_conv_win.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)include\libaegisub\colour.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(SrcDir)include\libaegisub\exception.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -71,9 +71,6 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\option_value.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)include\libaegisub\path.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -92,9 +89,6 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\util_win.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)include\libaegisub\validator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(SrcDir)include\libaegisub\vfr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -125,6 +119,21 @@
     <ClInclude Include="$(SrcDir)include\libaegisub\signal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(SrcDir)include\libaegisub\background_runner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)include\libaegisub\color.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)include\libaegisub\spellchecker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)include\libaegisub\ass\dialogue_parser.h">
+      <Filter>ASS</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)common\parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(SrcDir)windows\lagi_pre.cpp">
@@ -148,9 +157,6 @@
     <ClCompile Include="$(SrcDir)common\charset_ucd.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)windows\io.cpp">
-      <Filter>Source Files\Windows</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)windows\log_win.cpp">
       <Filter>Source Files\Windows</Filter>
     </ClCompile>
@@ -169,18 +175,12 @@
     <ClCompile Include="$(SrcDir)common\option_visit.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)common\path.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)common\thesaurus.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)windows\util_win.cpp">
       <Filter>Source Files\Windows</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)common\validator.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)common\vfr.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
@@ -193,9 +193,6 @@
     <ClCompile Include="$(SrcDir)common\keyframe.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)windows\path_win.cpp">
-      <Filter>Source Files\Windows</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)common\util.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
@@ -208,10 +205,22 @@
     <ClCompile Include="$(SrcDir)common\cajun\writer.cpp">
       <Filter>cajun</Filter>
     </ClCompile>
+    <ClCompile Include="$(SrcDir)ass\dialogue_parser.cpp">
+      <Filter>ASS</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)common\color.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)common\parser.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libaegisub\common\io.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(SrcDir)include\libaegisub\charsets.def">
       <Filter>Header Files</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>