summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-08-16 05:40:58 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-09-02 01:08:47 +0200
commitb29154d85e1c57c9001d3591a592b93032949212 (patch)
tree389eff25af0016780877ec4538704955115f0bd5 /slideshow
parent55226553174cf064833ac319ae3be5e72f055c87 (diff)
use generic implementation for OSX
Change-Id: I9b82ca8bb6c1c6453bbedac2c60bec4d6a98c009
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/Library_OGLTrans.mk12
1 files changed, 3 insertions, 9 deletions
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 80879efe429b..20596b5f7777 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -44,16 +44,10 @@ $(eval $(call gb_Library_use_externals,OGLTrans,\
$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans))
ifeq ($(strip $(OS)),MACOSX)
-$(eval $(call gb_Library_add_objcobjects,OGLTrans,\
- slideshow/source/engine/OGLTrans/mac/aquaOpenGLView \
- slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders \
- ,\
-))
-$(eval $(call gb_Library_add_objcxxobjects,OGLTrans,\
- slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl \
- slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl \
- , $(gb_LinkTarget_EXCEPTIONFLAGS) \
+$(eval $(call gb_Library_add_exception_objects,OGLTrans,\
+ slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl \
+ slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\