diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-16 21:11:11 +0200 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-16 20:46:13 +0000 |
commit | 82a3c3f702e78232ebd4671c0061aa817bbd146b (patch) | |
tree | 8e166e85bfa1524a0c9d3aaf4c38c9e4f68eb702 /external/mingw-externals | |
parent | fixed out-of-bounds OUString access (diff) | |
download | core-82a3c3f702e78232ebd4671c0061aa817bbd146b.tar.gz core-82a3c3f702e78232ebd4671c0061aa817bbd146b.zip |
move mingw-externals to subdir
Change-Id: I324225ac397d8e4bb1f58f0b8040eb08b7142ee9
Reviewed-on: https://gerrit.libreoffice.org/6277
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'external/mingw-externals')
-rw-r--r-- | external/mingw-externals/CustomTarget_jawt.mk | 33 | ||||
-rw-r--r-- | external/mingw-externals/Module_mingw-externals.mk | 21 | ||||
-rw-r--r-- | external/mingw-externals/Package_jawt.mk | 14 | ||||
-rw-r--r-- | external/mingw-externals/Package_mingw_dlls.mk | 18 | ||||
-rw-r--r-- | external/mingw-externals/Package_mingw_gccdlls.mk | 17 |
5 files changed, 103 insertions, 0 deletions
diff --git a/external/mingw-externals/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk new file mode 100644 index 000000000000..2d35d93a24c2 --- /dev/null +++ b/external/mingw-externals/CustomTarget_jawt.mk @@ -0,0 +1,33 @@ +# -*- 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_CustomTarget_CustomTarget,external/jawt)) + +$(eval $(call gb_CustomTarget_register_targets,external/jawt,\ + jawt.def \ + libjawt.dll.a \ +)) + +ifeq ($(OS)$(CPU),WNTX) +$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo EXPORTS > $@ + echo "JAWT_GetAWT" >> $@ +else +$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo EXPORTS > $@ + echo "JAWT_GetAWT@8" >> $@ +endif + +$(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) + $(DLLTOOL) --input-def=$< --output-lib=$@ --dllname=jawt.dll + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Module_mingw-externals.mk b/external/mingw-externals/Module_mingw-externals.mk new file mode 100644 index 000000000000..6d262d899f65 --- /dev/null +++ b/external/mingw-externals/Module_mingw-externals.mk @@ -0,0 +1,21 @@ +# -*- 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_Module_Module,mingw-externals)) + +ifeq ($(OS)$(COM),WNTGCC) +$(eval $(call gb_Module_add_targets,mingw-externals,\ + CustomTarget_jawt \ + Package_jawt \ + Package_mingw_dlls \ + Package_mingw_gccdlls \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/mingw-externals/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk new file mode 100644 index 000000000000..cc58cf9f5ab2 --- /dev/null +++ b/external/mingw-externals/Package_jawt.mk @@ -0,0 +1,14 @@ +# -*- 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_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt))) + +$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk new file mode 100644 index 000000000000..c85032a3c60e --- /dev/null +++ b/external/mingw-externals/Package_mingw_dlls.mk @@ -0,0 +1,18 @@ +# -*- 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_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) + +$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTROOT))) + +$(eval $(call gb_Package_add_files,mingw_dlls,bin,\ + $(sort $(MINGW_DLLS)) \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk new file mode 100644 index 000000000000..521db37da155 --- /dev/null +++ b/external/mingw-externals/Package_mingw_gccdlls.mk @@ -0,0 +1,17 @@ +# -*- 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_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin)) + +$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\ + $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \ + $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: |