bring Makefile.am up to date; fix win32 CSRIAPI spec

Originally committed to SVN as r890.
This commit is contained in:
David Lamparter 2007-01-24 03:03:16 +00:00
parent 4247fa0ceb
commit 3ab9822ed3
2 changed files with 9 additions and 6 deletions

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 = -Iposix -include posix/defines.h $(BUILDINFO) AM_CPPFLAGS = -Iposix -include posix/defines.h $(BUILDINFO)
LDADD = posix/libposix.a ../lua51/src/liblua.a LDADD = posix/libposix.a ../lua51/src/liblua.a -lGL -lGLU
aegisub_SOURCES = \ aegisub_SOURCES = \
aegisublocale.cpp \ aegisublocale.cpp \
ass_attachment.cpp \ ass_attachment.cpp \
@ -76,6 +76,7 @@ aegisub_SOURCES = \
fft.cpp \ fft.cpp \
frame_main.cpp \ frame_main.cpp \
frame_main_events.cpp \ frame_main_events.cpp \
gl_wrap.cpp \
hilimod_textctrl.cpp \ hilimod_textctrl.cpp \
hotkeys.cpp \ hotkeys.cpp \
idle_field_event.cpp \ idle_field_event.cpp \
@ -98,9 +99,8 @@ aegisub_SOURCES = \
subtitle_format_prs.cpp \ subtitle_format_prs.cpp \
subtitle_format_srt.cpp \ subtitle_format_srt.cpp \
subtitle_format_txt.cpp \ subtitle_format_txt.cpp \
subtitle_provider.cpp \ subtitles_provider.cpp \
subtitle_provider_asa.cpp \ subtitles_provider_csri.cpp \
subtitle_provider_libass.cpp \
text_file_reader.cpp \ text_file_reader.cpp \
text_file_writer.cpp \ text_file_writer.cpp \
thesaurus.cpp \ thesaurus.cpp \
@ -113,10 +113,11 @@ aegisub_SOURCES = \
version.cpp \ version.cpp \
vfr.cpp \ vfr.cpp \
video_box.cpp \ video_box.cpp \
video_context.cpp \
video_display.cpp \ video_display.cpp \
video_display_visual.cpp \ video_display_visual.cpp \
video_frame.cpp \
video_provider.cpp \ video_provider.cpp \
video_provider_lavc.cpp \
video_slider.cpp \ video_slider.cpp \
video_zoom.cpp \ video_zoom.cpp \
MatroskaParser.c MatroskaParser.c

View file

@ -39,7 +39,9 @@
#include "subtitles_provider.h" #include "subtitles_provider.h"
#include "ass_file.h" #include "ass_file.h"
#include "video_context.h" #include "video_context.h"
#define CSRIAPI __declspec(dllexport) #ifdef WIN32
#define CSRIAPI __declspec(dllimport)
#endif
#include "csri/csri.h" #include "csri/csri.h"