strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GLSL files should go into $(LIBO_ETC_FOLDER)/opengl

Browse source 
(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
This commit is contained in:
Tor Lillqvist 2014-10-03 14:51:51 +03:00
parent fd26de3b4a
commit 8717cbc984
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
canvas/Package_opengl.mk
View file

@ -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 \

2
chart2/Package_opengl.mk
View file

@ -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 \

2
slideshow/Package_opengl.mk
View file

@ -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 \