[Libreoffice-commits] core.git: Repository.mk vcl/Executable_icontest.mk vcl/Module_vcl.mk vcl/workben

[Tor Lillqvist]

 Repository.mk              |    2 +-
 vcl/Executable_icontest.mk |    6 ++++++
 vcl/Module_vcl.mk          |    2 +-
 vcl/workben/icontest.cxx   |    8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit e21f6e3838a64f6c2517479d021e943e2ffcab94
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 10 11:58:30 2014 +0300

    Build icontest for Windows, too
    
    Change-Id: I7c23d9a41c9b517bf8dcdd3e1de2ab24a8a1d0d0

diff --git a/Repository.mk b/Repository.mk
index 706bf7a..beb2c68 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -99,7 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	) \
 	uri-encode \
 	ui-previewer \
-	$(if $(filter LINUX,$(OS)), \
+	$(if $(filter LINUX WNT,$(OS)), \
 		icontest) \
 	vcldemo \
 	tiledrendering \
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 76390c8..83ba648 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -27,6 +27,12 @@ $(eval $(call gb_Executable_add_libs,icontest,\
     -lGL \
 ))
 
+else ifeq ($(OS),WNT)
+
+$(eval $(call gb_Executable_add_libs,icontest,\
+    opengl32.lib \
+))
+
 endif
 
 $(eval $(call gb_Executable_use_static_libraries,icontest,\
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 6c087e6..fa827d3 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
         StaticLibrary_vclmain \
         Executable_ui-previewer \
-		$(if $(filter LINUX,$(OS)), \
+		$(if $(filter LINUX WNT,$(OS)), \
 	        Executable_icontest)) \
     $(if $(filter-out ANDROID IOS WNT,$(OS)), \
         Executable_svdemo \
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 42634ff..477be4c 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -98,11 +98,11 @@ void MyOpenGLWorkWindow::Paint( const Rectangle& )
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     CHECK_GL_ERROR();
 
-    float nThumbWidth = 2.0 / (WIDTH / 100.0);
-    float nThumbHeight = 2.0 / (HEIGHT / 100.0);
+    float nThumbWidth = 2.0f / (WIDTH / 100.0f);
+    float nThumbHeight = 2.0f / (HEIGHT / 100.0f);
 
-    float nStepX = 2.0 / (WIDTH / (100.0 + 10));
-    float nStepY = 2.0 / (HEIGHT / (100.0 + 10));
+    float nStepX = 2.0f / (WIDTH / (100.0f + 10));
+    float nStepY = 2.0f / (HEIGHT / (100.0f + 10));
 
     float nX = -1, nY = -1;