mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Rename 2.2 to 3.0 as this will now be the next version outside of 2.1.

Browse source 
Originally committed to SVN as r4747.
This commit is contained in:
Amar Takhar 2010-08-15 18:40:58 +00:00
parent b50255bfe9
commit 714fa65071
5 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/configure.in
View file

@ -6,8 +6,8 @@ AC_PREREQ(2.57)
# MAKE SURE YOU UPDATE THE VERSION INFO BELOW WHEN YOU SET THIS TO '1' # MAKE SURE YOU UPDATE THE VERSION INFO BELOW WHEN YOU SET THIS TO '1'
m4_define([aegisub_FINAL_RELEASE], [0]) m4_define([aegisub_FINAL_RELEASE], [0])
m4_define([aegisub_version_major], [2]) m4_define([aegisub_version_major], [3])
m4_define([aegisub_version_minor], [2]) m4_define([aegisub_version_minor], [0])
m4_define([aegisub_version_revision], [0]) m4_define([aegisub_version_revision], [0])
m4_define([aegisub_version], [aegisub_version_major.aegisub_version_minor.aegisub_version_revision]) m4_define([aegisub_version], [aegisub_version_major.aegisub_version_minor.aegisub_version_revision])
m4_define([aegisub_version_data], [aegisub_version_major.aegisub_version_minor]) m4_define([aegisub_version_data], [aegisub_version_major.aegisub_version_minor])

12
aegisub/libaegisub/Makefile.am
View file

@ -3,20 +3,20 @@ AUTOMAKE_OPTIONS = subdir-objects
AM_CXXFLAGS= AM_CXXFLAGS=
DISTCLEANFILES= DISTCLEANFILES=
lib_LTLIBRARIES = libaegisub-2.2.la lib_LTLIBRARIES = libaegisub-3.0.la
libaegisub_2_2_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic -DLAGI libaegisub_3_0_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic -DLAGI
AM_LDFLAGS = @ICONV_LDFLAGS@ AM_LDFLAGS = @ICONV_LDFLAGS@
if PRECOMPILED_HEADER if PRECOMPILED_HEADER
BUILT_SOURCES = lagi_pre.h.gch BUILT_SOURCES = lagi_pre.h.gch
AM_CXXFLAGS += -include lagi_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess AM_CXXFLAGS += -include lagi_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
nodist_libaegisub_2_2_la_SOURCES = lagi_pre.h.gch nodist_libaegisub_3_0_la_SOURCES = lagi_pre.h.gch
endif endif
if PRECOMPILED_HEADER if PRECOMPILED_HEADER
# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this. # This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
lagi_pre.h.gch: lagi_pre.h lagi_pre.h.gch: lagi_pre.h
@CXX@ $(libaegisub_2_2_la_CPPFLAGS) @CXXFLAGS@ @DEBUG_FLAGS@ -fPIC -DPIC lagi_pre.h @CXX@ $(libaegisub_3_0_la_CPPFLAGS) @CXXFLAGS@ @DEBUG_FLAGS@ -fPIC -DPIC lagi_pre.h
DISTCLEANFILES += lagi_pre.h.gch DISTCLEANFILES += lagi_pre.h.gch
endif endif
@ -25,7 +25,7 @@ AM_CXXFLAGS += -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreSe
AM_LDFLAGS += -L../universalchardet -luniversalchardet AM_LDFLAGS += -L../universalchardet -luniversalchardet
endif endif
libaegisub_2_2_la_SOURCES = \ libaegisub_3_0_la_SOURCES = \
common/charset.cpp \ common/charset.cpp \
common/charset_conv.cpp \ common/charset_conv.cpp \
common/charset_ucd.cpp \ common/charset_ucd.cpp \
@ -42,7 +42,7 @@ libaegisub_2_2_la_SOURCES = \
unix/log.cpp unix/log.cpp
if BUILD_DARWIN if BUILD_DARWIN
libaegisub_2_2_la_SOURCES += \ libaegisub_3_0_la_SOURCES += \
osx/util.cpp osx/util.cpp
endif endif

18
aegisub/reporter/Makefile.am
View file

