From f16572fbd3cbdb33f7cc0f9f795c7cefa15d1ee5 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Wed, 10 Dec 2008 06:31:53 +0000
Subject: [PATCH] Added normal mapped meshes sample, only three rfx shaders and
 better uninstaller

---
 src/install/meshlab.nsi | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/install/meshlab.nsi b/src/install/meshlab.nsi
index 56b7062b5..b2b9b27fd 100644
--- a/src/install/meshlab.nsi
+++ b/src/install/meshlab.nsi
@@ -72,7 +72,9 @@ Section "MainSection" SEC01
   File "..\meshlab\shaders\*.gdp"
   File "..\meshlab\shaders\*.vert"
   SetOutPath "$INSTDIR\shadersrm"
-  File "..\meshlab\shadersrm\*.rfx"
+  File "..\meshlab\shadersrm\PhongUntextured.rfx"
+  File "..\meshlab\shadersrm\NormalMapping.rfx"
+  File "..\meshlab\shadersrm\ImageBasedLighting.rfx"
   SetOutPath "$INSTDIR\plugins"
   ; IO Plugins (9)
   File "..\meshlab\plugins\baseio.dll"
@@ -153,7 +155,7 @@ Section "MainSection" SEC01
   File "..\meshlab\textures\*.dds"
   File "..\meshlab\textures\fur.png"
   File "..\meshlab\textures\glyphmosaic.png"
-  File "..\meshlab\textures\NPR Metallic Outline.tga"
+  ;File "..\meshlab\textures\NPR Metallic Outline.tga"
   File "..\meshlab\textures\hatch*.jpg"
 
   SetOutPath "$INSTDIR\textures\cubemaps"
@@ -167,6 +169,8 @@ Section "MainSection" SEC01
   File "..\sample\duck_triangulate.dae"
   File "..\sample\seashell.gts"
   File "..\sample\chameleon4k.pts"
+  File "..\sample\normalmap\laurana500.*"
+  File "..\sample\normalmap\matteonormb.*"
   SetOutPath "$INSTDIR\samples\images"
   File "..\sample\images\duckCM.jpg"
   SetOutPath "$INSTDIR\imageformats"
@@ -223,11 +227,21 @@ Section Uninstall
   Delete "$INSTDIR\shaders\*.frag"
   Delete "$INSTDIR\shaders\*.vert"
   Delete "$INSTDIR\shaders\*.gdp"
+  Delete "$INSTDIR\shadersrm\*.rfx"
   Delete "$INSTDIR\samples\*.*"
   Delete "$INSTDIR\samples\images\*.*"
   Delete "$INSTDIR\plugins\*.dll"
+  Delete "$INSTDIR\plugins\U3D_W32\*.dll"
+  Delete "$INSTDIR\plugins\U3D_W32\*.exe"
+  Delete "$INSTDIR\plugins\U3D_W32\*.txt"
+  Delete "$INSTDIR\plugins\U3D_W32\plugins\*.dll"
+  Delete "$INSTDIR\plugins\*.dll"
   Delete "$INSTDIR\imageformats\*.dll"
   Delete "$INSTDIR\textures\*.png"
+  Delete "$INSTDIR\textures\*.dds"
+  Delete "$INSTDIR\textures\cubemaps\*.jpg"
+  Delete "$INSTDIR\textures\*.jpg"
+  Delete "$INSTDIR\textures\*.tga"
 
   Delete "$SMPROGRAMS\MeshLab\Uninstall.lnk"
   Delete "$SMPROGRAMS\MeshLab\Website.lnk"
@@ -237,14 +251,15 @@ Section Uninstall
   RMDir "$SMPROGRAMS\MeshLab"
   RMDir "$INSTDIR\CVS"
   RMDir "$INSTDIR\imageformats"
-  RMDir "$INSTDIR\plugins"
-  RMDir "$INSTDIR\plugins\U3D_W32"
   RMDir "$INSTDIR\plugins\U3D_W32\plugins"
+  RMDir "$INSTDIR\plugins\U3D_W32"
+  RMDir "$INSTDIR\plugins"
   RMDir "$INSTDIR\samples\images"
   RMDir "$INSTDIR\samples"
-  RMDir "$INSTDIR\textures"
   RMDir "$INSTDIR\textures\cubemaps"
+  RMDir "$INSTDIR\textures"
   RMDir "$INSTDIR\shaders"
+  RMDir "$INSTDIR\shadersrm"
   RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"