diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-30 15:12:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-30 15:12:49 +0000 |
| commit | 5370d115419e969f09a7a69374d571d3e36f6481 (patch) | |
| tree | 410253926edaf40e1b05241ad3f16a79c752ffcb /slideshow | |
| parent | 5c6ea15c19a15f758abeccf5cb3515e211c079cc (diff) | |
| parent | 6d31c1140e3c2d6a25bd9da4e612f2977ada4e6a (diff) | |
slideshow1: merge with DEV300 m49
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx | 8 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/makefile.mk | 7 | ||||
| -rw-r--r-- | slideshow/util/makefile.mk | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx index 6c07065e2904..94ba2acb5682 100644 --- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx @@ -55,7 +55,6 @@ #include <tools/gen.hxx> #include <vcl/window.hxx> #include <vcl/syschild.hxx> -#include <vcl/sysdata.hxx> #include <boost/noncopyable.hpp> @@ -64,10 +63,16 @@ #if defined( WNT ) + #include <tools/prewin.h> + #include <windows.h> + #include <tools/postwin.h> #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF #elif defined( OS2 ) #elif defined( QUARTZ ) + #include "premac.h" + #include <Cocoa/Cocoa.h> + #include "postmac.h" #elif defined( UNX ) namespace unx { @@ -77,6 +82,7 @@ namespace unx #include <GL/glxext.h> } #endif +#include <vcl/sysdata.hxx> #ifdef DEBUG #include <boost/date_time/posix_time/posix_time.hpp> diff --git a/slideshow/source/engine/OGLTrans/makefile.mk b/slideshow/source/engine/OGLTrans/makefile.mk index 3e5f818923dc..2062b8c7d4c5 100644 --- a/slideshow/source/engine/OGLTrans/makefile.mk +++ b/slideshow/source/engine/OGLTrans/makefile.mk @@ -33,6 +33,7 @@ PRJ=..$/..$/.. PRJNAME=slideshow TARGET=OGLTrans +TARGETTYPE=GUI ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------------- @@ -58,7 +59,13 @@ DLLPRE= SHL1TARGET=$(TARGET).uno .IF "$(GUI)"=="UNX" +.IF "$(GUIBASE)"=="aqua" + SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) + OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions + CFLAGSCXX+=$(OBJCXXFLAGS) +.ELSE SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) -lGL -lGLU -lX11 +.ENDIF .ELSE SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) opengl32.lib glu32.lib gdi32.lib .ENDIF diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index 09d0363bcdb4..4b4008624c1e 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/util/makefile.mk @@ -68,7 +68,6 @@ SHL1STDLIBS= $(TOOLSLIB) \ $(CPPCANVASLIB) \ $(UNOTOOLSLIB) \ $(GOODIESLIB) \ - $(TKLIB) \ $(AVMEDIALIB) SHL1IMPLIB=i$(TARGET) |