mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Re-enable univerchardet (for now), also make it use STL rather than stdio (which

Browse source 
isn't complete)

Originally committed to SVN as r2085.
This commit is contained in:
Amar Takhar 2008-03-20 22:24:28 +00:00
parent 735aebb393
commit 90e9e6fef1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/Makefile.am
View file

@ -100,7 +100,7 @@ endif
if HAVE_UNIVCHARDET if HAVE_UNIVCHARDET
noinst_LIBRARIES += libmisc_universalchardet.a noinst_LIBRARIES += libmisc_universalchardet.a
libmisc_universalchardet_a_SOURCES = charset_detect.cpp text_file_reader.cpp libmisc_universalchardet_a_SOURCES = charset_detect.cpp text_file_reader.cpp
libmisc_universalchardet_a_CPPFLAGS = -D_X86_ -DTEXT_READER_USE_STDIO libmisc_universalchardet_a_CPPFLAGS = -D_X86_
aegisub_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a aegisub_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a
else else
UNIVCHARSET = charset_detect.cpp text_file_reader.cpp UNIVCHARSET = charset_detect.cpp text_file_reader.cpp

6
configure.in
View file

@ -319,8 +319,8 @@ fi
###################### ######################
## universalchardetect ## universalchardetect
###################### ######################
AC_ARG_ENABLE(univchardet, [ --enable-univchardet enable universalchardet support.], univchardet_disabled="(disabled)") AC_ARG_ENABLE(univchardet, [ --disable-univchardet diable universalchardet support.], univchardet_disabled="(disabled)")
if test "$with_univchardet" = "yes"; then if test "$enable_univchardet" != "no"; then
with_univchardet="yes" with_univchardet="yes"
AC_DEFINE(WITH_UNIVCHARDET, 1, [Enable universalchardet support]) AC_DEFINE(WITH_UNIVCHARDET, 1, [Enable universalchardet support])
else else
@ -688,5 +688,5 @@ Subtitle Providers:
Misc Packages: Misc Packages:
hunspell: $with_hunspell $hunspell_disabled hunspell: $with_hunspell $hunspell_disabled
universalchardet: $with_univchardet $univchardet_disabled (broken) universalchardet: $with_univchardet $univchardet_disabled
]); ]);