diff options
| -rw-r--r-- | slideshow/prj/build.lst | 6 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/makefile.mk | 80 |
3 files changed, 3 insertions, 85 deletions
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst index 661682484764..4b04d5e449d1 100644 --- a/slideshow/prj/build.lst +++ b/slideshow/prj/build.lst @@ -4,10 +4,10 @@ pe slideshow\inc nmake - all pe_inc NULL pe slideshow\source\engine nmake - all pe_engine pe_inc NULL pe slideshow\source\engine\slide nmake - all pe_slide pe_inc NULL pe slideshow\source\engine\shapes nmake - all pe_shapes pe_inc NULL -pe slideshow\source\engine\OGLTrans\unx nmake - u pe_ogltrans_unx pe_inc NULL +pe slideshow\source\engine\OGLTrans\unx nmake - u pe_ogltrans_unx pe_ogltrans_mac.u pe_inc NULL pe slideshow\source\engine\OGLTrans\win nmake - w pe_ogltrans_win pe_inc NULL -pe slideshow\source\engine\OGLTrans\mac nmake - u pe_ogltrans_mac pe_inc NULL +pe slideshow\source\engine\OGLTrans\mac nmake - u pe_ogltrans_mac pe_transitions pe_inc NULL pe slideshow\source\engine\transitions nmake - all pe_transitions pe_inc NULL pe slideshow\source\engine\animationnodes nmake - all pe_animationnodes pe_inc NULL pe slideshow\source\engine\activities nmake - all pe_activities pe_inc NULL -pe slideshow\util nmake - all pe_util pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_engine NULL +pe slideshow\util nmake - all pe_util pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_ogltrans_mac.u pe_ogltrans_unx.u pe_ogltrans_win.w pe_engine NULL diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx deleted file mode 100644 index f4062d2a4092..000000000000 --- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/OGLTrans/makefile.mk b/slideshow/source/engine/OGLTrans/makefile.mk deleted file mode 100644 index dd945a06b1aa..000000000000 --- a/slideshow/source/engine/OGLTrans/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=slideshow -TARGET=OGLTrans -TARGETTYPE=GUI -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Nothing to do if we're compiling with --disable-opengl ----------- -.IF "$(ENABLE_OPENGL)" != "TRUE" -@all: - @echo "Building without OpenGL Transitions..." -.ENDIF - -# --- Common ---------------------------------------------------------- -#.IF "$(GUI)"=="UNX" - -SLOFILES = \ - $(SLO)$/OGLTrans_TransitionImpl.obj \ - $(SLO)$/OGLTrans_Shaders.obj \ - $(SLO)$/OGLTrans_TransitionerImpl.obj - -DLLPRE= -SHL1TARGET=$(TARGET).uno - -.IF "$(GUI)"=="UNX" -.IF "$(GUIBASE)"=="aqua" - SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) - 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 -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -#.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk |