Move all in-repo deps to aegisub/vendor
This commit is contained in:
Thomas Goyne
parent
1b05310e32
commit
c97e2031d5
458 changed files with 23 additions and 23 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
include Makefile.inc
|
include Makefile.inc
|
||||||
|
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
universalchardet \
|
vendor/universalchardet \
|
||||||
libaegisub \
|
libaegisub \
|
||||||
tools \
|
tools \
|
||||||
src \
|
src \
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ CFLAGS_OSS = @OSS_CFLAGS@
|
||||||
CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
|
CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
|
||||||
CFLAGS_PTHREAD = @PTHREAD_CFLAGS@
|
CFLAGS_PTHREAD = @PTHREAD_CFLAGS@
|
||||||
CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
|
CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
|
||||||
CFLAGS_UCHARDET = -I../universalchardet
|
CFLAGS_UCHARDET = -I../vendor/universalchardet
|
||||||
|
|
||||||
LIBS_ALSA = @ALSA_LIBS@
|
LIBS_ALSA = @ALSA_LIBS@
|
||||||
LIBS_FFMS2 = @FFMS2_LIBS@
|
LIBS_FFMS2 = @FFMS2_LIBS@
|
||||||
|
|
@ -109,7 +109,7 @@ LIBS_LUA = @LUA_LIBS@
|
||||||
LIBS_OPENAL = @OPENAL_LIBS@
|
LIBS_OPENAL = @OPENAL_LIBS@
|
||||||
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
|
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
|
||||||
LIBS_PTHREAD = @PTHREAD_LIBS@
|
LIBS_PTHREAD = @PTHREAD_LIBS@
|
||||||
LIBS_UCHARDET ?= ../universalchardet/libuniversalchardet.a
|
LIBS_UCHARDET ?= ../vendor/universalchardet/libuniversalchardet.a
|
||||||
|
|
||||||
#####################
|
#####################
|
||||||
# DEBUG / DEVELOPMENT
|
# DEBUG / DEVELOPMENT
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@ $(SUBDIRS):
|
||||||
|
|
||||||
# Set relations to ensure dependencies are built before their targets during parallel builds.
|
# Set relations to ensure dependencies are built before their targets during parallel builds.
|
||||||
automation: libaegisub
|
automation: libaegisub
|
||||||
src: universalchardet tools libaegisub
|
src: vendor/universalchardet tools libaegisub
|
||||||
tests: libaegisub
|
tests: libaegisub
|
||||||
tools: libaegisub
|
tools: libaegisub
|
||||||
reporter: src
|
reporter: src
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
<!-- Aegisub project configuration -->
|
<!-- Aegisub project configuration -->
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\..\contrib\csri\</SrcDir>
|
<SrcDir>..\..\vendor\csri\</SrcDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
<!-- Aegisub project configuration -->
|
<!-- Aegisub project configuration -->
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\..\contrib\hunspell\src\</SrcDir>
|
<SrcDir>..\..\vendor\hunspell\src\</SrcDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
|
@ -47,9 +47,12 @@
|
||||||
<ClCompile Include="$(SrcDir)hunspell\affixmgr.cxx" />
|
<ClCompile Include="$(SrcDir)hunspell\affixmgr.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)hunspell\csutil.cxx" />
|
<ClCompile Include="$(SrcDir)hunspell\csutil.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)hunspell\dictmgr.cxx" />
|
<ClCompile Include="$(SrcDir)hunspell\dictmgr.cxx" />
|
||||||
|
<ClCompile Include="$(SrcDir)hunspell\filemgr.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)hunspell\hashmgr.cxx" />
|
<ClCompile Include="$(SrcDir)hunspell\hashmgr.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)hunspell\hunspell.cxx" />
|
<ClCompile Include="$(SrcDir)hunspell\hunspell.cxx" />
|
||||||
|
<ClCompile Include="$(SrcDir)hunspell\hunzip.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)hunspell\phonet.cxx" />
|
<ClCompile Include="$(SrcDir)hunspell\phonet.cxx" />
|
||||||
|
<ClCompile Include="$(SrcDir)hunspell\replist.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)hunspell\suggestmgr.cxx" />
|
<ClCompile Include="$(SrcDir)hunspell\suggestmgr.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)parsers\firstparser.cxx" />
|
<ClCompile Include="$(SrcDir)parsers\firstparser.cxx" />
|
||||||
<ClCompile Include="$(SrcDir)parsers\htmlparser.cxx" />
|
<ClCompile Include="$(SrcDir)parsers\htmlparser.cxx" />
|
||||||
|
|
@ -61,8 +64,5 @@
|
||||||
<!-- Why is this file named .c when it's obviously C++ code -->
|
<!-- Why is this file named .c when it's obviously C++ code -->
|
||||||
<CompileAs>CompileAsCpp</CompileAs>
|
<CompileAs>CompileAsCpp</CompileAs>
|
||||||
</ClCompile>
|
</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>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -122,14 +122,14 @@
|
||||||
<ClCompile Include="$(SrcDir)win_api\hunspelldll.c">
|
<ClCompile Include="$(SrcDir)win_api\hunspelldll.c">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\filemgr.cxx">
|
<ClCompile Include="$(SrcDir)hunspell\filemgr.cxx">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\hunzip.cxx">
|
<ClCompile Include="$(SrcDir)hunspell\hunzip.cxx">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\replist.cxx">
|
<ClCompile Include="$(SrcDir)hunspell\replist.cxx">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
<!-- Aegisub project configuration -->
|
<!-- Aegisub project configuration -->
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\..\contrib\iconv\</SrcDir>
|
<SrcDir>..\..\vendor\iconv\</SrcDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
<!-- Base for Aegisub source code -->
|
<!-- Base for Aegisub source code -->
|
||||||
<AegisubSourceBase Condition="'$(AegisubSourceBase)'==''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</AegisubSourceBase>
|
<AegisubSourceBase Condition="'$(AegisubSourceBase)'==''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</AegisubSourceBase>
|
||||||
<!-- Base for contrib libraries source code -->
|
<!-- Base for contrib libraries source code -->
|
||||||
<AegisubContribBase Condition="'$(AegisubContribBase)'==''">$(AegisubSourceBase)..\contrib\</AegisubContribBase>
|
<AegisubContribBase Condition="'$(AegisubContribBase)'==''">$(AegisubSourceBase)vendor\</AegisubContribBase>
|
||||||
<!-- Base for built files -->
|
<!-- Base for built files -->
|
||||||
<AegisubOutputBase Condition="'$(AegisubOutputBase)'==''">$(AegisubSourceBase)</AegisubOutputBase>
|
<AegisubOutputBase Condition="'$(AegisubOutputBase)'==''">$(AegisubSourceBase)</AegisubOutputBase>
|
||||||
<!-- Directory for built executables -->
|
<!-- Directory for built executables -->
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
<!-- Aegisub project configuration -->
|
<!-- Aegisub project configuration -->
|
||||||
<PropertyGroup Label="AegisubConfiguration">
|
<PropertyGroup Label="AegisubConfiguration">
|
||||||
<AegisubProjectType>lib</AegisubProjectType>
|
<AegisubProjectType>lib</AegisubProjectType>
|
||||||
<SrcDir>..\..\universalchardet\</SrcDir>
|
<SrcDir>..\..\vendor\universalchardet\</SrcDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,10 @@
|
||||||
#define _X86_ 1
|
#define _X86_ 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../../universalchardet/nscore.h"
|
#include "../../vendor/universalchardet/nscore.h"
|
||||||
#include "../../universalchardet/nsUniversalDetector.h"
|
#include "../../vendor/universalchardet/nsUniversalDetector.h"
|
||||||
#include "../../universalchardet/nsMBCSGroupProber.h"
|
#include "../../vendor/universalchardet/nsMBCSGroupProber.h"
|
||||||
#include "../../universalchardet/nsCharSetProber.h"
|
#include "../../vendor/universalchardet/nsCharSetProber.h"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
using namespace agi::charset;
|
using namespace agi::charset;
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ include ../Makefile.inc
|
||||||
|
|
||||||
PROGRAM = run
|
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)
|
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)
|
CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include -I./support $(CPPFLAGS_BOOST)
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue