diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 14:49:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 14:49:32 +0000 |
| commit | 259f5785aada7d4949609f1743359cd1f4a8349d (patch) | |
| tree | 1f1d05d667dfb2357981d8f448dbcf2191528345 /fpicker | |
| parent | 12b90f8abac726043a9db0f3a970dda7ecc716a5 (diff) | |
CWS-TOOLING: integrate CWS cloph13
2009-09-01 #i104566# also use syslibroot/isysroot for external components
2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS
2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags)
2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility
use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches
ignore "-isysroot /Developer/..." arguments for OOo's cpp
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/makefile.mk | 3 | ||||
| -rw-r--r-- | fpicker/util/makefile.pmk | 35 |
2 files changed, 1 insertions, 37 deletions
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk index cd52ddfb6c9f..e6a8247480c9 100644 --- a/fpicker/source/aqua/makefile.mk +++ b/fpicker/source/aqua/makefile.mk @@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk DLLPRE= @@ -52,7 +51,7 @@ dummy: @echo "Nothing to build. GUIBASE == $(GUIBASE)" .ELSE # we build for aqua - +CFLAGSCXX+=$(OBJCXXFLAGS) # --- Files -------------------------------------------------------- diff --git a/fpicker/util/makefile.pmk b/fpicker/util/makefile.pmk deleted file mode 100644 index 15e00b88eda4..000000000000 --- a/fpicker/util/makefile.pmk +++ /dev/null @@ -1,35 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.pmk,v $ -# -# $Revision: 1.3 $ -# -# 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. -# -#************************************************************************* - -.IF "$(GUIBASE)"=="aqua" -OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions -CFLAGSCXX+=$(OBJCXXFLAGS) -.ENDIF # "$(GUIBASE)"=="aqua" |