mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

universalchardet is no longer optional.

Browse source 
Originally committed to SVN as r4481.
This commit is contained in:
Amar Takhar 2010-06-12 05:29:01 +00:00
parent 62b63ca5b6
commit c95eb3fcce
5 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/Makefile.am
View file

@ -1,10 +1,6 @@
AUTOMAKE_OPTIONS = foreign
if HAVE_UNIVCHARDET
univchardet = universalchardet
endif
if WITH_INTERNAL_LIBASS
libass = libass
endif
@ -17,7 +13,7 @@ SUBDIRS = \
libaegisub \
$(ffmpegsource) \
$(libass) \
$(univchardet) \
universalchardet
tools \
src \
reporter \

15
aegisub/configure.in
View file

@ -865,20 +865,6 @@ AM_CONDITIONAL([HAVE_HUNSPELL], [test "$with_hunspell" != "no"])
######################
## universalchardetect
######################
AC_ARG_ENABLE(univchardet, [ --disable-univchardet disble universalchardet support.], univchardet_disabled="(disabled)")
if test "$enable_univchardet" != "no"; then
with_univchardet="yes"
AC_DEFINE(WITH_UNIVCHARDET, 1, [Enable universalchardet support])
else
with_univchardet="no"
fi
AM_CONDITIONAL([HAVE_UNIVCHARDET], [test "$with_univchardet" != "no"])
############
# Automation
@ -1337,6 +1323,5 @@ Subtitle Providers:
Misc Packages
Hunspell: $with_hunspell $with_hunspell_version $hunspell_disabled
universalchardet: $with_univchardet $univchardet_disabled
]);

14
aegisub/src/Makefile.am
View file

@ -141,15 +141,6 @@ aegisub_2_2_LDFLAGS += @HUNSPELL_LIBS@
aegisub_2_2_LDADD += libmisc_hunspell.a
endif
if HAVE_UNIVCHARDET
noinst_LIBRARIES += libmisc_universalchardet.a
libmisc_universalchardet_a_SOURCES = charset_detect.cpp text_file_reader.cpp
libmisc_universalchardet_a_CPPFLAGS = -D_X86_
aegisub_2_2_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a
else
UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
endif
if FONTLISTER_FREETYPE
FONT_LISTER = font_file_lister_freetype.cpp
endif
@ -158,6 +149,10 @@ if FONTLISTER_FONTCONFIG
FONT_LISTER = font_file_lister_fontconfig.cpp
endif
noinst_LIBRARIES += libmisc_universalchardet.a
libmisc_universalchardet_a_SOURCES = charset_detect.cpp text_file_reader.cpp
libmisc_universalchardet_a_CPPFLAGS = -D_X86_
aegisub_2_2_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a
## These aren't built, but are listed here so 'make dist' can always find all the sources
## This should also list all Win32 specific files
@ -187,7 +182,6 @@ aegisub_2_2_SOURCES = \
$(FFMPEG) \
$(HUNSPELL) \
$(LIBASS) \
$(UNIVCHARSET) \
font_file_lister.cpp \
$(FONT_LISTER) \
MatroskaParser.c \

5
aegisub/src/config/config_windows0.h
View file

@ -93,11 +93,6 @@
#define WITH_CSRI
// Enable universal charset detector, so Aegisub can automatically detect the encoding of non-unicode subtitles
// Requires: universalcharset (in repository)
#define WITH_UNIVCHARDET
// Enable Hunspell-based spellchecker
// Requires: hunspell (in repository for Win32)
// If you have an old version of Hunspell (that uses Hunspell::put_word() instead of Hunspell::add()),

4
aegisub/src/dialog_about.cpp
View file

@ -74,6 +74,7 @@ AboutScreen::AboutScreen(wxWindow *parent)
libString += _T(" wxWidgets - Copyright (c) Julian Smart, Robert Roebling et al;\n");
libString += _T(" wxStyledTextCtrl - Copyright (c) Robin Dunn, Neil Hodgson;\n");
libString += _T(" Scintilla - Copyright (c) Neil Hodgson;\n");
libString += _T(" UniversalCharDet - Copyright (c) Netscape Communications Corp.;\n");
#ifdef WITH_AUTO4_LUA
libString += _T(" Lua - Copyright (c) Lua.org, PUC-Rio;\n");
#endif
@ -99,9 +100,6 @@ AboutScreen::AboutScreen(wxWindow *parent)
#ifdef WITH_LIBASS
libString += _T(" libass - Copyright (c) Evgeniy Stepanov, Grigori Goronzy;\n");
#endif
#ifdef WITH_UNIVCHARDET
libString += _T(" UniversalCharDet - Copyright (c) Netscape Communications Corp.;\n");
#endif
#ifdef __WINDOWS__
libString += _T(" Matroska Parser - Copyright (c) Mike Matsnev;\n");
#endif