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 | e66e25555bc9d6c95144d349235216db4420c099 (patch) | |
| tree | 078f829ca94a204fa4dfec93e0dc49aa86be9213 | |
| parent | cf4f7bd8bec78d02d5af02397961211c62692224 (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
| -rw-r--r-- | canvas/source/cairo/makefile.mk | 3 | ||||
| -rw-r--r-- | dtrans/source/aqua/makefile.mk | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/makefile.mk | 1 | ||||
| -rw-r--r-- | vcl/aqua/source/app/makefile.mk | 2 | ||||
| -rwxr-xr-x | vcl/aqua/source/window/salframeview.mm | 2 | ||||
| -rw-r--r-- | vcl/util/makefile2.pmk | 1 |
6 files changed, 3 insertions, 8 deletions
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk index b59bd904cb3a..27a1aeb6dcd7 100644 --- a/canvas/source/cairo/makefile.mk +++ b/canvas/source/cairo/makefile.mk @@ -49,7 +49,7 @@ DLLPRE = # --- X11 Mac build currently doesn't work with cairo ----------- .IF "$(OS)" == "MACOSX" && "$(GUIBASE)" == "unx" @all: - @echo "Cannot build cairocanvas with X11..." + @echo "Cannot build cairocanvas with X11..." .ENDIF .ENDIF @@ -97,7 +97,6 @@ SHL1STDLIBS+= -lcairo .IF "$(GUIBASE)"=="aqua" # native Mac OS X (Quartz) SLOFILES+= $(SLO)$/cairo_quartz_cairo.obj -OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions CFLAGSCXX+=$(OBJCXXFLAGS) .ELSE # "$(GUIBASE)"=="aqua" diff --git a/dtrans/source/aqua/makefile.mk b/dtrans/source/aqua/makefile.mk index e0b4eecf6db4..86bbbc8f7f22 100644 --- a/dtrans/source/aqua/makefile.mk +++ b/dtrans/source/aqua/makefile.mk @@ -56,7 +56,7 @@ dummy: @echo "Nothing to build for GUIBASE $(GUIBASE)" .ELSE -CFLAGSCXX+=-fconstant-cfstrings -x objective-c++ -fobjc-exceptions +CFLAGSCXX+=$(OBJCXXFLAGS) -fconstant-cfstrings SLOFILES= \ $(SLO)$/aqua_clipboard.obj \ diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk index 86953691ad27..406386c5723e 100644 --- a/toolkit/source/awt/makefile.mk +++ b/toolkit/source/awt/makefile.mk @@ -44,7 +44,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- .IF "$(GUIBASE)"=="aqua" -OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions CFLAGSCXX+=$(OBJCXXFLAGS) .ENDIF # "$(GUIBASE)"=="aqua" diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/aqua/source/app/makefile.mk index 2bf3641898f1..a90c95c74a6e 100644 --- a/vcl/aqua/source/app/makefile.mk +++ b/vcl/aqua/source/app/makefile.mk @@ -50,8 +50,6 @@ dummy: .ELSE # "$(GUIBASE)"!="aqua" -#CFLAGS+=-x objective-c++ - SLOFILES= $(SLO)$/salinst.obj \ $(SLO)$/saldata.obj \ $(SLO)$/vclnsapp.obj \ diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 4768312ab1d1..68ea2c2062f2 100755 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -1422,7 +1422,7 @@ private: return 0; } -#ifdef MAC_OS_X_VERSION_10_5 +#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) /* build target 10.5 or greater */ - (NSInteger)conversationIdentifier #else diff --git a/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk index 0e57d7aeb80b..63b2889bc15d 100644 --- a/vcl/util/makefile2.pmk +++ b/vcl/util/makefile2.pmk @@ -34,6 +34,5 @@ CDEFS += -DVCL_DLLIMPLEMENTATION VISIBILITY_HIDDEN=TRUE .IF "$(GUIBASE)"=="aqua" -OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions CFLAGSCXX+=$(OBJCXXFLAGS) .ENDIF # "$(GUIBASE)"=="aqua" |