# HG changeset patch
# User Michael Guravage <michael.guravage@cwi.nl>
# Date 2010-10-14 15:20:42
# Node ID 5469f4c56a5300d8a8cd9cdeac474de1cd4b2c00
# Parent  1b01e13fa5f111e53f57610c1750b88ef7213b00

Tweaked Windows installation directories. Turned debugging off in
VirtualLeaf profile - all profiles must be consistent.

 --
 user: Michael Guravage <michael.guravage@cwi.nl>
 branch 'default'
 changed src/ChangeLog
 changed src/VirtualLeaf-install.nsi
 changed src/VirtualLeaf.pro

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-14    <guravage@caterpie.sen.cwi.nl>
 
+	* VirtualLeaf.pro: Turned debug off to make all profiles must be
+	consistant.
+
+	* VirtualLeaf-install.nsi: Tweaked paths to coincide with UNIX
+	distribution, i.e. VirtualLeaf.exe, its libraries, models, and the
+	uninstaller all go in the bin directory. And leaves directory
+	placed under data directory.
+
 	* canvas.cpp (exportCellData): Added a check to inquire before
 	overwritting an existing file.
 
diff --git a/src/VirtualLeaf-install.nsi b/src/VirtualLeaf-install.nsi
--- a/src/VirtualLeaf-install.nsi
+++ b/src/VirtualLeaf-install.nsi
@@ -117,8 +117,8 @@ RequestExecutionLevel user
 section "Virtual Leaf executable"
   #sectionIn RO
   # define the output path for the Virtual Leaf executable
-  setOutPath $INSTDIR
-  writeUninstaller $INSTDIR\uninstaller.exe
+  setOutPath $INSTDIR\bin
+  writeUninstaller $INSTDIR\bin\uninstaller.exe
   file ..\bin\VirtualLeaf.exe
 
   # Required DLLs
@@ -145,13 +145,13 @@ sectionEnd
  
 section "Virtual Leaf plugins"
   # define the output path for the Virtual Leaf models
-  setOutPath $INSTDIR\models
+  setOutPath $INSTDIR\bin\models
   file ..\bin\models\*
 sectionEnd
 
 section "Virtual Leaf data"
   # define the output path for the Virtual Leaf models
-  setOutPath $INSTDIR\leaves
+  setOutPath $INSTDIR\data\leaves
   file ..\data\leaves\*
 sectionEnd
 
diff --git a/src/VirtualLeaf.pro b/src/VirtualLeaf.pro
--- a/src/VirtualLeaf.pro
+++ b/src/VirtualLeaf.pro
@@ -19,8 +19,8 @@
 #  Copyright 2010 Roeland Merks.
 #
 
-CONFIG -= release
-CONFIG += debug
+CONFIG += release
+CONFIG -= debug
 CONFIG += qt
 
 QMAKE_CXXFLAGS += -fexceptions