diff options
| author | davilla <davilla@xbmc.org> | 2012-12-01 15:04:27 -0800 |
|---|---|---|
| committer | davilla <davilla@xbmc.org> | 2012-12-01 15:04:27 -0800 |
| commit | baab54b1e9fdbc217092e8b7ab43eda9b8ab9290 (patch) | |
| tree | f8b5abc3e9ac86e0020592b5ba95f04583e73d01 | |
| parent | 376040713b2e645b914bf62130272d776cf5d521 (diff) | |
| parent | b9227ef6e0ae8bea0cecd6958910f7d69d97c1ba (diff) | |
Merge pull request #1871 from amet/screensavers
[fix] Screensavers on OSX
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | tools/darwin/depends/libpng/Makefile | 2 | ||||
| -rw-r--r-- | tools/darwin/depends/libsdl_image/Makefile | 2 | ||||
| -rw-r--r-- | tools/darwin/depends/xbmc/Makefile | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/configure.in b/configure.in index beb58c1cb3..554c9ba154 100644 --- a/configure.in +++ b/configure.in @@ -2714,10 +2714,15 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ ], [$DISABLE_GOOM]) XB_CONFIG_MODULE([xbmc/screensavers/rsxs-0.9/], [ + if test "$host_vendor" = "apple"; then + TEMPCFLAGS="${CFLAGS} -fgnu89-inline"; + else + TEMPCFLAGS="$CFLAGS"; + fi ./configure \ CC="$CC" \ CXX="$CXX" \ - CFLAGS="$CFLAGS" \ + CFLAGS="$TEMPCFLAGS" \ CXXFLAGS="$CXXFLAGS" \ `if test "$host_vendor" = "apple"; then echo --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib; fi` \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ diff --git a/tools/darwin/depends/libpng/Makefile b/tools/darwin/depends/libpng/Makefile index 7edef1eaf8..486b9f53b3 100644 --- a/tools/darwin/depends/libpng/Makefile +++ b/tools/darwin/depends/libpng/Makefile @@ -2,7 +2,7 @@ include ../Makefile.include # lib name, version LIBNAME=libpng -VERSION=1.2.38 +VERSION=1.5.13 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz diff --git a/tools/darwin/depends/libsdl_image/Makefile b/tools/darwin/depends/libsdl_image/Makefile index 71ad5d4a35..980838fcac 100644 --- a/tools/darwin/depends/libsdl_image/Makefile +++ b/tools/darwin/depends/libsdl_image/Makefile @@ -2,7 +2,7 @@ include ../Makefile.include # lib name, version LIBNAME=SDL_image -VERSION=1.2.7 +VERSION=1.2.12 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz diff --git a/tools/darwin/depends/xbmc/Makefile b/tools/darwin/depends/xbmc/Makefile index 10095f1578..36c3c81bdb 100644 --- a/tools/darwin/depends/xbmc/Makefile +++ b/tools/darwin/depends/xbmc/Makefile @@ -14,7 +14,6 @@ export PATH:=$(TOOLCHAIN)/bin:$(PREFIX)/bin:$(PATH) CONFIGURE=./configure --prefix=$(PREFIX) \ --enable-upnp \ --enable-gtest \ - --disable-rsxs \ PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ PYTHON=$(PREFIX)/bin/python |