diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-25 20:25:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:33:18 +0000 |
| commit | 482d7ce61b423600b41b459eb26a2cc221cd0acf (patch) | |
| tree | 8da6edb8200889d93f0b344e61ed779c037a590f /RepositoryExternal.mk | |
| parent | 178e38dd82a2cffb2db747c7be82ba7a48338968 (diff) | |
change from glew to epoxy
because that works under wayland out of the box and gtk3 uses it already
Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fd6f4c8b144b..dcc47a68c47a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -183,51 +183,43 @@ endef endif # SYSTEM_CPPUNIT -ifneq ($(SYSTEM_GLEW),) +ifneq ($(SYSTEM_EPOXY),) -define gb_LinkTarget__use_glew +define gb_LinkTarget__use_epoxy $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(GLEW_CFLAGS) \ + $(EPOXY_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS)) +$(call gb_LinkTarget_add_libs,$(1),$(EPOXY_LIBS)) endef -gb_ExternalProject__use_glew := +gb_ExternalProject__use_epoxy := -else # !SYSTEM_GLEW +else # !SYSTEM_EPOXY -$(eval $(call gb_Helper_register_packages_for_install,ooo,\ - glew \ -)) - -define gb_LinkTarget__use_glew -$(call gb_LinkTarget_use_package,$(1),glew) +define gb_LinkTarget__use_epoxy $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,glew/include) \ - -DGLEW_NO_GLU \ - $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,epoxy/include) \ + $$(INCLUDE) \ ) -ifeq ($(COM),MSC) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/$(wnt_arch_subdir_mandatory)/glew32d.lib,Release/$(wnt_arch_subdir_mandatory)/glew32.lib) \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,glew)/lib/ -lGLEW \ +$(call gb_LinkTarget_use_libraries,$(1),\ + epoxy \ ) -endif endef -define gb_ExternalProject__use_glew -$(call gb_ExternalProject_use_external_project,$(1),glew) +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ + epoxy \ +)) + +define gb_ExternalProject__use_epoxy +$(call gb_ExternalProject_use_external_project,$(1),epoxy) endef -endif # SYSTEM_GLEW +endif # SYSTEM_EPOXY define gb_LinkTarget__use_iconv $(call gb_LinkTarget_add_libs,$(1),-liconv) @@ -3435,7 +3427,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ ) else $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,libgltf)/src/.libs/libgltf-0.0$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,libgltf)/src/.libs/libgltf-0.1$(gb_StaticLibrary_PLAINEXT) \ ) endif |