diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-06 14:57:12 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-06 14:57:12 +0100 |
commit | 305315337b472eeee344c3ee174dded67da8d1af (patch) | |
tree | ea57d289a315e6a4b3b1f2ba80e8062f72dd59e5 /svtools/bmpmaker | |
parent | removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xml... (diff) | |
parent | CWS-TOOLING: integrate CWS fwk160 (diff) | |
download | core-305315337b472eeee344c3ee174dded67da8d1af.tar.gz core-305315337b472eeee344c3ee174dded67da8d1af.zip |
removetooltypes01: rebase to DEV300_m96
Diffstat (limited to 'svtools/bmpmaker')
-rw-r--r-- | svtools/bmpmaker/bmp.cxx | 2 | ||||
-rw-r--r-- | svtools/bmpmaker/makefile.mk | 74 |
2 files changed, 1 insertions, 75 deletions
diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx index 204fd404d329..43f285c1b422 100644 --- a/svtools/bmpmaker/bmp.cxx +++ b/svtools/bmpmaker/bmp.cxx @@ -41,7 +41,7 @@ using namespace std; #include <vcl/svapp.hxx> #include "svl/solar.hrc" -#include "filedlg.hxx" +#include <svtools/filedlg.hxx> #include "bmpcore.hxx" #include "bmp.hrc" diff --git a/svtools/bmpmaker/makefile.mk b/svtools/bmpmaker/makefile.mk deleted file mode 100644 index a1303343a503..000000000000 --- a/svtools/bmpmaker/makefile.mk +++ /dev/null @@ -1,74 +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=svtools -TARGET=bmp -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=true - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -OBJFILES= $(OBJ)$/bmp.obj \ - $(OBJ)$/bmpcore.obj \ - $(OBJ)$/g2g.obj \ - $(OBJ)$/bmpsum.obj - -# --- APP1TARGET --------------------------------------------------- - -APP1TARGET= $(TARGET) - -APP1STDLIBS = \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) - -APP1OBJS= $(OBJ)$/bmp.obj \ - $(OBJ)$/bmpcore.obj - -APP1BASE=0x10000000 - -# --- APP2TARGET -------------------------------------------------- - -APP2TARGET = bmpsum -APP2BASE = 0x10000000 -APP2OBJS = $(OBJ)$/bmpsum.obj - -APP2STDLIBS = $(VCLLIB) \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk |