Changes to fix building on non-Win32 systems (hopefully)
Originally committed to SVN as r673.
This commit is contained in:
parent
e30e65674d
commit
57451272ff
2 changed files with 19 additions and 11 deletions
|
@ -12,7 +12,7 @@ BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION)
|
|||
|
||||
AM_CPPFLAGS = -Iposix -include posix/defines.h $(BUILDINFO)
|
||||
LDADD = posix/libposix.a
|
||||
aegisub_SOURCES = about.cpp \
|
||||
aegisub_SOURCES = \
|
||||
aegisublocale.cpp \
|
||||
ass_attachment.cpp \
|
||||
ass_dialogue.cpp \
|
||||
|
@ -34,29 +34,34 @@ aegisub_SOURCES = about.cpp \
|
|||
audio_provider_lavc.cpp \
|
||||
audio_provider_ram.cpp \
|
||||
audio_provider_stream.cpp \
|
||||
automation.cpp \
|
||||
automation_filter.cpp \
|
||||
automation_gui.cpp \
|
||||
auto4_base.cpp \
|
||||
auto4_lua.cpp \
|
||||
auto4_lua_assfile.cpp \
|
||||
auto4_lua_dialog.cpp \
|
||||
avisynth_wrap.cpp \
|
||||
base_grid.cpp \
|
||||
colorspace.cpp \
|
||||
dialog_about.cpp \
|
||||
dialog_attachments.cpp \
|
||||
dialog_automation.cpp \
|
||||
dialog_colorpicker.cpp \
|
||||
dialog_export.cpp \
|
||||
dialog_hotkeys.cpp \
|
||||
dialog_jumpto.cpp \
|
||||
dialog_options.cpp \
|
||||
dialog_paste_over.cpp \
|
||||
dialog_progress.cpp \
|
||||
dialog_properties.cpp \
|
||||
dialog_resample.cpp \
|
||||
dialog_search_replace.cpp \
|
||||
dialog_selection.cpp \
|
||||
dialog_shift_times.cpp \
|
||||
dialog_spellcheck.cpp \
|
||||
dialog_splash.cpp \
|
||||
dialog_style_editor.cpp \
|
||||
dialog_style_manager.cpp \
|
||||
dialog_styling_assistant.cpp \
|
||||
dialog_timing_processor.cpp \
|
||||
dialog_tip.cpp \
|
||||
dialog_translation.cpp \
|
||||
drop.cpp \
|
||||
export_clean_info.cpp \
|
||||
|
@ -68,18 +73,22 @@ aegisub_SOURCES = about.cpp \
|
|||
frame_main_events.cpp \
|
||||
hilimod_textctrl.cpp \
|
||||
hotkeys.cpp \
|
||||
idle_field_event.cpp \
|
||||
lavc_file.cpp \
|
||||
main.cpp \
|
||||
md5.c \
|
||||
mkv_wrap.cpp \
|
||||
options.cpp \
|
||||
splash.cpp \
|
||||
spellchecker.cpp \
|
||||
spellchecker_hunspell.cpp \
|
||||
static_bmp.cpp \
|
||||
string_codec.cpp \
|
||||
subs_edit_box.cpp \
|
||||
subs_edit_ctrl.cpp \
|
||||
subs_grid.cpp \
|
||||
subtitle_format.cpp \
|
||||
subtitle_format_ass.cpp \
|
||||
subtitle_format_mkv.cpp \
|
||||
subtitle_format_prs.cpp \
|
||||
subtitle_format_srt.cpp \
|
||||
subtitle_format_txt.cpp \
|
||||
|
@ -88,8 +97,9 @@ aegisub_SOURCES = about.cpp \
|
|||
subtitle_provider_libass.cpp \
|
||||
text_file_reader.cpp \
|
||||
text_file_writer.cpp \
|
||||
thesaurus.cpp \
|
||||
thesaurus_myspell.cpp \
|
||||
timeedit_ctrl.cpp \
|
||||
tip.cpp \
|
||||
toggle_bitmap.cpp \
|
||||
utils.cpp \
|
||||
validators.cpp \
|
||||
|
@ -102,7 +112,6 @@ aegisub_SOURCES = about.cpp \
|
|||
video_provider_lavc.cpp \
|
||||
video_slider.cpp \
|
||||
video_zoom.cpp \
|
||||
yatta_wrap.cpp \
|
||||
MatroskaParser.c
|
||||
|
||||
|
||||
|
|
|
@ -84,9 +84,8 @@ LIBS="$LIBS `$WXCONFIG --libs` $FREETYPE_LIBS"
|
|||
AC_CHECK_LIB([m], [main])
|
||||
AC_CHECK_LIB([dl], [dlopen])
|
||||
|
||||
AC_CHECK_HEADERS([lua.h lua50/lua.h])
|
||||
AC_SEARCH_LIBS([lua_call], [lua lua50],, [AC_MSG_ERROR([lua not found.])])
|
||||
AC_SEARCH_LIBS([luaopen_base], [lualib lualib50],, [AC_MSG_WARN([lualib not found, assuming lua 5.1])])
|
||||
AC_CHECK_HEADERS([lua.h lua51/lua.h lua5.1/lua.h])
|
||||
AC_SEARCH_LIBS([lua_newstate], [lua lua51 lua5.1],, [AC_MSG_ERROR([lua 5.1 not found.])])
|
||||
AC_CHECK_LIB([portaudio], [Pa_Initialize],, [AC_MSG_ERROR([portaudio not found.])])
|
||||
AC_CHECK_LIB([avcodec], [avcodec_init])
|
||||
AC_CHECK_LIB([avformat], [av_read_frame])
|
||||
|
|
Loading…
Reference in a new issue