summaryrefslogtreecommitdiff
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-01 02:10:02 +0200
commitb53a492fa22277832671a98df366f8d4485aac9e (patch)
treeb54cd2d238264b93feeacd42f5fe01c99a7de837
parenta74555a3b54a9e49d9eff4ce874384aab00cdfb0 (diff)
use generic implementation for OSX
Change-Id: I9b82ca8bb6c1c6453bbedac2c60bec4d6a98c009
-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,\