diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am index 0d2905e43..174a17bc3 100644 --- a/aegisub/src/Makefile.am +++ b/aegisub/src/Makefile.am @@ -21,75 +21,75 @@ SUBDIRS = \ AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I../libffms/include bin_PROGRAMS = aegisub-2.1 -aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib) -aegisub_2_1_CPPFLAGS = @FREETYPE_CFLAGS@ -aegisub_2_1_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LDFLAGS@ $(libosxutil_ldflags) @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@ +aegisub_2_2_LDADD = libresrc/libresrc.a $(libosxutil_lib) +aegisub_2_2_CPPFLAGS = @FREETYPE_CFLAGS@ +aegisub_2_2_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LDFLAGS@ $(libosxutil_ldflags) @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@ LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@ if BUILD_DARWIN -aegisub_2_1_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries +aegisub_2_2_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries endif noinst_LIBRARIES += libaudio_player.a libaudio_player_a_SOURCES = audio_player.cpp libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@ -aegisub_2_1_LDADD += libaudio_player.a +aegisub_2_2_LDADD += libaudio_player.a if HAVE_ALSA noinst_LIBRARIES += libaudio_alsa.a libaudio_alsa_a_SOURCES = audio_player_alsa.cpp -aegisub_2_1_LDFLAGS += @ALSA_LDFLAGS@ -aegisub_2_1_LDADD += libaudio_alsa.a +aegisub_2_2_LDFLAGS += @ALSA_LDFLAGS@ +aegisub_2_2_LDADD += libaudio_alsa.a endif if HAVE_PORTAUDIO noinst_LIBRARIES += libaudio_portaudio.a libaudio_portaudio_a_SOURCES = audio_player_portaudio.cpp libaudio_portaudio_a_CPPFLAGS = @PORTAUDIO_CFLAGS@ -aegisub_2_1_LDFLAGS += @PORTAUDIO_LIBS@ -aegisub_2_1_LDADD += libaudio_portaudio.a +aegisub_2_2_LDFLAGS += @PORTAUDIO_LIBS@ +aegisub_2_2_LDADD += libaudio_portaudio.a endif if HAVE_PULSEAUDIO noinst_LIBRARIES += libaudio_pulseaudio.a libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@ -aegisub_2_1_LDFLAGS += @LIBPULSE_LIBS@ -aegisub_2_1_LDADD += libaudio_pulseaudio.a +aegisub_2_2_LDFLAGS += @LIBPULSE_LIBS@ +aegisub_2_2_LDADD += libaudio_pulseaudio.a endif if HAVE_OPENAL noinst_LIBRARIES += libaudio_openal.a libaudio_openal_a_SOURCES = audio_player_openal.cpp libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@ -aegisub_2_1_LDFLAGS += @OPENAL_LIBS@ -aegisub_2_1_LDADD += libaudio_openal.a +aegisub_2_2_LDFLAGS += @OPENAL_LIBS@ +aegisub_2_2_LDADD += libaudio_openal.a endif if HAVE_FFMPEG -aegisub_2_1_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ +aegisub_2_2_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ endif if HAVE_PROVIDER_FFMPEGSOURCE noinst_LIBRARIES += libaudiovideo_ffmpegsource.a libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@ -aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a -aegisub_2_1_LDFLAGS += @LIBPOSTPROC_LIBS@ +aegisub_2_2_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a +aegisub_2_2_LDFLAGS += @LIBPOSTPROC_LIBS@ endif noinst_LIBRARIES += libsubtitle_provider.a libsubtitle_provider_a_SOURCES = subtitles_provider.cpp libsubtitle_provider_a_CPPFLAGS = @CSRI_CFLAGS@ -aegisub_2_1_LDADD += libsubtitle_provider.a +aegisub_2_2_LDADD += libsubtitle_provider.a if WITH_LIBASS noinst_LIBRARIES += libsubtitle_ass.a libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@ @ICONV_CFLAGS@ LIBS += @LIBASS_LIBS@ -aegisub_2_1_LDADD += libsubtitle_ass.a -aegisub_2_1_LDFLAGS += @FONTCONFIG_LIBS@ +aegisub_2_2_LDADD += libsubtitle_ass.a +aegisub_2_2_LDFLAGS += @FONTCONFIG_LIBS@ endif if WITH_CSRI @@ -97,8 +97,8 @@ noinst_LIBRARIES += libsubtitle_csri.a libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@ LIBS += @CSRI_LIBS@ -aegisub_2_1_LDADD += libsubtitle_csri.a -aegisub_2_1_LDFLAGS += @FONTCONFIG_LIBS@ +aegisub_2_2_LDADD += libsubtitle_csri.a +aegisub_2_2_LDFLAGS += @FONTCONFIG_LIBS@ endif if HAVE_AUTO4_LUA @@ -106,7 +106,7 @@ noinst_LIBRARIES += libauto4_lua.a libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp libauto4_lua_a_CPPFLAGS = @LUA_CFLAGS@ LIBS += @LUA_LDFLAGS@ -aegisub_2_1_LDADD += libauto4_lua.a +aegisub_2_2_LDADD += libauto4_lua.a endif if HAVE_AUTO4_PERL @@ -114,15 +114,15 @@ noinst_LIBRARIES += libauto4_perl.a libauto4_perl_a_SOURCES = auto4_perl.cpp auto4_perl_script.cpp auto4_perl_dialogs.cpp auto4_perl_ass.cpp auto4_perl_console.cpp auto4_perl.h auto4_perl_console.h libauto4_perl_a_CPPFLAGS = @PERL_CFLAGS@ LIBS += @PERL_LDFLAGS@ -aegisub_2_1_LDADD += libauto4_perl.a +aegisub_2_2_LDADD += libauto4_perl.a endif if HAVE_AUTO4_RUBY noinst_LIBRARIES += libauto4_ruby.a libauto4_ruby_a_SOURCES = auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp libauto4_ruby_a_CPPFLAGS = @RUBY_CFLAGS@ -aegisub_2_1_LDFLAGS += @RUBY_LDFLAGS@ -aegisub_2_1_LDADD += libauto4_ruby.a +aegisub_2_2_LDFLAGS += @RUBY_LDFLAGS@ +aegisub_2_2_LDADD += libauto4_ruby.a endif if BUILD_DARWIN @@ -136,21 +136,21 @@ AUTO3_LUA = auto4_auto3.cpp # This is a workaround top stop libtool from binging in dependency_libs which # causes many link errors due to auto4 (lua 5.1) support. #aegisub_2_1_LDADD += -L$(srcdir)/../auto3 -laegisub-auto3-2.1 -aegisub_2_1_LDADD += ${AUTO3_LIB} +aegisub_2_2_LDADD += ${AUTO3_LIB} endif if HAVE_HUNSPELL noinst_LIBRARIES += libmisc_hunspell.a libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp -aegisub_2_1_LDFLAGS += @HUNSPELL_LIBS@ -aegisub_2_1_LDADD += libmisc_hunspell.a +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_1_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a +aegisub_2_2_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a else UNIVCHARSET = charset_detect.cpp text_file_reader.cpp endif @@ -170,7 +170,7 @@ endif ## 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 -EXTRA_aegisub_2_1_SOURCES = \ +EXTRA_aegisub_2_2_SOURCES = \ font_file_lister.cpp \ $(FONT_LISTER) \ audio_player_dsound.cpp \ @@ -199,7 +199,7 @@ EXTRA_aegisub_2_1_SOURCES = \ video_provider_dshow.cpp -aegisub_2_1_SOURCES = \ +aegisub_2_2_SOURCES = \ $(AUTO3_LUA) \ $(FFMPEG) \ $(HUNSPELL) \ @@ -343,7 +343,7 @@ aegisub_2_1_SOURCES = \ visual_tool_vector_clip.cpp -aegisub_2_1_SOURCES += \ +aegisub_2_2_SOURCES += \ $(srcdir)/*.h \ $(srcdir)/include/aegisub/*.h \ $(srcdir)/config/*.h