Repository.mk | 14 - scp2/InstallModule_canvas.mk | 24 - scp2/InstallScript_setup_osl.mk | 1 scp2/Module_scp2.mk | 1 scp2/source/canvas/cairocanvas.scp | 21 - scp2/source/canvas/canvascommons.scp | 22 - scp2/source/canvas/directxcanvas.scp | 24 - scp2/source/canvas/mtfrenderer.scp | 11 scp2/source/canvas/vclcanvas.scp | 21 - scp2/source/ooo/module_hidden_ooo.scp | 5 solenv/gbuild/platform/WNT_INTEL_GCC.mk | 386 ----------------------------- solenv/gbuild/platform/WNT_X86_64_GCC.mk | 390 ----------------------------- solenv/gbuild/platform/mingw.mk | 406 +++++++++++++++++++++++++++++++ 13 files changed, 416 insertions(+), 910 deletions(-)
New commits: commit 66558cc3783fd1645661043901a4eee371c95de9 Author: Matúš Kukan <[email protected]> Date: Sun Jun 9 23:22:22 2013 +0200 gbuild/platform: factor out common code for mingw cross-compilation Change-Id: Iaad3f195438369dc5d3d947995d60351bf39538c diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 5b28abf..7fec33c 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -21,395 +21,11 @@ gb_COMPILERDEFAULTOPTFLAGS := -Os gb_CPUDEFS := -D_M_IX86 gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp) -gb_PROGRAMDIRNAME := program - # please make generic modifications to either of these include $(GBUILDDIR)/platform/com_GCC_defs.mk include $(GBUILDDIR)/platform/windows.mk -gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \ - '{ print $$1*10000+$$2*100+$$3 }') -gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700) - -gb_RC := $(WINDRES) - -gb_COMPILERDEFS += \ - -D_MT \ - -D_NATIVE_WCHAR_T_DEFINED \ - -D_MSC_EXTENSIONS \ - -D_FORCENAMELESSUNION \ - -# Until GCC 4.6, MinGW used __cdecl by default, and BOOST_MEM_FN_ENABLE_CDECL -# would result in ambiguous calls to overloaded boost::bind; since GCC 4.7, -# MinGW uses __thiscall by default, so now needs BOOST_MEM_FN_ENABLE_CDECL for -# uses of boost::bind with functions annotated with SAL_CALL: -ifeq ($(gb_GccLess470),0) -gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL -endif - -gb_RCDEFS := \ - -DWINVER=0x0400 \ - -DWIN32 \ - -gb_RCFLAGS := - -gb_CFLAGS += \ - $(gb_CFLAGS_COMMON) \ - -Wdeclaration-after-statement \ - -fno-strict-aliasing \ - -# For -Wno-non-virtual-dtor see <http://markmail.org/message/664jsoqe6n6smy3b> -# "Re: [dev] warnings01: -Wnon-virtual-dtor" message to [email protected] from -# Feb 1, 2006: -gb_CXXFLAGS := \ - $(gb_CXXFLAGS_COMMON) \ - -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor \ - -Wreturn-type \ - -Wshadow \ - -Wuninitialized \ - -fno-strict-aliasing \ - - -ifneq ($(SYSBASE),) -gb_CXXFLAGS += --sysroot=$(SYSBASE) -gb_CFLAGS += --sysroot=$(SYSBASE) -endif - -ifeq ($(HAVE_CXX0X),TRUE) -gb_CXXFLAGS += -std=gnu++0x -endif - -# At least sal defines its own __main, which would cause DLLs linking against -# sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o: -gb_LinkTarget_LDFLAGS := \ - -Wl,--export-all-symbols \ - -Wl,--exclude-symbols,__main \ - -Wl,--enable-stdcall-fixup \ - -Wl,--enable-runtime-pseudo-reloc-v2 \ - $(SOLARLIB) \ - -ifeq ($(MINGW_GCCLIB_EH),YES) -gb_LinkTarget_LDFLAGS += -shared-libgcc -endif - -gb_STDLIBS := \ - -lmingwthrd \ - -lmingw32 \ - -lmingwex \ - -gb_DEBUG_CFLAGS := -g -fno-inline - -# LinkTarget class - -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) -gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) - -ifeq ($(gb_SYMBOL),$(true)) -gb_LinkTarget_CXXFLAGS += $(GGDB2) -gb_LinkTarget_CFLAGS += $(GGDB2) -endif - -gb_LinkTarget_INCLUDE +=\ - $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \ - -define gb_LinkTarget__command_dynamiclinkexecutable -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ - $(gb_Executable_TARGETTYPEFLAGS) \ - $(if $(filter YES,$(TARGETGUI)), -mwindows, -mconsole) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(NATIVERES) \ - $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ - $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ - $(LIBS) \ - -Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \ - -o $(1))) -endef - -define gb_LinkTarget__command_dynamiclinklibrary -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ - $(gb_Library_TARGETTYPEFLAGS) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(NATIVERES) \ - $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ - $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ - $(LIBS) \ - -Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \ - -Wl$(COMMA)--out-implib$(COMMA)$(1) \ - -o $(dir $(1))/$(notdir $(DLLTARGET))) \ - $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -endef - -define gb_LinkTarget__command_staticlinklibrary -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - rm -f $(1) && \ - $(gb_AR) -rsu $(1) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -endef - -define gb_LinkTarget__command -$(call gb_Output_announce,$(2),$(true),LNK,4) -$(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2))) -$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinklibrary,$(1),$(2))) -$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1))) -endef - -define gb_LinkTarget_use_system_win32_libs -$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),-l$(patsubst oldnames,moldname,$(lib)))) -endef - - -# Library class - -gb_Library_DEFS := -D_DLL -gb_Library_TARGETTYPEFLAGS := -shared -gb_Library_get_rpath := - -gb_Library_SYSPRE := lib -gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ -gb_Library_UDK_MAJORVER := 3 - -gb_Library_PLAINEXT := .dll.a - -gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) -gb_Library_RTVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTEXT) -gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) -gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT) - -gb_Library_DLLEXT := .dll - -gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT) -gb_Library_RTVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTDLLEXT) -gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT) -gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT) -gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT) - -gb_Library_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ - -gb_Library_FILENAMES :=\ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ - - -gb_Library_DLLFILENAMES :=\ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \ - $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ - -gb_Library_IARCSYSPRE := lib -gb_Library_IARCEXT := .a - -gb_Library_ILIBEXT := .lib - -define gb_Library_Library_platform -$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) - -$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir - -$(call gb_Library_add_auxtargets,$(1), \ - $(OUTDIR)/bin/$(notdir $(3)) \ - $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.map,$(3))) \ -) - -$(call gb_Library_add_default_nativeres,$(1),$(1)/default) - -endef - -define gb_Library_add_default_nativeres -$(call gb_WinResTarget_WinResTarget_init,$(2)) -$(call gb_WinResTarget_set_rcfile,$(2),include/default) -$(call gb_WinResTarget_add_defs,$(2),\ - -DVERVARIANT="$(LIBO_VERSION_PATCH)" \ - -DRES_APP_VENDOR="$(OOO_VENDOR)" \ - -DADDITIONAL_VERINFO1="" \ - -DADDITIONAL_VERINFO2="" \ - -DADDITIONAL_VERINFO3="" \ -) -$(call gb_Library_add_nativeres,$(1),$(2)) -$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2)) - -endef - -define gb_LinkTarget_add_nativeres -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) -$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2)) - -endef - -define gb_LinkTarget_set_nativeres -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) -$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) - -endef - -define gb_Library_get_dllname -$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) -endef - -# Executable class - -gb_Executable_EXT := .exe -gb_Executable_TARGETTYPEFLAGS := -gb_Executable_get_rpath := - -define gb_Executable_Executable_platform -$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI := -endef - -# CppunitTest class - -gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) -gb_CppunitTest_SYSPRE := itest_ -gb_CppunitTest_EXT := .lib -gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) -gb_CppunitTest_get_libfilename = test_$(1).dll - -define gb_CppunitTest_CppunitTest_platform -$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) - -$(call gb_LinkTarget_add_auxtargets,$(2),\ - $(3) \ - $(patsubst %.dll,%.map,$(3)) \ -) - -endef - -# WinResTarget class - -gb_WinResTarget_POSTFIX :=.o - -define gb_WinResTarget__command -$(call gb_Output_announce,$(2),$(true),RC ,3) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_RC) \ - $(DEFS) $(FLAGS) \ - $(INCLUDE) \ - -o $(1) \ - $(RCFILE) ) -endef - -gb_WinResTarget_WinResTarget_platform := - -$(eval $(call gb_Helper_make_dep_targets,\ - WinResTarget \ -)) - -ifeq ($(gb_FULLDEPS),$(true)) -gb_WinResTarget__command_target = $(OUTDIR_FOR_BUILD)/bin/makedepend -define gb_WinResTarget__command_dep -$(call gb_Output_announce,RC:$(2),$(true),DEP,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(OUTDIR_FOR_BUILD)/bin/makedepend \ - $(INCLUDE) \ - $(DEFS) \ - $(RCFILE) \ - -o .res \ - -p $(dir $(3)) \ - -f $(1)) -endef -else -gb_WinResTarget__command_target = -gb_WinResTarget__command_dep = -endif - -# InstallModuleTarget class - -define gb_InstallModuleTarget_InstallModuleTarget_platform -$(call gb_InstallModuleTarget_add_defs,$(1),\ - $(gb_CPUDEFS) \ - $(gb_OSDEFS) \ - -DCOMID=gcc3 \ - -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ -) - -endef - -# InstallScript class - -gb_InstallScript_EXT := .inf - -# CliAssemblyTarget class - -gb_CliAssemblyTarget_POLICYEXT := -gb_CliAssemblyTarget_get_dll := - -# Extension class - -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt - -# UnpackedTarget class - -gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) - -# UnoApiHeadersTarget class - -ifeq ($(DISABLE_DYNLOADING),TRUE) -gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) -else -gb_UnoApiHeadersTarget_select_variant = $(2) -endif - -# Package class -gb_Package_PROGRAMDIRNAME := program -gb_Package_SDKDIRNAME := sdk - -# UIMenubarTarget class - -define gb_UIMenubarTarget__command -$(call gb_Output_announce,$(2),$(true),UIM,1) -cp $(3) $(1) - -endef - -gb_UIMenubarTarget_UIMenubarTarget_platform := - -# Python -gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" +include $(GBUILDDIR)/platform/mingw.mk include $(GBUILDDIR)/platform/com_GCC_class.mk diff --git a/solenv/gbuild/platform/WNT_X86_64_GCC.mk b/solenv/gbuild/platform/WNT_X86_64_GCC.mk index 6ccbc48..4466b05 100644 --- a/solenv/gbuild/platform/WNT_X86_64_GCC.mk +++ b/solenv/gbuild/platform/WNT_X86_64_GCC.mk @@ -21,398 +21,12 @@ gb_COMPILERDEFAULTOPTFLAGS := -Os gb_CPUDEFS := -D_M_AMD64 gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp) -gb_PROGRAMDIRNAME := program - # please make generic modifications to either of these include $(GBUILDDIR)/platform/com_GCC_defs.mk include $(GBUILDDIR)/platform/windows.mk -gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \ - '{ print $$1*10000+$$2*100+$$3 }') -gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700) - -gb_RC := $(WINDRES) - -gb_COMPILERDEFS += \ - -D_MT \ - -D_NATIVE_WCHAR_T_DEFINED \ - -D_MSC_EXTENSIONS \ - -D_FORCENAMELESSUNION \ - -gb_RCDEFS := \ - -DWINVER=0x0400 \ - -DWIN32 \ - -DWIN64 - -gb_RCFLAGS := - -gb_CFLAGS += \ - $(gb_CFLAGS_COMMON) \ - -Wdeclaration-after-statement \ - -fno-strict-aliasing \ - -# For -Wno-non-virtual-dtor see <http://markmail.org/message/664jsoqe6n6smy3b> -# "Re: [dev] warnings01: -Wnon-virtual-dtor" message to [email protected] from -# Feb 1, 2006: -gb_CXXFLAGS := \ - $(gb_CXXFLAGS_COMMON) \ - -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor \ - -Wreturn-type \ - -Wshadow \ - -Wuninitialized \ - -fno-strict-aliasing \ - - -ifneq ($(SYSBASE),) -gb_CXXFLAGS += --sysroot=$(SYSBASE) -gb_CFLAGS += --sysroot=$(SYSBASE) -endif - -ifeq ($(HAVE_CXX0X),TRUE) -gb_CXXFLAGS += -std=gnu++0x -endif - -# At least sal defines its own __main, which would cause DLLs linking against -# sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o: -gb_LinkTarget_LDFLAGS := \ - -Wl,--export-all-symbols \ - -Wl,--exclude-symbols,__main \ - -Wl,--enable-stdcall-fixup \ - -Wl,--enable-runtime-pseudo-reloc-v2 \ - $(SOLARLIB) \ - -ifeq ($(MINGW_GCCLIB_EH),YES) -gb_LinkTarget_LDFLAGS += -shared-libgcc -endif - -gb_STDLIBS := \ - -lmingwthrd \ - -lmingw32 \ - -lmingwex \ - -gb_DEBUG_CFLAGS := -g -fno-inline - -# LinkTarget class - -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) -gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) - -ifeq ($(gb_SYMBOL),$(true)) -gb_LinkTarget_CXXFLAGS += $(GGDB2) -gb_LinkTarget_CFLAGS += $(GGDB2) -endif - -gb_LinkTarget_INCLUDE +=\ - $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \ - -define gb_LinkTarget__command_dynamiclinkexecutable -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ - $(gb_Executable_TARGETTYPEFLAGS) \ - $(if $(filter YES,$(TARGETGUI)), -mwindows, -mconsole) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(NATIVERES) \ - $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ - $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ - $(LIBS) \ - -Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \ - -o $(1))) -endef - -define gb_LinkTarget__command_dynamiclinklibrary -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ - $(gb_Library_TARGETTYPEFLAGS) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(NATIVERES) \ - $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ - $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ - $(LIBS) \ - -Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \ - -Wl$(COMMA)--out-implib$(COMMA)$(1) \ - -o $(dir $(1))/$(notdir $(DLLTARGET))) \ - $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -endef - -define gb_LinkTarget__command_staticlinklibrary -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - rm -f $(1) && \ - $(gb_AR) -rsu $(1) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -endef - -define gb_LinkTarget__command -$(call gb_Output_announce,$(2),$(true),LNK,4) -$(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2))) -$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinklibrary,$(1),$(2))) -$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1))) -endef - -define gb_LinkTarget_use_system_win32_libs -$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),-l$(patsubst oldnames,moldname,$(lib)))) -endef - - -# Library class - -gb_Library_DEFS := -D_DLL -gb_Library_TARGETTYPEFLAGS := -shared -gb_Library_get_rpath := - -gb_Library_SYSPRE := lib -gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ -gb_Library_UDK_MAJORVER := 3 - -gb_Library_PLAINEXT := .dll.a - -gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) -gb_Library_RTVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTEXT) -gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) -gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT) - -gb_Library_DLLEXT := .dll - -gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT) -gb_Library_RTVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTDLLEXT) -gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT) -gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT) -gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT) - -gb_Library_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ - -gb_Library_FILENAMES :=\ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ - - -gb_Library_DLLFILENAMES :=\ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \ - $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ - -gb_Library_IARCSYSPRE := lib -gb_Library_IARCEXT := .a - -gb_Library_ILIBEXT := .lib - -define gb_Library_Library_platform -$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) - -$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir - -$(call gb_Library_add_auxtargets,$(1), \ - $(OUTDIR)/bin/$(notdir $(3)) \ - $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.map,$(3))) \ -) - -$(call gb_Library_add_default_nativeres,$(1),$(1)/default) - -endef - -define gb_Library_add_default_nativeres -$(call gb_WinResTarget_WinResTarget_init,$(2)) -$(call gb_WinResTarget_set_rcfile,$(2),include/default) -$(call gb_WinResTarget_add_defs,$(2),\ - -DVERVARIANT="$(LIBO_VERSION_PATCH)" \ - -DRES_APP_VENDOR="$(OOO_VENDOR)" \ - -DADDITIONAL_VERINFO1="" \ - -DADDITIONAL_VERINFO2="" \ - -DADDITIONAL_VERINFO3="" \ -) -$(call gb_Library_add_nativeres,$(1),$(2)) -$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2)) - -endef - -define gb_LinkTarget_add_nativeres -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) -$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2)) - -endef - -define gb_LinkTarget_set_nativeres -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) -$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) - -endef - -define gb_Library_get_dllname -$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) -endef - -# StaticLibrary class - -gb_StaticLibrary_SYSPRE := lib -gb_StaticLibrary_PLAINEXT := .a - -gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ - -gb_StaticLibrary_StaticLibrary_platform = - -# Executable class - -gb_Executable_EXT := .exe -gb_Executable_TARGETTYPEFLAGS := -gb_Executable_get_rpath := - -define gb_Executable_Executable_platform -$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI := -endef - -# CppunitTest class - -gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) -gb_CppunitTest_SYSPRE := itest_ -gb_CppunitTest_EXT := .lib -gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) -gb_CppunitTest_get_libfilename = test_$(1).dll - -define gb_CppunitTest_CppunitTest_platform -$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) - -$(call gb_LinkTarget_add_auxtargets,$(2),\ - $(3) \ - $(patsubst %.dll,%.map,$(3)) \ -) - -endef - -# WinResTarget class - -gb_WinResTarget_POSTFIX :=.o - -define gb_WinResTarget__command -$(call gb_Output_announce,$(2),$(true),RC ,3) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_RC) \ - $(DEFS) $(FLAGS) \ - $(INCLUDE) \ - -o $(1) \ - $(RCFILE) ) -endef - -gb_WinResTarget_WinResTarget_platform := - -$(eval $(call gb_Helper_make_dep_targets,\ - WinResTarget \ -)) - -ifeq ($(gb_FULLDEPS),$(true)) -gb_WinResTarget__command_target = $(OUTDIR_FOR_BUILD)/bin/makedepend -define gb_WinResTarget__command_dep -$(call gb_Output_announce,RC:$(2),$(true),DEP,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(OUTDIR_FOR_BUILD)/bin/makedepend \ - $(INCLUDE) \ - $(DEFS) \ - $(RCFILE) \ - -o .res \ - -p $(dir $(3)) \ - -f $(1)) -endef -else -gb_WinResTarget__command_target = -gb_WinResTarget__command_dep = -endif - -# InstallModuleTarget class - -define gb_InstallModuleTarget_InstallModuleTarget_platform -$(call gb_InstallModuleTarget_add_defs,$(1),\ - $(gb_CPUDEFS) \ - $(gb_OSDEFS) \ - -DCOMID=gcc3 \ - -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ -) - -endef - -# InstallScript class - -gb_InstallScript_EXT := .inf - -# CliAssemblyTarget class - -gb_CliAssemblyTarget_POLICYEXT := -gb_CliAssemblyTarget_get_dll := - -# ExtensionTarget class - -gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt - -# UnpackedTarget class - -gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) - -# UnoApiHeadersTarget class - -ifeq ($(DISABLE_DYNLOADING),TRUE) -gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) -else -gb_UnoApiHeadersTarget_select_variant = $(2) -endif - -# Package class -gb_Package_PROGRAMDIRNAME := program -gb_Package_SDKDIRNAME := sdk - -# UIMenubarTarget class - -define gb_UIMenubarTarget__command -$(call gb_Output_announce,$(2),$(true),UIM,1) -cp $(3) $(1) - -endef - -gb_UIMenubarTarget_UIMenubarTarget_platform := - -# Python -gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" +include $(GBUILDDIR)/platform/mingw.mk +gb_RCDEFS += -DWIN64 include $(GBUILDDIR)/platform/com_GCC_class.mk diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk new file mode 100644 index 0000000..7a81b93 --- /dev/null +++ b/solenv/gbuild/platform/mingw.mk @@ -0,0 +1,406 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + +gb_PROGRAMDIRNAME := program + +gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \ + '{ print $$1*10000+$$2*100+$$3 }') +gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700) + +gb_RC := $(WINDRES) + +gb_COMPILERDEFS += \ + -D_MT \ + -D_NATIVE_WCHAR_T_DEFINED \ + -D_MSC_EXTENSIONS \ + -D_FORCENAMELESSUNION \ + +# Until GCC 4.6, MinGW used __cdecl by default, and BOOST_MEM_FN_ENABLE_CDECL +# would result in ambiguous calls to overloaded boost::bind; since GCC 4.7, +# MinGW uses __thiscall by default, so now needs BOOST_MEM_FN_ENABLE_CDECL for +# uses of boost::bind with functions annotated with SAL_CALL: +ifeq ($(gb_GccLess470),0) +gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL +endif + +gb_RCDEFS := \ + -DWINVER=0x0400 \ + -DWIN32 \ + +gb_RCFLAGS := + +gb_CFLAGS += \ + $(gb_CFLAGS_COMMON) \ + -Wdeclaration-after-statement \ + -fno-strict-aliasing \ + +# For -Wno-non-virtual-dtor see <http://markmail.org/message/664jsoqe6n6smy3b> +# "Re: [dev] warnings01: -Wnon-virtual-dtor" message to [email protected] from +# Feb 1, 2006: +gb_CXXFLAGS := \ + $(gb_CXXFLAGS_COMMON) \ + -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor \ + -Wreturn-type \ + -Wshadow \ + -Wuninitialized \ + -fno-strict-aliasing \ + + +ifneq ($(SYSBASE),) +gb_CXXFLAGS += --sysroot=$(SYSBASE) +gb_CFLAGS += --sysroot=$(SYSBASE) +endif + +ifeq ($(HAVE_CXX0X),TRUE) +gb_CXXFLAGS += -std=gnu++0x +endif + +# At least sal defines its own __main, which would cause DLLs linking against +# sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o: +gb_LinkTarget_LDFLAGS := \ + -Wl,--export-all-symbols \ + -Wl,--exclude-symbols,__main \ + -Wl,--enable-stdcall-fixup \ + -Wl,--enable-runtime-pseudo-reloc-v2 \ + $(SOLARLIB) \ + +ifeq ($(MINGW_GCCLIB_EH),YES) +gb_LinkTarget_LDFLAGS += -shared-libgcc +endif + +gb_STDLIBS := \ + -lmingwthrd \ + -lmingw32 \ + -lmingwex \ + +gb_DEBUG_CFLAGS := -g -fno-inline + +# LinkTarget class + +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) +gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) + +ifeq ($(gb_SYMBOL),$(true)) +gb_LinkTarget_CXXFLAGS += $(GGDB2) +gb_LinkTarget_CFLAGS += $(GGDB2) +endif + +gb_LinkTarget_INCLUDE +=\ + $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \ + +define gb_LinkTarget__command_dynamiclinkexecutable +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ + $(gb_Executable_TARGETTYPEFLAGS) \ + $(if $(filter YES,$(TARGETGUI)), -mwindows, -mconsole) \ + $(T_LDFLAGS) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ + $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ + $(NATIVERES) \ + $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ + $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ + $(LIBS) \ + -Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \ + -o $(1))) +endef + +define gb_LinkTarget__command_dynamiclinklibrary +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ + $(gb_Library_TARGETTYPEFLAGS) \ + $(T_LDFLAGS) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ + $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ + $(NATIVERES) \ + $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ + $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ + $(LIBS) \ + -Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \ + -Wl$(COMMA)--out-implib$(COMMA)$(1) \ + -o $(dir $(1))/$(notdir $(DLLTARGET))) \ + $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) +endef + +define gb_LinkTarget__command_staticlinklibrary +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + rm -f $(1) && \ + $(gb_AR) -rsu $(1) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ + $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) +endef + +define gb_LinkTarget__command +$(call gb_Output_announce,$(2),$(true),LNK,4) +$(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2))) +$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinklibrary,$(1),$(2))) +$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1))) +endef + +define gb_LinkTarget_use_system_win32_libs +$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),-l$(patsubst oldnames,moldname,$(lib)))) +endef + + +# Library class + +gb_Library_DEFS := -D_DLL +gb_Library_TARGETTYPEFLAGS := -shared +gb_Library_get_rpath := + +gb_Library_SYSPRE := lib +gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ +gb_Library_UDK_MAJORVER := 3 + +gb_Library_PLAINEXT := .dll.a + +gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) +gb_Library_RTVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTEXT) +gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) +gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) +gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT) + +gb_Library_DLLEXT := .dll + +gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT) +gb_Library_RTVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTDLLEXT) +gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT) +gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT) +gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT) + +gb_Library_LAYER := \ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ + $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ + $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ + +gb_Library_FILENAMES :=\ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ + $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ + + +gb_Library_DLLFILENAMES :=\ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \ + $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \ + $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ + +gb_Library_IARCSYSPRE := lib +gb_Library_IARCEXT := .a + +gb_Library_ILIBEXT := .lib + +define gb_Library_Library_platform +$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) + +$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir + +$(call gb_Library_add_auxtargets,$(1), \ + $(OUTDIR)/bin/$(notdir $(3)) \ + $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.map,$(3))) \ +) + +$(call gb_Library_add_default_nativeres,$(1),$(1)/default) + +endef + +define gb_Library_add_default_nativeres +$(call gb_WinResTarget_WinResTarget_init,$(2)) +$(call gb_WinResTarget_set_rcfile,$(2),include/default) +$(call gb_WinResTarget_add_defs,$(2),\ + -DVERVARIANT="$(LIBO_VERSION_PATCH)" \ + -DRES_APP_VENDOR="$(OOO_VENDOR)" \ + -DADDITIONAL_VERINFO1="" \ + -DADDITIONAL_VERINFO2="" \ + -DADDITIONAL_VERINFO3="" \ +) +$(call gb_Library_add_nativeres,$(1),$(2)) +$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2)) + +endef + +define gb_LinkTarget_add_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2)) + +endef + +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + +define gb_Library_get_dllname +$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) +endef + +# Executable class + +gb_Executable_EXT := .exe +gb_Executable_TARGETTYPEFLAGS := +gb_Executable_get_rpath := + +define gb_Executable_Executable_platform +$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI := +endef + +# CppunitTest class + +gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) +gb_CppunitTest_SYSPRE := itest_ +gb_CppunitTest_EXT := .lib +gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) +gb_CppunitTest_get_libfilename = test_$(1).dll + +define gb_CppunitTest_CppunitTest_platform +$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) + +$(call gb_LinkTarget_add_auxtargets,$(2),\ + $(3) \ + $(patsubst %.dll,%.map,$(3)) \ +) + +endef + +# WinResTarget class + +gb_WinResTarget_POSTFIX :=.o + +define gb_WinResTarget__command +$(call gb_Output_announce,$(2),$(true),RC ,3) +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(gb_RC) \ + $(DEFS) $(FLAGS) \ + $(INCLUDE) \ + -o $(1) \ + $(RCFILE) ) +endef + +gb_WinResTarget_WinResTarget_platform := + +$(eval $(call gb_Helper_make_dep_targets,\ + WinResTarget \ +)) + +ifeq ($(gb_FULLDEPS),$(true)) +gb_WinResTarget__command_target = $(OUTDIR_FOR_BUILD)/bin/makedepend +define gb_WinResTarget__command_dep +$(call gb_Output_announce,RC:$(2),$(true),DEP,1) +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(OUTDIR_FOR_BUILD)/bin/makedepend \ + $(INCLUDE) \ + $(DEFS) \ + $(RCFILE) \ + -o .res \ + -p $(dir $(3)) \ + -f $(1)) +endef +else +gb_WinResTarget__command_target = +gb_WinResTarget__command_dep = +endif + +# InstallModuleTarget class + +define gb_InstallModuleTarget_InstallModuleTarget_platform +$(call gb_InstallModuleTarget_add_defs,$(1),\ + $(gb_CPUDEFS) \ + $(gb_OSDEFS) \ + -DCOMID=gcc3 \ + -D_gcc3 \ + $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ +) + +endef + +# InstallScript class + +gb_InstallScript_EXT := .inf + +# CliAssemblyTarget class + +gb_CliAssemblyTarget_POLICYEXT := +gb_CliAssemblyTarget_get_dll := + +# Extension class + +gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt + +# UnpackedTarget class + +gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) + +# UnoApiHeadersTarget class + +ifeq ($(DISABLE_DYNLOADING),TRUE) +gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +else +gb_UnoApiHeadersTarget_select_variant = $(2) +endif + +# Package class +gb_Package_PROGRAMDIRNAME := program +gb_Package_SDKDIRNAME := sdk + +# UIMenubarTarget class + +define gb_UIMenubarTarget__command +$(call gb_Output_announce,$(2),$(true),UIM,1) +cp $(3) $(1) + +endef + +gb_UIMenubarTarget_UIMenubarTarget_platform := + +# Python +gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" + +# vim: set noet sw=4: commit 17704f59ccaeaa802f50b25eb4554fa98fa5faea Author: Marcos Paulo de Souza <[email protected]> Date: Sun Jun 9 17:22:38 2013 -0300 fdo#60924 autoinstall - gbuild/scp2: add canvas module Change-Id: I740ee32653059669e299ab52f7709319a8534f21 diff --git a/Repository.mk b/Repository.mk index 73456b9..748fb61 100644 --- a/Repository.mk +++ b/Repository.mk @@ -257,6 +257,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ $(if $(DISABLE_SCRIPTING),,basctl) \ basegfx \ bib \ + $(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \ + canvasfactory \ canvastools \ chartcore \ chartcontroller \ @@ -272,6 +274,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ + $(if $(ENABLE_DIRECTX),directx9canvas) \ drawinglayer \ editeng \ egi \ @@ -298,6 +301,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ fwk \ fwl \ fwm \ + $(if $(ENABLE_DIRECTX),gdipluscanvas) \ guesslang \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ i18npool \ @@ -322,6 +326,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ lnth \ $(if $(MERGELIBS),merged) \ msfilter \ + mtfrenderer \ mysql \ odbc \ odbcbase \ @@ -339,6 +344,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ sdfilt \ sdui \ sfx \ + simplecanvas \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ svgio \ @@ -359,6 +365,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ utl \ uui \ vcl \ + vclcanvas \ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \ xmlscript \ xmlfa \ @@ -602,16 +609,12 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ basprov \ - cairocanvas \ - canvasfactory \ cmdmail \ - directx9canvas \ dlgprov \ expwrap \ fastsax \ fpicker \ fps_office \ - gdipluscanvas \ hatchwindowfactory \ i18nsearch \ ldapbe2 \ @@ -619,14 +622,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ migrationoo2 \ migrationoo3 \ msforms \ - mtfrenderer \ OGLTrans \ passwordcontainer \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - simplecanvas \ slideshow \ stringresource \ syssh \ @@ -637,7 +638,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ vbaevents \ vbaobj \ vbaswobj \ - vclcanvas \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ ) \ diff --git a/scp2/InstallModule_canvas.mk b/scp2/InstallModule_canvas.mk deleted file mode 100644 index ad721b5..0000000 --- a/scp2/InstallModule_canvas.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_InstallModule_InstallModule,scp2/canvas)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/canvas,\ - scp2/source/canvas/canvascommons \ - scp2/source/canvas/mtfrenderer \ - scp2/source/canvas/vclcanvas \ - $(if $(filter TRUE,$(ENABLE_CAIRO_CANVAS)),\ - scp2/source/canvas/cairocanvas \ - ) \ - $(if $(filter TRUE,$(ENABLE_DIRECTX)),\ - scp2/source/canvas/directxcanvas \ - ) \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index f54cad1..ecc4ee9 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -13,7 +13,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ scp2/accessories \ scp2/base \ scp2/calc \ - scp2/canvas \ scp2/draw \ scp2/graphicfilter \ scp2/impress \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index c58af2e..695c88c 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_accessories \ InstallModule_base \ InstallModule_calc \ - InstallModule_canvas \ InstallModule_draw \ InstallModule_extensions \ InstallModule_graphicfilter \ diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp deleted file mode 100644 index eceff58..0000000 --- a/scp2/source/canvas/cairocanvas.scp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "macros.inc" - -STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas) diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp deleted file mode 100644 index db6b0ae..0000000 --- a/scp2/source/canvas/canvascommons.scp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "macros.inc" - -STD_LIB_FILE(gid_File_CanvasFactory, canvasfactory) -STD_LIB_FILE(gid_File_SimpleCanvas, simplecanvas) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp deleted file mode 100644 index e9ccf2f..0000000 --- a/scp2/source/canvas/directxcanvas.scp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "macros.inc" - -#ifdef WNT -STD_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas) -STD_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas) -#endif diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp deleted file mode 100644 index 768dbe6..0000000 --- a/scp2/source/canvas/mtfrenderer.scp +++ /dev/null @@ -1,11 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "macros.inc" - -STD_LIB_FILE(gid_File_Lib_MtfRenderer, mtfrenderer) diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp deleted file mode 100644 index a50dd43..0000000 --- a/scp2/source/canvas/vclcanvas.scp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "macros.inc" - -STD_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 71a6d0f..cf10632 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -258,13 +258,8 @@ Module gid_Module_Root_Files_5 gid_File_Lib_XSec_XMLSecurity, gid_File_Lib_XSec_Framework, gid_File_Lib_XSec_XmlSec, - gid_File_CanvasFactory, - gid_File_SimpleCanvas, gid_File_Lib_Cmdmail, gid_File_Lib_I18n, - gid_File_Lib_VCLCanvas, - gid_File_Lib_DirectX9Canvas, - gid_File_Lib_GdiPlusCanvas, gid_File_Lib_Accessbridge, gid_File_Lib_Ado, gid_File_Lib_Dl,
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
