mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Patches by Azzy:

Browse source 
- Search for both lua and lua50 libraries (fixes building on Debian/Ubuntu)
- Fix GCC preprocessor failing on version.cpp
Also forgot changelog for last commit

Originally committed to SVN as r541.
This commit is contained in:
Niels Martin Hansen 2006-10-25 10:33:02 +00:00
parent e728c02f30
commit e75de69783
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -83,8 +83,9 @@ LIBS="$LIBS `$WXCONFIG --libs` $FREETYPE_LIBS"
AC_CHECK_LIB([m], [main]) AC_CHECK_LIB([m], [main])
AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([dl], [dlopen])
AC_CHECK_LIB([lua], [lua_call],, [AC_MSG_ERROR([lua not found.])]) AC_CHECK_HEADERS([lua.h lua50/lua.h])
AC_CHECK_LIB([lualib], [lua_tostring],, [AC_MSG_WARN([lualib not found, assuming lua 5.2])]) 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_LIB([portaudio], [Pa_Initialize],, [AC_MSG_ERROR([portaudio not found.])]) AC_CHECK_LIB([portaudio], [Pa_Initialize],, [AC_MSG_ERROR([portaudio not found.])])
AC_CHECK_LIB([avcodec], [avcodec_init]) AC_CHECK_LIB([avcodec], [avcodec_init])
AC_CHECK_LIB([avformat], [av_frac_init]) AC_CHECK_LIB([avformat], [av_frac_init])

5
core/automation.cpp
View file

@ -57,8 +57,13 @@
#endif #endif
extern "C" { extern "C" {
#ifdef HAVE_LUA50_LUA_H
#include <lua50/lualib.h>
#include <lua50/lauxlib.h>
#else
#include <lualib.h> #include <lualib.h>
#include <lauxlib.h> #include <lauxlib.h>
#endif
} }
int L_callfunc(lua_State *L, int nargs, int nresults); int L_callfunc(lua_State *L, int nargs, int nresults);

4
core/automation.h
View file

@ -34,7 +34,11 @@
// //
extern "C" { extern "C" {
#if HAVE_LUA50_LUA_H
#include <lua50/lua.h>
#else
#include <lua.h> #include <lua.h>
#endif
} }
#include <wx/wxprec.h> #include <wx/wxprec.h>

2
core/changelog.txt
View file

@ -15,6 +15,8 @@ Please visit http://aegisub.net to download latest version
- Added long-missing Edit buttons in Style Manager (jfs) - Added long-missing Edit buttons in Style Manager (jfs)
- Various fixes to better handle paths/file names with non-ANSI characters on Windows (jfs) - Various fixes to better handle paths/file names with non-ANSI characters on Windows (jfs)
o Note that this (unfortunately) doesn't affect video/audio loading, since those still depend on Avisynth, which doesn't support Unicode at all o Note that this (unfortunately) doesn't affect video/audio loading, since those still depend on Avisynth, which doesn't support Unicode at all
- Video display fixed on Linux and maybe also Mac (Azzy)
- Misc. fixes for building on Linux (Azzy)
= 1.10 beta - 2006.08.07 =========================== = 1.10 beta - 2006.08.07 ===========================

6
core/version.cpp
View file

@ -55,7 +55,9 @@
#endif #endif
#endif #endif
#define BUILD_TIMESTAMP _T(__DATE__) _T(" ") _T(__TIME__) #define _T_rec(X) _T(X)
#define BUILD_TIMESTAMP _T_rec(__DATE__) _T(" ") _T_rec(__TIME__)
// If the BUILD_SVN_REVISION happens to be negative, the build is assumed to be a public-release build (ie. not prerel) // If the BUILD_SVN_REVISION happens to be negative, the build is assumed to be a public-release build (ie. not prerel)
// So manually edit build/svn-revision.h to match that, when doing such a build, or add some other magic to do that. // So manually edit build/svn-revision.h to match that, when doing such a build, or add some other magic to do that.
@ -86,7 +88,7 @@ struct VersionInfoStruct {
#endif #endif
SvnRev = BUILD_SVN_REVISION; SvnRev = BUILD_SVN_REVISION;
BuildTime = BUILD_TIMESTAMP; BuildTime = BUILD_TIMESTAMP;
BuildCredit = _T(BUILD_CREDIT); BuildCredit = _T_rec(BUILD_CREDIT);
if (SvnRev > 0) if (SvnRev > 0)
SCMStr = wxString::Format(_T("SVN r%d"), SvnRev); SCMStr = wxString::Format(_T("SVN r%d"), SvnRev);