iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

CSRI helper library; fixup build system while at it 

Originally committed to SVN as r968.
This commit is contained in:
David Lamparter 2007-03-31 22:04:57 +00:00
parent 7c38076d4f
commit ae37b2481f
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
SUBDIRS = ac FexTrackerSource aegisub locale SUBDIRS = ac FexTrackerSource csri aegisub locale
lua51/src/liblua.a: lua51/src/liblua.a:
make -C lua51/src CC=$(CXX) a make -C lua51/src CC=$(CXX) a

2
aegisub/Makefile.am
View File

@ -11,7 +11,7 @@ REVISION := $(if $(SVNREV),-DBUILD_SVN_REVISION=$(SVNREV)) $(if $(DARCSREV),-DBU
BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION) BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION)
AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h $(BUILDINFO) AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h $(BUILDINFO)
LDADD = posix/libposix.a ../lua51/src/liblua.a ../FexTrackerSource/libfex.a -lGL -lGLU LDADD = posix/libposix.a ../lua51/src/liblua.a ../FexTrackerSource/libfex.a ../csri/lib/.libs/libcsri.a -lGL -lGLU
# auto4_ruby_assfile.cpp # auto4_ruby_assfile.cpp
# auto4_ruby.cpp # auto4_ruby.cpp

3
aegisub/beautify Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
sed -e 's%\t\(if $(\(CXX\|\)COMPILE)\)%\t@echo -e "\\033[32;1m$@\\033[m";\1%' -i.orig Makefile

6
aegisub/subtitles_provider_csri.cpp
View File

@ -96,6 +96,8 @@ CSRISubtitlesProvider::~CSRISubtitlesProvider() {
////////////////// //////////////////
// Load subtitles // Load subtitles
void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) { void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) {
csri_rend *renderer;
// Close // Close
if (instance) csri_close(instance); if (instance) csri_close(instance);
instance = NULL; instance = NULL;
@ -109,7 +111,9 @@ void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) {
// Open // Open
//instance = csri_open_file(csri_renderer_default(),subsfilename.mb_str(wxConvUTF8),NULL); //instance = csri_open_file(csri_renderer_default(),subsfilename.mb_str(wxConvUTF8),NULL);
instance = csri_open_mem(csri_renderer_default(),&data[0],data.size(),NULL); renderer = csri_renderer_default();
if (renderer)
instance = csri_open_mem(renderer,&data[0],data.size(),NULL);
} }

2
autogen.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
aclocal && autoheader && automake -a && autoconf && echo "'configure' script created successfully." autoreconf -f -i -s

8
configure.ac
View File

@ -127,13 +127,6 @@ AC_CHECK_LIB([portaudio], [Pa_Initialize],, [AC_MSG_ERROR([portaudio not found.]
AC_CHECK_LIB([avcodec], [avcodec_init]) AC_CHECK_LIB([avcodec], [avcodec_init])
AC_CHECK_LIB([avformat], [av_read_frame]) AC_CHECK_LIB([avformat], [av_read_frame])
PKG_CHECK_MODULES([ASA], asa >= 0.3.2, [
CPPFLAGS="$CPPFLAGS $ASA_CFLAGS"
LIBS="$LIBS $ASA_LIBS"
AC_DEFINE(HAVE_ASA, 1, [found asa via pkg-config])
], [true])
AC_CHECK_HEADERS([asa/asa.h])
PKG_CHECK_MODULES([LIBASS], libass >= 0.9.1, [ PKG_CHECK_MODULES([LIBASS], libass >= 0.9.1, [
CPPFLAGS="$CPPFLAGS $LIBASS_CFLAGS" CPPFLAGS="$CPPFLAGS $LIBASS_CFLAGS"
LIBS="$LIBS $LIBASS_LIBS" LIBS="$LIBS $LIBASS_LIBS"
@ -183,6 +176,7 @@ AC_PATH_XTRA
AC_HEADER_STDC AC_HEADER_STDC
AC_HEADER_STDBOOL AC_HEADER_STDBOOL
AC_CONFIG_SUBDIRS([csri])
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile