diff options
| author | David Tardon <dtardon@redhat.com> | 2016-10-25 11:50:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-10-25 16:11:12 +0200 |
| commit | d8ffe6c4d60f363bc60d7d299cd138adedab22e6 (patch) | |
| tree | bd6463788268f83a70893181d5ff543760335bce /slideshow | |
| parent | e11e715628af6a58ee57538eaf69aac16dd1a560 (diff) | |
merge duplicate source file lists
Change-Id: I55c746c92a6803a67e7129c43d2acd94aa7cbf8e
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index db1c7881095c..78d7188da09b 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -38,12 +38,6 @@ $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLT ifeq ($(strip $(OS)),MACOSX) -$(eval $(call gb_Library_add_exception_objects,OGLTrans,\ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation \ -)) - $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ Cocoa \ GLUT \ @@ -51,29 +45,26 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ )) else ifeq ($(strip $(OS)),WNT) + $(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ gdi32 \ glu32 \ opengl32 \ )) -$(eval $(call gb_Library_add_exception_objects,OGLTrans,\ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation \ -)) - else -$(eval $(call gb_Library_add_exception_objects,OGLTrans,\ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation \ -)) $(eval $(call gb_Library_add_libs,OGLTrans,\ -lGL \ -lX11 \ )) + endif +$(eval $(call gb_Library_add_exception_objects,OGLTrans,\ + slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl \ + slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl \ + slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation \ +)) + # vim: set noet sw=4 ts=4: |