diff options
Diffstat (limited to 'external/glew')
-rw-r--r-- | external/glew/ExternalPackage_glew.mk | 33 | ||||
-rw-r--r-- | external/glew/ExternalProject_glew.mk | 36 | ||||
-rw-r--r-- | external/glew/Makefile | 7 | ||||
-rw-r--r-- | external/glew/Module_glew.mk | 18 | ||||
-rw-r--r-- | external/glew/README | 6 | ||||
-rw-r--r-- | external/glew/UnpackedTarball_glew.mk | 48 | ||||
-rw-r--r-- | external/glew/glew-macosx-install-name.patch.1 | 13 | ||||
-rw-r--r-- | external/glew/glew-msvc-disable-sse2.patch.1 | 10 | ||||
-rw-r--r-- | external/glew/glew-static-only.patch.1 | 12 | ||||
-rw-r--r-- | external/glew/glew-tmpdir.patch.1 | 13 | ||||
-rw-r--r-- | external/glew/glew_use_CC_variable.patch.1 | 24 |
11 files changed, 0 insertions, 220 deletions
diff --git a/external/glew/ExternalPackage_glew.mk b/external/glew/ExternalPackage_glew.mk deleted file mode 100644 index e6adc8b6ce26..000000000000 --- a/external/glew/ExternalPackage_glew.mk +++ /dev/null @@ -1,33 +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_ExternalPackage_ExternalPackage,glew,glew)) - -$(eval $(call gb_ExternalPackage_use_external_project,glew,glew)) - -ifeq ($(OS)-$(COM),WNT-MSC) -ifeq ($(CPUNAME),INTEL) -glew_arch_subdir=Win32 -else ifeq ($(CPUNAME),X86_64) -glew_arch_subdir=x64 -endif -endif - -ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.1.12.0.dylib,lib/libGLEW.1.12.0.dylib)) -else ifeq ($(OS)-$(COM),WNT-GCC) -else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_files,glew,$(LIBO_LIB_FOLDER), \ - bin/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/$(glew_arch_subdir)/glew32d.dll,Release/$(glew_arch_subdir)/glew32.dll) \ -)) -else ifeq ($(DISABLE_DYNLOADING),) -$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.so.1.12,lib/libGLEW.so.1.12.0)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk deleted file mode 100644 index 0d80cd03bd33..000000000000 --- a/external/glew/ExternalProject_glew.mk +++ /dev/null @@ -1,36 +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_ExternalProject_ExternalProject,glew)) - -$(eval $(call gb_ExternalProject_register_targets,glew,\ - build \ -)) - -ifeq ($(COM),MSC) -$(call gb_ExternalProject_get_state_target,glew,build) : - $(call gb_ExternalProject_run,build,\ - $(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade glew.sln,echo up-to-date) && \ - msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \ - ,build/vc12) \ - $(call gb_ExternalProject_run,build,\ - msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \ - ,build/vc12) - -else - -$(call gb_ExternalProject_get_state_target,glew,build) : - $(call gb_ExternalProject_run,glew,\ - $(if $(ENABLE_DEBUG),STRIP=) LD="$(CC)" \ - $(MAKE) STRIP= glew.lib $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(ENABLE_DEBUG),debug)) \ - ) - -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/glew/Makefile b/external/glew/Makefile deleted file mode 100644 index e4968cf85fb6..000000000000 --- a/external/glew/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/glew/Module_glew.mk b/external/glew/Module_glew.mk deleted file mode 100644 index 1d1b9a7154aa..000000000000 --- a/external/glew/Module_glew.mk +++ /dev/null @@ -1,18 +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,glew)) - -$(eval $(call gb_Module_add_targets,glew,\ - ExternalProject_glew \ - UnpackedTarball_glew \ - ExternalPackage_glew \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/glew/README b/external/glew/README deleted file mode 100644 index 34b2d249401c..000000000000 --- a/external/glew/README +++ /dev/null @@ -1,6 +0,0 @@ -GLEW is the OpenGL Extension Wrangler - -GLEW provides efficient run-time mechanisms for determining which OpenGL -extensions are supported on the target platform. - -http://glew.sourceforge.net/ diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk deleted file mode 100644 index c47b7a07e2ad..000000000000 --- a/external/glew/UnpackedTarball_glew.mk +++ /dev/null @@ -1,48 +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,glew)) - -$(eval $(call gb_UnpackedTarball_set_tarball,glew,$(GLEW_TARBALL))) - -$(eval $(call gb_UnpackedTarball_set_patchlevel,glew,0)) - -$(eval $(call gb_UnpackedTarball_fix_end_of_line,glew,\ - Makefile \ - include/GL/glew.h \ -)) - -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_UnpackedTarball_set_patchflags,glew,--binary)) -$(eval $(call gb_UnpackedTarball_add_patches,glew,\ - external/glew/glew-msvc-disable-sse2.patch.1 \ -)) -else -$(eval $(call gb_UnpackedTarball_add_patches,glew,\ - external/glew/glew_use_CC_variable.patch.1 \ -)) -endif - -ifeq ($(OS),MACOSX) -$(eval $(call gb_UnpackedTarball_add_patches,glew,\ - external/glew/glew-macosx-install-name.patch.1 \ -)) -endif - -ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_UnpackedTarball_add_patches,glew,\ - external/glew/glew-static-only.patch.1 \ -)) -endif - -$(eval $(call gb_UnpackedTarball_add_patches,glew,\ - external/glew/glew-tmpdir.patch.1 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/glew/glew-macosx-install-name.patch.1 b/external/glew/glew-macosx-install-name.patch.1 deleted file mode 100644 index 75e8e7f1a178..000000000000 --- a/external/glew/glew-macosx-install-name.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ --*- Mode:Diff -*- -diff -ur glew.org/build/glew.rc glew/build/glew.rc ---- glew/config/Makefile.darwin -+++ glew/config/Makefile.darwin -@@ -20,7 +20,7 @@ - LIB.DEVLNK = lib$(NAME).dylib - LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib - LIB.STATIC = lib$(NAME).a --LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) -+LDFLAGS.SO = -dynamiclib -install_name @__________________________________________________OOO/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) - LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib - LIB.DEVLNK.MX = lib$(NAME)mx.dylib - LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib diff --git a/external/glew/glew-msvc-disable-sse2.patch.1 b/external/glew/glew-msvc-disable-sse2.patch.1 deleted file mode 100644 index 6b07044f5507..000000000000 --- a/external/glew/glew-msvc-disable-sse2.patch.1 +++ /dev/null @@ -1,10 +0,0 @@ ---- glew/build//vc10/common.props.orig 2014-10-02 15:06:57.027060664 +0200 -+++ glew/build//vc10/common.props 2014-10-02 15:06:59.026060509 +0200 -@@ -10,6 +10,7 @@ - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories> -+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> diff --git a/external/glew/glew-static-only.patch.1 b/external/glew/glew-static-only.patch.1 deleted file mode 100644 index 14ccff23a6be..000000000000 --- a/external/glew/glew-static-only.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ --*- Mode:Diff -*- ---- glew/Makefile -+++ glew/Makefile -@@ -93,7 +93,7 @@ - LIB.SOBJS.MX := $(addprefix tmp/$(SYSTEM)/mx/shared/,$(LIB.SRCS.NAMES)) - LIB.SOBJS.MX := $(LIB.SOBJS.MX:.c=.o) - --glew.lib: lib lib/$(LIB.SHARED) lib/$(LIB.STATIC) glew.pc -+glew.lib: lib lib/$(LIB.STATIC) - - lib: - mkdir lib diff --git a/external/glew/glew-tmpdir.patch.1 b/external/glew/glew-tmpdir.patch.1 deleted file mode 100644 index 9a2847ba279a..000000000000 --- a/external/glew/glew-tmpdir.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur glew.org/Makefile glew/Makefile ---- glew.org/Makefile 2016-05-02 06:25:53.521291677 +0200 -+++ glew/Makefile 2016-05-02 06:31:10.325035494 +0200 -@@ -55,7 +55,8 @@ - DIST_SRC_TGZ ?= $(shell pwd)/$(DIST_NAME).tgz - DIST_WIN32 ?= $(shell pwd)/$(DIST_NAME)-win32.zip - --DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) -+TMPDIR ?= /tmp -+DIST_DIR := $(shell mktemp -d $(TMPDIR)/glew.XXXXXX)/$(DIST_NAME) - - # To disable stripping of binaries either: - # - use STRIP= on gmake command-line diff --git a/external/glew/glew_use_CC_variable.patch.1 b/external/glew/glew_use_CC_variable.patch.1 deleted file mode 100644 index 56e9903d937b..000000000000 --- a/external/glew/glew_use_CC_variable.patch.1 +++ /dev/null @@ -1,24 +0,0 @@ -Use CC variable from environment, don't hardcode "cc". - ---- glew/config/Makefile.linux.orig 2014-01-29 15:39:43.364972925 +0100 -+++ glew/config/Makefile.linux 2014-01-29 15:44:45.621000941 +0100 -@@ -1,6 +1,6 @@ - NAME = $(GLEW_NAME) --CC = cc --LD = cc -+CC ?= cc -+LD ?= $(CC) - M_ARCH ?= $(shell uname -m) - ARCH64 = false - ifeq (x86_64,${M_ARCH}) ---- glew/config/Makefile.darwin.orig 2014-01-29 15:44:39.541000377 +0100 -+++ glew/config/Makefile.darwin 2014-01-29 15:44:47.548001120 +0100 -@@ -1,6 +1,6 @@ - NAME = $(GLEW_NAME) --CC = cc --LD = cc -+CC ?= cc -+LD ?= $(CC) - CFLAGS.EXTRA = -dynamic -fno-common - #CFLAGS.EXTRA += -no-cpp-precomp - LDFLAGS.EXTRA = |