diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:07:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:16:59 +0200 |
| commit | e103887c8c158e7059a586ef5a5f7b234c547dfe (patch) | |
| tree | 6cbcabd6d270e595578cc283afadd5b4023bd718 /slideshow | |
| parent | 4d23222b15ac0034e265441c71405a48403721f8 (diff) | |
QUARTZ is equivalent to MACOSX
So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.
Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx index fdf575d94faf..f9186bd8476e 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx @@ -28,7 +28,7 @@ #include "OGLTrans_TransitionImpl.hxx" #include "OGLTrans_Shaders.hxx" -#ifdef QUARTZ +#ifdef MACOSX #include <OpenGL/gl.h> #else #include <GL/gl.h> diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx index 9ad9fb05d1b0..b61e73ae5f69 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx @@ -32,14 +32,14 @@ #include <basegfx/vector/b3dvector.hxx> #if defined( WNT ) -#elif defined( QUARTZ ) +#elif defined( MACOSX ) #include <OpenGL/gl.h> -#elif defined( UNX ) && !defined( QUARTZ ) +#elif defined( UNX ) && !defined( MACOSX ) #endif #include <vector> -#if !defined( QUARTZ ) +#if !defined( MACOSX ) #include <GL/gl.h> #endif |