aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorspiff_ <spiff_@svn>2010-05-11 21:54:28 +0000
committerspiff_ <spiff_@svn>2010-05-11 21:54:28 +0000
commitb1332f658cd01c037d8cbdea61f6c86847d82332 (patch)
treee2c8a8742154897040a87efdefdfdaf8e619215b /Makefile.in
parente9fc9c0a5f603acf5c5757bae944b1f163670321 (diff)
changed: move linux to system libass
changed: update osx libass to 0.9.9 (ticket #9196) git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30029 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 6edf702a18..be48250334 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,8 +64,8 @@ DVDPCODECS_DIRS= \
xbmc/cores/dvdplayer/Codecs \
xbmc/cores/dvdplayer/Codecs/libdvd \
xbmc/cores/dvdplayer/Codecs/libbdnav
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- DVDPCODECS_DIRS+=xbmc/lib/libass/xbmc
+ifeq ($(findstring osx,$(ARCH)),osx)
+ DVDPCODECS_DIRS+=lib/libass/xbmc
endif
PAPCODECS_DIRS= \
@@ -326,8 +326,8 @@ python: dllloader
dvdpcodecs: dllloader
$(MAKE) -C xbmc/cores/dvdplayer/Codecs
$(MAKE) -C xbmc/cores/dvdplayer/Codecs/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- $(MAKE) -C xbmc/lib/libass/xbmc
+ifeq ($(findstring osx,$(ARCH)), osx)
+ $(MAKE) -C lib/libass/xbmc
endif
eventclients:
ifeq ($(findstring osx,$(ARCH)), osx)