vlc | branch: master | Felix Paul Kühne <[email protected]> | Wed Mar 21 14:00:54 2012 +0100| [4dca0e84a0ec71d3e846ba0d114335f2cf7fbdfa] | committer: Felix Paul Kühne
contrib/lua: added support for iOS > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4dca0e84a0ec71d3e846ba0d114335f2cf7fbdfa --- contrib/src/lua/lua-ios-support.patch | 25 +++++++++++++++++++++++++ contrib/src/lua/rules.mak | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/contrib/src/lua/lua-ios-support.patch b/contrib/src/lua/lua-ios-support.patch new file mode 100644 index 0000000..014a1e3 --- /dev/null +++ b/contrib/src/lua/lua-ios-support.patch @@ -0,0 +1,25 @@ +diff -ru lua/Makefile lua-f/Makefile +--- lua/Makefile 2008-08-12 02:40:48.000000000 +0200 ++++ lua-f/Makefile 2012-03-21 13:58:30.000000000 +0100 +@@ -38,7 +38,7 @@ + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + + # Convenience platforms targets. +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic linux ios macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac +diff -ru lua/src/Makefile lua-f/src/Makefile +--- lua/src/Makefile 2012-03-21 13:58:59.000000000 +0100 ++++ lua-f/src/Makefile 2012-03-21 13:57:08.000000000 +0100 +@@ -98,6 +98,9 @@ + linux: + $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl" + ++ios: ++ $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX ++ + macosx: + $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" + # use this on Mac OS X 10.3- diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak index 765f4e2..dc6d7e9 100644 --- a/contrib/src/lua/rules.mak +++ b/contrib/src/lua/rules.mak @@ -14,6 +14,9 @@ endif ifdef HAVE_MACOSX LUA_TARGET := macosx endif +ifdef HAVE_IOS +LUA_TARGET := ios +endif ifdef HAVE_WIN32 LUA_TARGET := mingw endif @@ -34,12 +37,15 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua $(APPLY) $(SRC)/lua/lua-noreadline.patch $(APPLY) $(SRC)/lua/luac-32bits.patch $(APPLY) $(SRC)/lua/no-localeconv.patch -ifdef HAVE_MACOSX +ifdef HAVE_DARWIN_OS (cd $(UNPACK_DIR) && \ sed -e 's%gcc%$(CC)%' \ -e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \ -i.orig src/Makefile) endif +ifdef HAVE_IOS + $(APPLY) $(SRC)/lua/lua-ios-support.patch +endif ifdef HAVE_WIN32 cd $(UNPACK_DIR) && sed -i.orig -e 's/lua luac/lua.exe/' Makefile endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
