summaryrefslogtreecommitdiffstats
path: root/external
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2020-05-28 00:30:18 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-05-28 01:31:51 +0200
commitccd534e31f9522eb29f1d14ffa180e4163094787 (patch)
treee10f4f95acee0ad440acff3d284580884e9eaeec /external
parenttdf#131045:Make condition names grammatically correct (diff)
downloadcore-ccd534e31f9522eb29f1d14ffa180e4163094787.tar.gz
core-ccd534e31f9522eb29f1d14ffa180e4163094787.zip
Revert "external: bundle box2d"
No need for this extra baggage on the 7.0 branch just yet. This reverts commit a7f2239e649ea1b9ef611d758841584ab51abed0. Change-Id: Ib2e63ea1d48d6b0b930e65ed275725523be9f474 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95009 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external')
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/box2d/Makefile7
-rw-r--r--external/box2d/Module_box2d.mk20
-rw-r--r--external/box2d/README3
-rw-r--r--external/box2d/StaticLibrary_box2d.mk72
-rw-r--r--external/box2d/UnpackedTarball_box2d.mk14
6 files changed, 0 insertions, 117 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 41e018d2ef3f..286759927781 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \
$(call gb_Helper_optional,BOOST,boost) \
- $(call gb_Helper_optional,BOX2D,box2d) \
$(call gb_Helper_optional,BREAKPAD,breakpad) \
$(call gb_Helper_optional,BSH,beanshell) \
$(call gb_Helper_optional,BZIP2,bzip2) \
diff --git a/external/box2d/Makefile b/external/box2d/Makefile
deleted file mode 100644
index e4968cf85fb6..000000000000
--- a/external/box2d/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/box2d/Module_box2d.mk b/external/box2d/Module_box2d.mk
deleted file mode 100644
index 3986357b3668..000000000000
--- a/external/box2d/Module_box2d.mk
+++ /dev/null
@@ -1,20 +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_Module_Module,box2d))
-
-$(eval $(call gb_Module_add_targets,box2d,\
- UnpackedTarball_box2d \
-))
-
-$(eval $(call gb_Module_add_targets,box2d,\
- StaticLibrary_box2d \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/box2d/README b/external/box2d/README
deleted file mode 100644
index d2b46b93b09f..000000000000
--- a/external/box2d/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Box2D is a 2D physics engine.
-
-It is available from [https://github.com/erincatto/box2d]
diff --git a/external/box2d/StaticLibrary_box2d.mk b/external/box2d/StaticLibrary_box2d.mk
deleted file mode 100644
index b50ee47aa498..000000000000
--- a/external/box2d/StaticLibrary_box2d.mk
+++ /dev/null
@@ -1,72 +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_StaticLibrary_StaticLibrary,box2d))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,box2d,box2d))
-
-$(eval $(call gb_StaticLibrary_set_warnings_disabled,box2d))
-
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,box2d,cpp))
-
-$(eval $(call gb_StaticLibrary_set_include,box2d,\
- -I$(call gb_UnpackedTarball_get_dir,box2d/Box2D/)\
- $$(INCLUDE)\
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,box2d,\
- UnpackedTarball/box2d/Box2D/Box2D/Common/b2Timer \
- UnpackedTarball/box2d/Box2D/Box2D/Common/b2StackAllocator \
- UnpackedTarball/box2d/Box2D/Box2D/Common/b2Draw \
- UnpackedTarball/box2d/Box2D/Box2D/Common/b2Math \
- UnpackedTarball/box2d/Box2D/Box2D/Common/b2BlockAllocator \
- UnpackedTarball/box2d/Box2D/Box2D/Common/b2Settings \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2Body \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2CircleContact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2ContactSolver \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2PolygonContact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2ChainAndCircleContact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2Contact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2RopeJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2WheelJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2FrictionJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2PrismaticJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2WeldJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2PulleyJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2MouseJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2MotorJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2DistanceJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2GearJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2Joint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2RevoluteJoint \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2WorldCallbacks \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2Fixture \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2ContactManager \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2Island \
- UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2World \
- UnpackedTarball/box2d/Box2D/Box2D/Rope/b2Rope \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2TimeOfImpact \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2CollidePolygon \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2Distance \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2Collision \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2CollideEdge \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2CollideCircle \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2BroadPhase \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2EdgeShape \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2CircleShape \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2ChainShape \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2PolygonShape \
- UnpackedTarball/box2d/Box2D/Box2D/Collision/b2DynamicTree \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/box2d/UnpackedTarball_box2d.mk b/external/box2d/UnpackedTarball_box2d.mk
deleted file mode 100644
index 340a17511711..000000000000
--- a/external/box2d/UnpackedTarball_box2d.mk
+++ /dev/null
@@ -1,14 +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_UnpackedTarball_UnpackedTarball,box2d))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,box2d,$(BOX2D_TARBALL)))
-
-# vim: set noet sw=4 ts=4: