mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
2635 commits 10 branches 31 tags 48 MiB
Commit graph

181 commits

Author SHA1 Message Date
Amar Takhar
91d73ec8ea SVN Transition Step 3/7 
1. cd aegisub/
  2. svn mv *cpp *h src/
  3. svn mv Makefile.am MatroskaParser.c auto4_perldata.inc bitmaps boost \
     changelog.txt config gl include libosxutil libresrc md5.c msvc mythes.cxx \
     mythes.hxx res.rc src/
  4. cd ..
  5. svn mv FFmpegSource2/ INSTALL Makefile.am README  acinclude.m4 \
     autogen.sh automation/ bin build configure.in desktop dummy.txt lib \
     libass/ m4macros/ packages/ po/ scripts/ universalchardet/ aegisub/
  6. mkdir -p docs/wiki_convert
  7. svn add docs/wiki_convert
  8. cd docs
  9. svn mv aegisub_convert_docs.pl convert.bat output wiki_convert/

* See r2749 for full description.

Originally committed to SVN as r2752.
 2009-03-08 08:30:39 +00:00
Amar Takhar
6218649912 Move *all* AC_SUBST* out of any conditional blocks, also set them below 
AM_CONDITIONAL where applicable.

Originally committed to SVN as r2747.
 2009-02-22 22:04:21 +00:00
Amar Takhar
bf730cf96e * Rework the debugging flags to set the variables conditionally on either being 
enabled.
* Fix some cut-and-paste-o's (dunno how I managed these)
* Move AC_SUBST* outside of the conditionally enabled blocks
* Fix typo.

Originally committed to SVN as r2746.
 2009-02-22 22:01:14 +00:00
Amar Takhar
4960863be2 Add --enable-gcov, --enable-efence and --enable-ccmalloc for gcov, Electric 
Fence and ccmalloc support.  gcov support won't work without manual
intervention (for now) but some hooks will be added later to automate it.

Originally committed to SVN as r2745.
 2009-02-22 05:38:46 +00:00
Amar Takhar
6ea67c624d Only enable -D_DEBUG if there is a debug version of wxWidgets installed. 
Originally committed to SVN as r2740.
 2009-02-17 09:08:27 +00:00
Amar Takhar
a2a793e344 On OS X affix -debug to the bundle name when --enable-debug is used. 
Originally committed to SVN as r2738.
 2009-02-17 06:37:39 +00:00
Amar Takhar
28b8c45b54 Add -D_DEBUG when --enable-debug is used, this can't be turned off as 
anyone making a debug build should use any features to help out with
debugging.

Originally committed to SVN as r2737.
 2009-02-17 02:27:31 +00:00
Amar Takhar
1f47e17d66 Add -pipe for C/C++. 
Originally committed to SVN as r2732.
 2009-02-14 19:08:44 +00:00
Amar Takhar
6495831ed0 Really disable -O2 when --enable-debug is used. 
Originally committed to SVN as r2731.
 2009-02-14 19:05:40 +00:00
Amar Takhar
88dc740d90 Add some more comments for clarity. 
Originally committed to SVN as r2730.
 2009-02-12 00:39:53 +00:00
Amar Takhar
5ce4e24f57 Disable -O2 when --enable-debug is used, it can/does do odd things. 
Originally committed to SVN as r2729.
 2009-02-11 16:50:16 +00:00
Amar Takhar
a7da892c62 Add a few comments for clarity. 
Originally committed to SVN as r2728.
 2009-02-10 21:25:32 +00:00
Amar Takhar
90c6172db9 Add a new flag: --disable-compiler-flags which disables *all* default 
compiler flags.

Originally committed to SVN as r2727.
 2009-02-10 20:50:28 +00:00
Amar Takhar
ff7776233a Remove a stray EOL ','. 
Originally committed to SVN as r2719.
 2009-02-03 05:28:39 +00:00
Amar Takhar
9c6780a33e * Add DEBUG_FLAGS / PROFILE_FLAGS to LDFLAGS for aegisub binary linking. 
* Move assigned variables used by AC_SUBST below AC_INIT(), they won't work
  otherwise.

Originally committed to SVN as r2718.
 2009-01-29 21:32:39 +00:00
Amar Takhar
287639df1e Print CXXFLAGS at the end. 
Originally committed to SVN as r2717.
 2009-01-29 20:47:49 +00:00
Amar Takhar
318313f17e Sigh, fix _3_ (yes, 3) typos, this is what I get for committing without 
testing first while on the phone.

Originally committed to SVN as r2716.
 2009-01-29 20:46:05 +00:00
