[Libreoffice-commits] core.git: canvas/Package_opengl.mk chart2/Package_opengl.mk slideshow/Package_opengl.mk

[Tor Lillqvist]

 canvas/Package_opengl.mk    |    2 +-
 chart2/Package_opengl.mk    |    2 +-
 slideshow/Package_opengl.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8717cbc9848efc1ee1284fac15ffc5c4ff080297
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 3 14:51:51 2014 +0300

    GLSL files should go into $(LIBO_ETC_FOLDER)/opengl
    
    (And not $(LIBO_BIN_FOLDER)/opengl. Note that on Linux and Windows,
    LIBO_ETC_FOLDER and LIBO_BIN_FOLDER are the same, "program".)
    
    That's where getShaderFolder() in vcl/source/opengl/OpenGLHelper.cxx
    looks for them. Also, as they are data and not executable code, to
    conform to strict OS X code signing and sandboxing requirements, they
    definitely should not be in $(LIBO_BIN_FOLDER)
    
    Change-Id: I902e08f7a1f142697df827d50e0bda74be918eb4

diff --git a/canvas/Package_opengl.mk b/canvas/Package_opengl.mk
index af256bf..5e54b73 100644
--- a/canvas/Package_opengl.mk
+++ b/canvas/Package_opengl.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,canvas_opengl_shader,$(SRCDIR)/canvas/opengl))
 
-$(eval $(call gb_Package_add_files,canvas_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\
+$(eval $(call gb_Package_add_files,canvas_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
 	dummyVertexShader.glsl \
 	linearMultiColorGradientFragmentShader.glsl \
 	linearTwoColorGradientFragmentShader.glsl \
diff --git a/chart2/Package_opengl.mk b/chart2/Package_opengl.mk
index 820cf35..aa12a95 100644
--- a/chart2/Package_opengl.mk
+++ b/chart2/Package_opengl.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,chart2_opengl_shader,$(SRCDIR)/chart2/opengl))
 
-$(eval $(call gb_Package_add_files,chart2_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\
+$(eval $(call gb_Package_add_files,chart2_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
 	backgroundFragmentShader.glsl \
 	backgroundVertexShader.glsl \
 	commonFragmentShader.glsl \
diff --git a/slideshow/Package_opengl.mk b/slideshow/Package_opengl.mk
index a7e9a8c..d5634a4 100644
--- a/slideshow/Package_opengl.mk
+++ b/slideshow/Package_opengl.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,slideshow_opengl_shader,$(SRCDIR)/slideshow/opengl))
 
-$(eval $(call gb_Package_add_files,slideshow_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\
+$(eval $(call gb_Package_add_files,slideshow_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
 		basicVertexShader.glsl \
 		dissolveFragmentShader.glsl \
 		staticFragmentShader.glsl \