[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-rebase' - 2 commits - external/glew

[Markus Mohrhard]

 external/glew/ExternalProject_glew.mk   |    2 +-
 external/glew/glew-fix-rc-error.patch.1 |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 1e43862a6a6070fed03bba860847bb829defa156
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jan 29 00:14:19 2014 +0100

    we only need the glew libs
    
    Change-Id: Ibb67b7cbf9c41188f026826cdacacff26b29c576

diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk
index 73b32a2..7e08e2a 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -24,7 +24,7 @@ else
 
 $(call gb_ExternalProject_get_state_target,glew,build) :
 	$(call gb_ExternalProject_run,glew,\
-		$(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) $(MAKE) $(if $(filter TRUE,$(ENABLE_DEBUG)),debug) \
+		$(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) $(MAKE) glew.lib $(if $(filter TRUE,$(ENABLE_DEBUG)),debug) \
 	)
 
 endif
commit 3f4ccc91fc77c514b0fd214c18118c2b61fa522f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jan 29 00:11:28 2014 +0100

    remove unnecessary lines in glew patch
    
    Change-Id: Ib5b12ab6502bbee92fd16f24c8398c6f657bc742

diff --git a/external/glew/glew-fix-rc-error.patch.1 b/external/glew/glew-fix-rc-error.patch.1
index 3739fd7..7afcc2b 100644
--- a/external/glew/glew-fix-rc-error.patch.1
+++ b/external/glew/glew-fix-rc-error.patch.1
@@ -1,4 +1,3 @@
-Only in glew/bin: Release
 diff -ur glew.org/build/glew.rc glew/build/glew.rc
 --- glew.org/build/glew.rc	2014-01-28 06:54:52.910765800 +0100
 +++ glew/build/glew.rc	2014-01-28 06:56:46.719717700 +0100
@@ -11,5 +10,3 @@ diff -ur glew.org/build/glew.rc glew/build/glew.rc
              VALUE "CompanyName", "\0"
              VALUE "FileDescription", "The OpenGL Extension Wrangler Library\0"
              VALUE "FileVersion", "1,10,0,0\0"
-Only in glew/build/vc10: build.log
-Only in glew/build/vc10: tmp