RepositoryExternal.mk | 8 +++++++-
external/glew/ExternalPackage_glew.mk | 3 +++
external/glew/ExternalProject_glew.mk | 11 +++++++++++
external/glew/UnpackedTarball_glew.mk | 4 ++++
external/glew/glew-fix-rc-error.patch.1 | 15 +++++++++++++++
5 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit deddac677dead5edd9dc50516689aa53c96df351
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Jan 6 04:42:44 2014 +0100
fix windows build of glew
Change-Id: I8aab94aefd737195a26696635f52f754764ea1b4
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 184169b..a677c00 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -139,9 +139,15 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
+ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,glew)/lib/ -lGLEW \
+ $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \
)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+ -lGLEW \
+)
+endif
endef
diff --git a/external/glew/ExternalPackage_glew.mk
b/external/glew/ExternalPackage_glew.mk
index 273c46e..9f18cfb 100644
--- a/external/glew/ExternalPackage_glew.mk
+++ b/external/glew/ExternalPackage_glew.mk
@@ -14,6 +14,9 @@ $(eval $(call
gb_ExternalPackage_use_external_project,glew,glew))
ifeq ($(OS),MACOSX)
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/Win32/glew32d.dll,Release/Win32/glew32.dll) \
+))
else ifeq ($(filter IOS ANDROID,$(OS)),)
$(eval $(call
gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.so.1.10,lib/libGLEW.so.1.10.0))
endif
diff --git a/external/glew/ExternalProject_glew.mk
b/external/glew/ExternalProject_glew.mk
index e51f744..f419ef5 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -13,9 +13,20 @@ $(eval $(call gb_ExternalProject_register_targets,glew,\
build \
))
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_get_state_target,glew,build) :
+ $(call gb_ExternalProject_run,build,\
+ msbuild.exe glew_shared.vcxproj /p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110
/p:VisualStudioVersion=11.0) \
+ ,build/vc10)
+
+else
+
$(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,glew,\
$(MAKE) \
)
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/glew/UnpackedTarball_glew.mk
b/external/glew/UnpackedTarball_glew.mk
index 528d677..926bb7a 100644
--- a/external/glew/UnpackedTarball_glew.mk
+++ b/external/glew/UnpackedTarball_glew.mk
@@ -13,4 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,glew,$(GLEW_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,glew,0))
+$(eval $(call gb_UnpackedTarball_add_patches,glew,\
+ external/glew/glew-fix-rc-error.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/glew/glew-fix-rc-error.patch.1
b/external/glew/glew-fix-rc-error.patch.1
new file mode 100644
index 0000000..677df30
--- /dev/null
+++ b/external/glew/glew-fix-rc-error.patch.1
@@ -0,0 +1,15 @@
+Only in glew/bin: Release
+diff -ur glew.org/build/glew.rc glew/build/glew.rc
+--- glew.org/build/glew.rc 2014-01-06 05:08:17.620863200 +0100
++++ glew/build/glew.rc 2014-01-06 05:09:59.514302000 +0100
+@@ -56,7 +56,7 @@
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+- VALUE "Comments", "The OpenGL Extension Wrangler
Library\r\nCopyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee
org>\r\nCopyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian
org>\r\nCopyright (C) 2002, Lev Povalahev\r\nAll rights
reserved.\r\n\r\nRedistribution and use in source and binary forms, with or
without \r\nmodification, are permitted provided that the following conditions
are met:\r\n\r\n* Redistributions of source code must retain the above
copyright notice, \r\n this list of conditions and the following
disclaimer.\r\n* Redistributions in binary form must reproduce the above
copyright notice, \r\n this list of conditions and the following disclaimer in
the documentation \r\n and/or other materials provided with the
distribution.\r\n* The name of the author may be used to endorse or promote
products \r\n derived from this software without specific prior written
permission.\r\n\r\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBU
TORS ''AS IS'' \r\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE \r\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE\r\nARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE \r\nLIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR \r\nCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF \r\nSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS\r\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN\r\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE)\r\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF\r\nTHE POSSIBILITY OF SUCH DAMAGE.\r\n\r\n\r\nMesa 3-D graphics
library\r\n\r\nVersion: 7.0\r\n\r\nCopyright (C) 1999-2007 Brian Paul All
Rights Reserved.\r\n\r\nPermission is hereby granted, free of charge, to any
person obtaining a\r\ncopy of this software and associated documentation fil
es (the
''Software''),\r\nto deal in the Software without restriction, including
without limitation\r\nthe rights to use, copy, modify, merge, publish,
distribute, sublicense,\r\nand/or sell copies of the Software, and to permit
persons to whom the\r\nSoftware is furnished to do so, subject to the following
conditions:\r\n\r\nThe above copyright notice and this permission notice shall
be included\r\nin all copies or substantial portions of the
Software.\r\n\r\nTHE SOFTWARE IS PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY
KIND, EXPRESS\r\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
NO EVENT SHALL\r\nBRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN\r\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN\r\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.\r\n\r\n\r\nCopyright (c) 2007 The Khronos Group
Inc.\r\n\r\nPermission is h
ereby gr
anted, free of charge, to any person obtaining a\r\ncopy of this software
and/or associated documentation files (the\r\n''Materials''), to deal in the
Materials without restriction, including\r\nwithout limitation the rights to
use, copy, modify, merge, publish,\r\ndistribute, sublicense, and/or sell
copies of the Materials, and to\r\npermit persons to whom the Materials are
furnished to do so, subject to\r\nthe following conditions:\r\n\r\nThe above
copyright notice and this permission notice shall be included\r\nin all copies
or substantial portions of the Materials.\r\n\r\nTHE MATERIALS ARE PROVIDED
''AS IS'', WITHOUT WARRANTY OF ANY KIND,\r\nEXPRESS OR IMPLIED, INCLUDING BUT
NOT LIMITED TO THE WARRANTIES OF\r\nMERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT.\r\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY\r\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT,\r\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN C
ONNECTIO
N WITH THE\r\nMATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.\0"
++ VALUE "Comments", "The OpenGL Extension Wrangler Library\0"
+ 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