@ -2,16 +2,16 @@ AUTOMAKE_OPTIONS = foreign
AM_CXXFLAGS = AM_CXXFLAGS =
DISTCLEANFILES = DISTCLEANFILES =
bin_PROGRAMS = reporter-2.2 bin_PROGRAMS = reporter-3.0
if PRECOMPILED_HEADER if PRECOMPILED_HEADER
BUILT_SOURCES = r_pre.h.gch BUILT_SOURCES = r_pre.h.gch
AM_CXXFLAGS += -include r_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess AM_CXXFLAGS += -include r_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
nodist_reporter_2_2_SOURCES = r_prec.h.gch nodist_reporter_3_0_SOURCES = r_prec.h.gch
endif endif
reporter_2_2_CPPFLAGS = -Iinclude @LIBCURL_CFLAGS@ @WX_CPPFLAGS@ reporter_3_0_CPPFLAGS = -Iinclude @LIBCURL_CFLAGS@ @WX_CPPFLAGS@
reporter_2_2_LDFLAGS = @WX_LIBS@ @LIBCURL_LIBS@ reporter_3_0_LDFLAGS = @WX_LIBS@ @LIBCURL_LIBS@
if PRECOMPILED_HEADER if PRECOMPILED_HEADER
# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this. # This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
@ -21,7 +21,7 @@ DISTCLEANFILES += r_pre.h.gch
endif endif
reporter_2_2_SOURCES = \ reporter_3_0_SOURCES = \
aegisub.cpp \ aegisub.cpp \
main.cpp \ main.cpp \
name_map.cpp \ name_map.cpp \
@ -33,19 +33,19 @@ reporter_2_2_SOURCES = \
view.cpp view.cpp
if BUILD_BSD if BUILD_BSD
reporter_2_2_SOURCES += platform_unix_bsd.cpp reporter_3_0_SOURCES += platform_unix_bsd.cpp
endif endif
if BUILD_LINUX if BUILD_LINUX
reporter_2_2_SOURCES += platform_unix_linux.cpp reporter_3_0_SOURCES += platform_unix_linux.cpp
endif endif
if BUILD_DARWIN if BUILD_DARWIN
reporter_2_2_SOURCES += platform_unix_osx.cpp reporter_3_0_SOURCES += platform_unix_osx.cpp
endif endif
reporter_2_2_SOURCES += \ reporter_3_0_SOURCES += \
*.h \ *.h \
include/*.h include/*.h

62
aegisub/src/Makefile.am
View file

@ -8,7 +8,7 @@ if PRECOMPILED_HEADER
BUILT_SOURCES = agi_pre.h.gch BUILT_SOURCES = agi_pre.h.gch
precompiled_header = agi_pre.h precompiled_header = agi_pre.h
AM_CXXFLAGS += -Winvalid-pch -fpch-deps -fpch-preprocess -include agi_pre.h AM_CXXFLAGS += -Winvalid-pch -fpch-deps -fpch-preprocess -include agi_pre.h
nodist_aegisub_2_2_SOURCES = agi_pre.h.gch nodist_aegisub_3_0_SOURCES = agi_pre.h.gch
DISTCLEANFILES += agi_pre.h.gch DISTCLEANFILES += agi_pre.h.gch
endif endif
@ -18,10 +18,10 @@ SUBDIRS = \
AM_CXXFLAGS += -DAEGISUB -Iinclude -I../libffms/include -I../libaegisub/include @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ AM_CXXFLAGS += -DAEGISUB -Iinclude -I../libffms/include -I../libaegisub/include @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@
bin_PROGRAMS = aegisub-2.2 bin_PROGRAMS = aegisub-3.0
aegisub_2_2_LDADD = libresrc/libresrc.a -L../libaegisub -laegisub-2.2 aegisub_3_0_LDADD = libresrc/libresrc.a -L../libaegisub -laegisub-3.0
aegisub_2_2_CPPFLAGS = @FREETYPE_CFLAGS@ aegisub_3_0_CPPFLAGS = @FREETYPE_CFLAGS@
aegisub_2_2_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@ aegisub_3_0_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@
LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@ LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@
if PRECOMPILED_HEADER if PRECOMPILED_HEADER
@ -31,75 +31,75 @@ agi_pre.h.gch: agi_pre.h
endif endif
if BUILD_DARWIN if BUILD_DARWIN
aegisub_2_2_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries aegisub_3_0_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
endif endif
noinst_LIBRARIES += libaudio_player.a noinst_LIBRARIES += libaudio_player.a
libaudio_player_a_SOURCES = audio_player.cpp libaudio_player_a_SOURCES = audio_player.cpp
libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@ libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@
aegisub_2_2_LDADD += libaudio_player.a aegisub_3_0_LDADD += libaudio_player.a
if HAVE_ALSA if HAVE_ALSA
noinst_LIBRARIES += libaudio_alsa.a noinst_LIBRARIES += libaudio_alsa.a
libaudio_alsa_a_SOURCES = audio_player_alsa.cpp libaudio_alsa_a_SOURCES = audio_player_alsa.cpp
aegisub_2_2_LDFLAGS += @ALSA_LDFLAGS@ aegisub_3_0_LDFLAGS += @ALSA_LDFLAGS@
aegisub_2_2_LDADD += libaudio_alsa.a aegisub_3_0_LDADD += libaudio_alsa.a
endif endif
if HAVE_PORTAUDIO if HAVE_PORTAUDIO
noinst_LIBRARIES += libaudio_portaudio.a noinst_LIBRARIES += libaudio_portaudio.a
libaudio_portaudio_a_SOURCES = audio_player_portaudio.cpp libaudio_portaudio_a_SOURCES = audio_player_portaudio.cpp
libaudio_portaudio_a_CPPFLAGS = @PORTAUDIO_CFLAGS@ libaudio_portaudio_a_CPPFLAGS = @PORTAUDIO_CFLAGS@
aegisub_2_2_LDFLAGS += @PORTAUDIO_LIBS@ aegisub_3_0_LDFLAGS += @PORTAUDIO_LIBS@
aegisub_2_2_LDADD += libaudio_portaudio.a aegisub_3_0_LDADD += libaudio_portaudio.a
endif endif
if HAVE_PULSEAUDIO if HAVE_PULSEAUDIO
noinst_LIBRARIES += libaudio_pulseaudio.a noinst_LIBRARIES += libaudio_pulseaudio.a
libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp
libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@ libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@
aegisub_2_2_LDFLAGS += @LIBPULSE_LIBS@ aegisub_3_0_LDFLAGS += @LIBPULSE_LIBS@
aegisub_2_2_LDADD += libaudio_pulseaudio.a aegisub_3_0_LDADD += libaudio_pulseaudio.a
endif endif
if HAVE_OPENAL if HAVE_OPENAL
noinst_LIBRARIES += libaudio_openal.a noinst_LIBRARIES += libaudio_openal.a
libaudio_openal_a_SOURCES = audio_player_openal.cpp libaudio_openal_a_SOURCES = audio_player_openal.cpp
libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@ libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@
aegisub_2_2_LDFLAGS += @OPENAL_LIBS@ aegisub_3_0_LDFLAGS += @OPENAL_LIBS@
aegisub_2_2_LDADD += libaudio_openal.a aegisub_3_0_LDADD += libaudio_openal.a
endif endif
if HAVE_OSS if HAVE_OSS
noinst_LIBRARIES += libaudio_oss.a noinst_LIBRARIES += libaudio_oss.a
libaudio_oss_a_SOURCES = audio_player_oss.cpp libaudio_oss_a_SOURCES = audio_player_oss.cpp
aegisub_2_2_LDADD += libaudio_oss.a aegisub_3_0_LDADD += libaudio_oss.a
endif endif
if HAVE_FFMPEG if HAVE_FFMPEG
aegisub_2_2_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ aegisub_3_0_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
endif endif
if HAVE_PROVIDER_FFMPEGSOURCE if HAVE_PROVIDER_FFMPEGSOURCE
noinst_LIBRARIES += libaudiovideo_ffmpegsource.a noinst_LIBRARIES += libaudiovideo_ffmpegsource.a
libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp 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@ libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
aegisub_2_2_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a aegisub_3_0_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a
aegisub_2_2_LDFLAGS += @LIBPOSTPROC_LIBS@ aegisub_3_0_LDFLAGS += @LIBPOSTPROC_LIBS@
endif endif
noinst_LIBRARIES += libsubtitle_provider.a noinst_LIBRARIES += libsubtitle_provider.a
libsubtitle_provider_a_SOURCES = subtitles_provider.cpp libsubtitle_provider_a_SOURCES = subtitles_provider.cpp
libsubtitle_provider_a_CPPFLAGS = @CSRI_CFLAGS@ libsubtitle_provider_a_CPPFLAGS = @CSRI_CFLAGS@
aegisub_2_2_LDADD += libsubtitle_provider.a aegisub_3_0_LDADD += libsubtitle_provider.a
if WITH_LIBASS if WITH_LIBASS
noinst_LIBRARIES += libsubtitle_ass.a noinst_LIBRARIES += libsubtitle_ass.a
libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@ @ICONV_CFLAGS@ libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@ @ICONV_CFLAGS@
LIBS += @LIBASS_LIBS@ LIBS += @LIBASS_LIBS@
aegisub_2_2_LDADD += libsubtitle_ass.a aegisub_3_0_LDADD += libsubtitle_ass.a
aegisub_2_2_LDFLAGS += @FONTCONFIG_LIBS@ aegisub_3_0_LDFLAGS += @FONTCONFIG_LIBS@
endif endif
if WITH_CSRI if WITH_CSRI
@ -107,8 +107,8 @@ noinst_LIBRARIES += libsubtitle_csri.a
libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp
libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@ libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@
LIBS += @CSRI_LIBS@ LIBS += @CSRI_LIBS@
aegisub_2_2_LDADD += libsubtitle_csri.a aegisub_3_0_LDADD += libsubtitle_csri.a
aegisub_2_2_LDFLAGS += @FONTCONFIG_LIBS@ aegisub_3_0_LDFLAGS += @FONTCONFIG_LIBS@
endif endif
if HAVE_AUTO4_LUA if HAVE_AUTO4_LUA
@ -116,14 +116,14 @@ 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_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp
libauto4_lua_a_CPPFLAGS = @LUA_CFLAGS@ libauto4_lua_a_CPPFLAGS = @LUA_CFLAGS@
LIBS += @LUA_LDFLAGS@ LIBS += @LUA_LDFLAGS@
aegisub_2_2_LDADD += libauto4_lua.a aegisub_3_0_LDADD += libauto4_lua.a
endif endif
if HAVE_HUNSPELL if HAVE_HUNSPELL
noinst_LIBRARIES += libmisc_hunspell.a noinst_LIBRARIES += libmisc_hunspell.a
libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp
aegisub_2_2_LDFLAGS += @HUNSPELL_LIBS@ aegisub_3_0_LDFLAGS += @HUNSPELL_LIBS@
aegisub_2_2_LDADD += libmisc_hunspell.a aegisub_3_0_LDADD += libmisc_hunspell.a
endif endif
if FONTLISTER_FREETYPE if FONTLISTER_FREETYPE
@ -137,11 +137,11 @@ endif
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_ libmisc_universalchardet_a_CPPFLAGS = -D_X86_
aegisub_2_2_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a aegisub_3_0_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a
## These aren't built, but are listed here so 'make dist' can always find all the sources ## 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 ## This should also list all Win32 specific files
EXTRA_aegisub_2_2_SOURCES = \ EXTRA_aegisub_3_0_SOURCES = \
$(precompiled_header) \ $(precompiled_header) \
font_file_lister.cpp \ font_file_lister.cpp \
$(FONT_LISTER) \ $(FONT_LISTER) \
@ -163,7 +163,7 @@ EXTRA_aegisub_2_2_SOURCES = \
video_provider_avs.cpp video_provider_avs.cpp
aegisub_2_2_SOURCES = \ aegisub_3_0_SOURCES = \
$(FFMPEG) \ $(FFMPEG) \
$(HUNSPELL) \ $(HUNSPELL) \
$(LIBASS) \ $(LIBASS) \
@ -305,7 +305,7 @@ aegisub_2_2_SOURCES = \
visual_tool_vector_clip.cpp visual_tool_vector_clip.cpp
aegisub_2_2_SOURCES += \ aegisub_3_0_SOURCES += \
$(srcdir)/*.h \ $(srcdir)/*.h \
$(srcdir)/include/aegisub/*.h \ $(srcdir)/include/aegisub/*.h \
$(srcdir)/config/*.h $(srcdir)/config/*.h

2
aegisub/src/version.cpp
View file

@ -129,7 +129,7 @@ struct VersionInfoStruct {
#ifdef FINAL_RELEASE #ifdef FINAL_RELEASE
IsRelease = true; IsRelease = true;
VersionNumber = _T("2.2.0"); VersionNumber = _T("3.0.0");
#else #else
IsRelease = false; IsRelease = false;
VersionNumber = _T("r") _T_int(BUILD_SVN_REVISION) VersionNumber = _T("r") _T_int(BUILD_SVN_REVISION)