From 3afc7558eb03b88fd6041ef9fa530651f8468191 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 26 Jan 2011 19:18:52 +0100 Subject: vcl2gnumake: #i116588# move vcl to gbuild (step 3,linux,solaris,macos) --- vcl/AllLangResTarget_vcl.mk | 54 ++++++++++++++++++++++++++++++++++++++++++ vcl/Library_vcl.mk | 23 +++++++++++++++++- vcl/Module_vcl.mk | 1 + vcl/util/vcl.component | 49 -------------------------------------- vcl/util/vcl.macosx.component | 49 -------------------------------------- vcl/util/vcl.windows.component | 40 ------------------------------- vcl/vcl.macosx.component | 49 ++++++++++++++++++++++++++++++++++++++ vcl/vcl.unx.component | 49 ++++++++++++++++++++++++++++++++++++++ vcl/vcl.windows.component | 40 +++++++++++++++++++++++++++++++ 9 files changed, 215 insertions(+), 139 deletions(-) create mode 100644 vcl/AllLangResTarget_vcl.mk delete mode 100644 vcl/util/vcl.component delete mode 100644 vcl/util/vcl.macosx.component delete mode 100644 vcl/util/vcl.windows.component create mode 100644 vcl/vcl.macosx.component create mode 100644 vcl/vcl.unx.component create mode 100644 vcl/vcl.windows.component diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk new file mode 100644 index 000000000000..9a3453af2810 --- /dev/null +++ b/vcl/AllLangResTarget_vcl.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,vcl)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,vcl,vcl)) + +$(eval $(call gb_AllLangResTarget_add_srs,vcl,\ + vcl/source/src \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src)) + +$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\ + vcl/source/src/btntext.src \ + vcl/source/src/helptext.src \ + vcl/source/src/images.src \ + vcl/source/src/menu.src \ + vcl/source/src/print.src \ + vcl/source/src/stdtext.src \ + vcl/source/src/units.src \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 487f9cce5754..8c90cb6ce165 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -27,6 +27,14 @@ $(eval $(call gb_Library_Library,vcl)) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx)) +else ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows)) +else +$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) +endif + $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) $(eval $(call gb_Library_add_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) @@ -89,7 +97,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\ $$(CXXFLAGS) \ $$(OBJCXXFLAGS) \ )) -$(eval $(call gb_Library_add_add_objcxxobjects,vcl,\ +$(eval $(call gb_Library_add_objcxxobjects,vcl,\ vcl/aqua/source/a11y/aqua11yactionwrapper \ vcl/aqua/source/a11y/aqua11ycomponentwrapper \ vcl/aqua/source/a11y/aqua11yfactory \ @@ -389,6 +397,19 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ )) endif +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + AppleRemote \ +)) +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + -framework QuickTime \ + -framework Cocoa \ + -framework Carbon \ + -framework CoreFoundation \ +)) +endif + ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,vcl,\ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 2d4306883796..db2941976270 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_vcl \ Package_inc \ StaticLibrary_vclmain \ + AllLangResTarget_vcl \ )) ifeq ($(GUIBASE),unx) diff --git a/vcl/util/vcl.component b/vcl/util/vcl.component deleted file mode 100644 index da20fc916c32..000000000000 --- a/vcl/util/vcl.component +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcl/util/vcl.macosx.component b/vcl/util/vcl.macosx.component deleted file mode 100644 index 3aabcd8c7050..000000000000 --- a/vcl/util/vcl.macosx.component +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcl/util/vcl.windows.component b/vcl/util/vcl.windows.component deleted file mode 100644 index 72f7ace9f251..000000000000 --- a/vcl/util/vcl.windows.component +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - diff --git a/vcl/vcl.macosx.component b/vcl/vcl.macosx.component new file mode 100644 index 000000000000..3aabcd8c7050 --- /dev/null +++ b/vcl/vcl.macosx.component @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcl/vcl.unx.component b/vcl/vcl.unx.component new file mode 100644 index 000000000000..da20fc916c32 --- /dev/null +++ b/vcl/vcl.unx.component @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcl/vcl.windows.component b/vcl/vcl.windows.component new file mode 100644 index 000000000000..72f7ace9f251 --- /dev/null +++ b/vcl/vcl.windows.component @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + -- cgit v1.2.3