[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/Module_vcl.mk vcl/opengl vcl/workben

[Jan Holesovsky]

 vcl/Module_vcl.mk       |    8 ++++----
 vcl/opengl/salbmp.cxx   |    2 +-
 vcl/workben/vcldemo.cxx |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3935b123e0e9b19b7e4753e23b3905a6f59b36db
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Nov 7 12:03:28 2014 +0100

    Build vcldemo on Windows too.
    
    Change-Id: Ia6f7cfb819983a3a75ac78015a8eec1da539bead

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 82597a2..5d1d2d2 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -27,13 +27,13 @@ $(eval $(call gb_Module_add_targets,vcl,\
         StaticLibrary_vclmain \
         Executable_ui-previewer \
 		$(if $(filter LINUX MACOSX WNT,$(OS)), \
-	        Executable_icontest \
-	        Executable_outdevgrind )) \
+			Executable_icontest \
+			Executable_outdevgrind \
+			Executable_vcldemo )) \
     $(if $(filter-out ANDROID IOS WNT,$(OS)), \
         Executable_svdemo \
         Executable_svptest \
-        Executable_svpclient \
-        Executable_vcldemo) \
+        Executable_svpclient) \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,vcl,\
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 46c2b0c..0736773 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -130,7 +130,7 @@ bool OpenGLSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun
     return false;
 }
 
-bool OpenGLSalBitmap::Draw( OpenGLContext& rContext, const SalTwoRect& rPosAry )
+bool OpenGLSalBitmap::Draw( OpenGLContext& rContext, const SalTwoRect& /*rPosAry*/ )
 {
     if( !mpContext )
         mpContext = &rContext;
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index a8eccd0..e381f09 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -154,6 +154,7 @@ public:
         aMainWin.SetText( "Interactive VCL demo" );
         aMainWin.Show();
         Application::Execute();
+        return 0;
     }
 
 protected: