diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-10 14:55:33 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-10 14:59:40 +0200 |
| commit | 6312695ad694598951f2cdd4ac26c53457fedb79 (patch) | |
| tree | 8a441057feb4b5291fb9baca410035c44b3df147 /slideshow/Library_OGLTrans.mk | |
| parent | dcd974c3ca70065ba1d984ad6bd5514848cd58a9 (diff) | |
The "unx" and "win" OGLTrans_Shaders.cxx files were effectively identical
Just some OSL_TRACE/SAL_INFO changes in the "unx" one. And it isn't
like the "win" one would actually compile for Windows as is anyway, as
it unconditionally uses glX stuff. So certainly it is better to have
just one copy, and if we want to make the OpenGL transitions build on
Windows then add ifdefs for Windows to it.
Change-Id: If6887e24a0fc03c7e0e77f003d08feb51c264f30
Diffstat (limited to 'slideshow/Library_OGLTrans.mk')
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index bae4d99946f8..44db60bdf289 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -86,7 +86,7 @@ $(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ )) $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ - slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders \ + slideshow/source/engine/OGLTrans/unx/OGLTrans_Shaders \ slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl \ slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl \ )) |