Amar Takhar
2857277a55 Add --enable-profile and PROFILE_FLAGS to enable profiling, also fix 
s/--enable debug/--enable-debug/ in DEBUG_FLAGS comment.

Originally committed to SVN as r2715.
 2009-01-29 20:39:40 +00:00
Amar Takhar
f876084c51 Format FreeType detection to be the same as others. 
Originally committed to SVN as r2714.
 2009-01-29 04:15:25 +00:00
Amar Takhar
6bbb5cafaf There really is no point in having --enable-build-dist, anyone building a dist 
will have a .svn dir which triggers svnversion to run in order to define
BUILD_SVN_REVISION.  After that it's a simple echo to generate svn_revision
rather than running svnversion _twice_ when --enable-build-dist is used.

Originally committed to SVN as r2713.
 2009-01-29 03:56:23 +00:00
Amar Takhar
61cce1260d * Remove duplicate version entries (how did that happen?!) 
* Re-order some lines to follow previous conventions.
* Add some comments for clarity.

Originally committed to SVN as r2712.
 2009-01-29 03:52:47 +00:00
Amar Takhar
4e645821d6 Only enable perlconsle if perl is detected. 
Originally committed to SVN as r2711.
 2009-01-29 03:18:30 +00:00
Amar Takhar
79ee6c4337 Fix enabling/disabling of FFMPEG based on --without-ffmpeg / AC_AGI_COMPILE. 
Originally committed to SVN as r2708.
 2009-01-28 23:17:02 +00:00
Amar Takhar
1a398b79a0 * Fix disabling of a few libraries, they were being defined in acconf.h when 
--without-* was being supplied.

Originally committed to SVN as r2707.
 2009-01-28 21:58:53 +00:00
Amar Takhar
f1525231c5 * The new FFMPEG requires libavutil. 
* Fix detection of FFMPEG based on AC_AGI_COMPILE.

Originally committed to SVN as r2706.
 2009-01-28 18:22:01 +00:00
Amar Takhar
9a6265afb6 * Switch FFMPEG detection to use pkg-config. 
* Add an FFMPEG compile check from TheFluff, thanks! (modified)
* Add a libpostproc check from Myrsloik, thanks!. (reqired by ffms)
* Rework how ffms / FFMPEG providers are enabled/disabled.
* Fix PulseAudio check to use pulseaudio_required_version.

Originally committed to SVN as r2705.
 2009-01-28 03:19:53 +00:00
Amar Takhar
1fc063f759 * Swap with*=1|0 to with*=yes|no in wx-config check. 
* Fix misnamed variable which disabled the wx opengl test.

Originally committed to SVN as r2698.
 2009-01-15 01:14:41 +00:00
Amar Takhar
a196f1efbb Only substitude RUBY_(C|LD)FLAGS and PERL_(C|LD)FLAGS if either are actually 
detected as working.

Originally committed to SVN as r2697.
 2009-01-15 01:06:21 +00:00
Amar Takhar
dafcf9badd * Cleanup Hunspell block (remove legacy code) 
* Fix disabling of hunspell if compile test fails.

Originally committed to SVN as r2696.
 2009-01-15 01:04:55 +00:00
Amar Takhar
0035436eff Fix ALSA block (remove legacy code) 
Originally committed to SVN as r2695.
 2009-01-15 01:02:57 +00:00
Amar Takhar
c37e33e29c Move PKG_CHECK_MODULES(ASA.. within the $with_csri block, also check for 
detection of CSRI _and_ ASA before enabling CSRI.

Originally committed to SVN as r2694.
 2009-01-14 06:10:03 +00:00
Amar Takhar
fa240bc665 Really disable libass if --disable-libass is provided. 
Originally committed to SVN as r2693.
 2009-01-14 06:06:37 +00:00
Amar Takhar
b6661ec3a4 Re-format PulseAudio detection block. (legacy) 
Originally committed to SVN as r2692.
 2009-01-14 04:58:35 +00:00
Amar Takhar
57bdedbaa7 Fix pulseaudio/portaudio detection. 
Originally committed to SVN as r2691.
 2009-01-13 09:43:24 +00:00
Amar Takhar
fcf671da96 Use 'aegisub' as the locale file name(s) versus 'aegisub21' on unix. 
Originally committed to SVN as r2688.
 2009-01-12 22:52:52 +00:00
Amar Takhar
2e4d751407 Cleanup portaudio detection. 
Originally committed to SVN as r2683.
 2009-01-12 00:20:47 +00:00
Amar Takhar
811505ee83 Fix perl compile test, char **env was missing from main, it doesn't fail 
on gcc 4.2.1 but it does with 4.3.2 (which may or not be the issues) in
any case it's correct to pass it.

Originally committed to SVN as r2681.
 2009-01-08 17:01:24 +00:00
Amar Takhar
4dc6d0eca8 Fix a duplicate _cv_ entry for ruby/perl that was stopping the AGI macro 
from detecting proper support.

Originally committed to SVN as r2678.
 2009-01-08 09:34:17 +00:00
Amar Takhar
6c41f69443 * AC_SUBST(AEGISUB_VERSION_DATA) configure.in 
* Add second argument to osx-bundle.sh ($AEGISUB_VERSION_DATA)
* Modify osx-bundle.sh to copy correct binary name.

Originally committed to SVN as r2671.
 2009-01-07 08:48:33 +00:00
Amar Takhar
954e93f638 Add desktop support as specified in http://freedesktop.org/wiki/Specifications/desktop-entry-spec . 
Originally committed to SVN as r2668.
 2009-01-07 05:27:16 +00:00
Amar Takhar
d5f5e66e33 * Split HAVE_FFMPEG into HAVE_FFMPEG / HAVE_PROVIDER_FFMPEG 
* s/HAVE_FFMPEGSOURCE/HAVE_PROVIDER_FFMPEGSOURCE/
* Add FFMPEG_CFLAGS / FFMPEG_LDFLAGS as configure env vars for FFMPEG
  detection.

Originally committed to SVN as r2664.
 2009-01-06 13:59:15 +00:00
Amar Takhar
7e764f2ab1 Remove old legacy code: don't set LUA_CFLAGS and LUA50_CFLAGS to $CPPFLAGS. 
Originally committed to SVN as r2660.
 2009-01-06 11:20:56 +00:00
Amar Takhar
675c4caa09 Add multiple version support, everything is now suffixed with MAJOR.MINOR, this 
will allow users on unix to install and operate different versions of aegisub a$
the same time.  Note: auto3 linking is broken it will be fixed in the next
commit as it's unrelated to these changes.

Originally committed to SVN as r2659.
 2009-01-06 10:44:49 +00:00
Amar Takhar
6d172232c6 Comments start with a '#' not '*'. 
Originally committed to SVN as r2655.
 2009-01-06 03:48:36 +00:00
Amar Takhar
0d84a87098 Don't traverse m4macros/ and add the files to EXTRA_DIST in ./Makefile.am for speed. 
Originally committed to SVN as r2652.
 2009-01-05 11:51:56 +00:00
Amar Takhar
15239a8409 That's '! test' not '!test'. 
Originally committed to SVN as r2649.
 2009-01-05 11:40:52 +00:00
Amar Takhar
25ca1497ab * Add support for setting the default A/V provider and audio player using 
--with-provider-(video|audio) and --with-player-audio.
* Cleanup --help alignment
* Print default values at the end of configure
* Remove :'s in end status section headings in configure.

Originally committed to SVN as r2648.
 2009-01-05 11:07:14 +00:00
Amar Takhar
bf09c76081 Remove posix dir and 'libposix' and create 'libresrc' which includes 
resources from res.rc and and future resources required.

Originally committed to SVN as r2631.
 2009-01-04 09:01:49 +00:00
Amar Takhar
0763541848 Change how configuration works. 
* move win32/config0.h -> config/config_windows0.h
  * move win32/stdint.h -> msvc/stdint.h
  * move posix/defines.h -> config/config_unix.h
  * add config.h - brings in config_(windows|unix).h as required
  * add config.h to *.cpp
  * Self-contain FFmpegSource2 with required function defines wrapped with
    __UNIX__ instead of the now removed defines.h.
  * Edit aegisub_vs2008.vcproj to remove explicit inclusion of config.h, also
    change VCPreBuildEventTool to create windows_config.h from
    windows_config0.h.  Add msvc to include path.
  * Change configure to create ./acconf.h instead of posix/acconf.h

This will allow us to create a more standard and platform agnostic way of
configuration aegsisub during build time.

Originally committed to SVN as r2621.
 2009-01-04 06:31:48 +00:00
Amar Takhar
eb328262c3 Print some useful messages at the end of configure: Install prefix, SVN 
Revision, Debug (yes+flags/no), CPPFLAGS, LDFLAGS.  Hopefully this will stop
any wonky settings from sliding in without being noticed.

Originally committed to SVN as r2620.
 2009-01-04 04:48:55 +00:00