Kaydet (Commit) d8ffe6c4 authored tarafından David Tardon's avatar David Tardon

merge duplicate source file lists

Change-Id: I55c746c92a6803a67e7129c43d2acd94aa7cbf8e
üst e11e7156
...@@ -38,12 +38,6 @@ $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLT ...@@ -38,12 +38,6 @@ $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLT
ifeq ($(strip $(OS)),MACOSX) 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,\ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\
Cocoa \ Cocoa \
GLUT \ GLUT \
...@@ -51,29 +45,26 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ ...@@ -51,29 +45,26 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\
)) ))
else ifeq ($(strip $(OS)),WNT) else ifeq ($(strip $(OS)),WNT)
$(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ $(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\
gdi32 \ gdi32 \
glu32 \ glu32 \
opengl32 \ 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 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,\ $(eval $(call gb_Library_add_libs,OGLTrans,\
-lGL \ -lGL \
-lX11 \ -lX11 \
)) ))
endif 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: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment