Move all in-repo deps to aegisub/vendor

aegisub/Makefile

@@ -1,7 +1,7 @@
 include Makefile.inc
 
 SUBDIRS += \
-	universalchardet \
+	vendor/universalchardet \
 	libaegisub \
 	tools \
 	src \

aegisub/Makefile.inc.in

@@ -91,7 +91,7 @@ CFLAGS_OSS         = @OSS_CFLAGS@
 CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
 CFLAGS_PTHREAD     = @PTHREAD_CFLAGS@
 CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
-CFLAGS_UCHARDET    = -I../universalchardet
+CFLAGS_UCHARDET    = -I../vendor/universalchardet
 
 LIBS_ALSA          = @ALSA_LIBS@
 LIBS_FFMS2         = @FFMS2_LIBS@
@@ -109,7 +109,7 @@ LIBS_LUA           = @LUA_LIBS@
 LIBS_OPENAL        = @OPENAL_LIBS@
 LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
 LIBS_PTHREAD       = @PTHREAD_LIBS@
-LIBS_UCHARDET     ?= ../universalchardet/libuniversalchardet.a
+LIBS_UCHARDET     ?= ../vendor/universalchardet/libuniversalchardet.a
 
 #####################
 # DEBUG / DEVELOPMENT

aegisub/Makefile.target

@@ -140,7 +140,7 @@ $(SUBDIRS):
 
 # Set relations to ensure dependencies are built before their targets during parallel builds.
 automation: libaegisub
-src: universalchardet tools libaegisub
+src: vendor/universalchardet tools libaegisub
 tests: libaegisub
 tools: libaegisub
 reporter: src

aegisub/build/csrihelper/csrihelper.vcxproj

@@ -8,7 +8,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\..\contrib\csri\</SrcDir>
+    <SrcDir>..\..\vendor\csri\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />

aegisub/build/hunspell/hunspell.vcxproj

@@ -7,7 +7,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\..\contrib\hunspell\src\</SrcDir>
+    <SrcDir>..\..\vendor\hunspell\src\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
@@ -47,9 +47,12 @@
     <ClCompile Include="$(SrcDir)hunspell\affixmgr.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\csutil.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\dictmgr.cxx" />
+    <ClCompile Include="$(SrcDir)hunspell\filemgr.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\hashmgr.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\hunspell.cxx" />
+    <ClCompile Include="$(SrcDir)hunspell\hunzip.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\phonet.cxx" />
+    <ClCompile Include="$(SrcDir)hunspell\replist.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\suggestmgr.cxx" />
     <ClCompile Include="$(SrcDir)parsers\firstparser.cxx" />
     <ClCompile Include="$(SrcDir)parsers\htmlparser.cxx" />
@@ -61,8 +64,5 @@
       <!-- Why is this file named .c when it's obviously C++ code -->
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\filemgr.cxx" />
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\hunzip.cxx" />
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\replist.cxx" />
   </ItemGroup>
 </Project>

aegisub/build/hunspell/hunspell.vcxproj.filters

@@ -122,13 +122,13 @@
     <ClCompile Include="$(SrcDir)win_api\hunspelldll.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\filemgr.cxx">
+    <ClCompile Include="$(SrcDir)hunspell\filemgr.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\hunzip.cxx">
+    <ClCompile Include="$(SrcDir)hunspell\hunzip.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\replist.cxx">
+    <ClCompile Include="$(SrcDir)hunspell\replist.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

aegisub/build/libiconv/libiconv.vcxproj

@@ -7,7 +7,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\..\contrib\iconv\</SrcDir>
+    <SrcDir>..\..\vendor\iconv\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />

aegisub/build/paths.props

@@ -8,7 +8,7 @@
 		<!-- Base for Aegisub source code -->
 		<AegisubSourceBase Condition="'$(AegisubSourceBase)'==''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</AegisubSourceBase>
 		<!-- Base for contrib libraries source code -->
-		<AegisubContribBase Condition="'$(AegisubContribBase)'==''">$(AegisubSourceBase)..\contrib\</AegisubContribBase>
+		<AegisubContribBase Condition="'$(AegisubContribBase)'==''">$(AegisubSourceBase)vendor\</AegisubContribBase>
 		<!-- Base for built files -->
 		<AegisubOutputBase Condition="'$(AegisubOutputBase)'==''">$(AegisubSourceBase)</AegisubOutputBase>
 		<!-- Directory for built executables -->

aegisub/build/universalchardet/universalchardet.vcxproj

@@ -7,7 +7,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\universalchardet\</SrcDir>
+    <SrcDir>..\..\vendor\universalchardet\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />

aegisub/libaegisub/common/charset.cpp

@@ -27,10 +27,10 @@
 #define _X86_ 1
 #endif
 
-#include "../../universalchardet/nscore.h"
-#include "../../universalchardet/nsUniversalDetector.h"
-#include "../../universalchardet/nsMBCSGroupProber.h"
-#include "../../universalchardet/nsCharSetProber.h"
+#include "../../vendor/universalchardet/nscore.h"
+#include "../../vendor/universalchardet/nsUniversalDetector.h"
+#include "../../vendor/universalchardet/nsMBCSGroupProber.h"
+#include "../../vendor/universalchardet/nsCharSetProber.h"
 
 namespace {
 using namespace agi::charset;

aegisub/tests/Makefile

@@ -3,7 +3,7 @@ include ../Makefile.inc
 
 PROGRAM = run
 
-LIBS += -L../libaegisub -laegisub -L../universalchardet -luniversalchardet $(LIBS_BOOST) $(LIBS_ICU)
+LIBS += -L../libaegisub -laegisub -L../vendor/universalchardet -luniversalchardet $(LIBS_BOOST) $(LIBS_ICU)
 LDFLAGS += -Wl,-rpath $(CURDIR)/../libaegisub $(LDFLAGS_ICONV)
 
 CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include -I./support $(CPPFLAGS_BOOST)