[dia] * makefile.msc: Adjustments for libart.dll, deploye diaw.exe

[Steffen Macke <sdteffen src gnome org>]

commit 0609d14be6ba427dce9f8573018dd3b4e1d91ee5
Author: Steffen Macke <sdteffen sdteffen de>
Date:   Tue Apr 21 22:32:45 2009 +0200

    	* makefile.msc: Adjustments for libart.dll, deploye diaw.exe
    	* installer/win32/dia.nsi: Remove drs.dll for the time being, re-add
    	libart.dll, adjust for current libart 2.3.20 DLL from ftp.gnome.org
---
 .gitignore              |    2 ++
 ChangeLog               |    6 ++++++
 installer/win32/dia.nsi |    8 ++++----
 makefile.msc            |   14 +++++++++++---
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ada740..ffd8fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ missing
 mkinstalldirs
 stamp-h1
 
+
+/build/win32/Thumbs.db
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 171091b..c1045fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-21  Steffen Macke <sdteffen sdteffen de>
+
+	* makefile.msc: Adjustments for libart.dll, deploye diaw.exe
+	* installer/win32/dia.nsi: Remove drs.dll for the time being, re-add
+	libart.dll, adjust for current libart 2.3.20 DLL from ftp.gnome.org
+	
 2009-04-17  Steffen Macke <sdteffen sdteffen de>
 
 	* app/commands.c: Updated copyright date
diff --git a/installer/win32/dia.nsi b/installer/win32/dia.nsi
index 5082c48..aff5171 100644
--- a/installer/win32/dia.nsi
+++ b/installer/win32/dia.nsi
@@ -265,7 +265,7 @@ ${File} "..\..\build\win32\bin\" "dia.exe"
 ${File} "..\..\build\win32\bin\" "diaw.exe"
 ${File} "..\..\app\" "dia-win-remote.exe"
 ${File} "..\..\build\win32\bin\" "dia-app.dll"
-${File} "..\..\..\bin\" "libart_lgpl_22.dll"
+${File} "..\..\..\bin\" "libart_lgpl_2-2.dll"
 ${File} "..\..\..\bin\" "libcairo-2.dll"
 ${File} "..\..\build\win32\bin\" "libdia.dll"
 ${File} "..\..\..\bin\" "iconv.dll"
@@ -280,7 +280,8 @@ ${File} "..\..\plug-ins\cairo\" "cairo.dll"
 ${File} "..\..\plug-ins\cgm\" "cgm.dll"
 ${File} "..\..\objects\chronogram\" "chronogram.dll"
 ${File} "..\..\objects\custom\" "custom.dll"
-${File} "..\..\plug-ins\drs\" "drs.dll"
+# TODO: re-enable drs plug-in once its ready
+#${File} "..\..\plug-ins\drs\" "drs.dll"
 ${File} "..\..\plug-ins\dxf\" "dxf.dll"
 ${File} "..\..\objects\er\" "er.dll"
 ${File} "..\..\objects\flowchart\" "flowchart.dll"
@@ -290,8 +291,7 @@ ${File} "..\..\plug-ins\hpgl\" "hpgl.dll"
 ${File} "..\..\objects\Istar\" "Istar.dll"
 ${File} "..\..\objects\Jackson\" "Jackson.dll"
 ${File} "..\..\objects\KAOS\" "Kaos.dll"
-#TODO: Fix libart plugin/dependencies
-#${File} "..\..\plug-ins\libart\" "libart.dll"
+${File} "..\..\plug-ins\libart\" "libart.dll"
 ${File} "..\..\plug-ins\metapost\" "metapost.dll"
 ${File} "..\..\objects\misc\" "misc.dll"
 ${File} "..\..\objects\network\" "network.dll"
diff --git a/makefile.msc b/makefile.msc
index 7794940..1847bb4 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -5,9 +5,10 @@ full: 	build \
 	build\win32\
 	build\win32\bin \
 	build\win32\bin\dia.exe \
+	build\win32\bin\diaw.exe \
 	build\win32\bin\dia-app.dll \
 	build\win32\bin\libdia.dll \
-	build\win32\bin\libart_lgpl_22.dll \
+	build\win32\bin\libart_lgpl_2-2.dll \
 #	build\win32\bin\libfontconfig-1.dll \
 	build\win32\bin\libgtk-win32-2.0-0.dll \
 	build\win32\bin\libxml2.dll \
@@ -26,6 +27,7 @@ full: 	build \
 	build\win32\dia\istar.dll \
 	build\win32\dia\jackson.dll \
 	build\win32\dia\kaos.dll \
+	build\win32\dia\libart.dll \
 	build\win32\dia\misc.dll \
 	build\win32\dia\network.dll \
 	build\win32\dia\sadt.dll \
@@ -101,12 +103,15 @@ build\win32\lib\locale: build\win32\lib
 
 build\win32\bin\dia.exe: build\win32\bin app\dia.exe
 	copy app\dia.exe build\win32\bin\dia.exe
+	
+build\win32\bin\diaw.exe: build\win32\bin app\diaw.exe
+	copy app\diaw.exe build\win32\bin\diaw.exe
 
 build\win32\bin\dia-app.dll: build\win32\bin app\dia-app.dll
 	copy app\dia-app.dll build\win32\bin\dia-app.dll
 	
-build\win32\bin\libart_lgpl_22.dll: build\win32\bin ..\bin\libart_lgpl_22.dll
-	copy ..\bin\libart_lgpl_22.dll build\win32\bin
+build\win32\bin\libart_lgpl_2-2.dll: build\win32\bin ..\bin\libart_lgpl_2-2.dll
+	copy ..\bin\libart_lgpl_2-2.dll build\win32\bin
 
 build\win32\bin\libfontconfig-1.dll: build\win32\bin ..\bin\libfontconfig-1.dll
 	copy ..\bin\libfontconfig-1.dll build\win32\bin
@@ -161,6 +166,9 @@ build\win32\dia\jackson.dll: build\win32\dia objects\Jackson\jackson.dll
 
 build\win32\dia\kaos.dll: build\win32\dia objects\KAOS\kaos.dll
 	copy objects\KAOS\kaos.dll build\win32\dia
+
+build\win32\dia\libart.dll: build\win32\dia plug-ins\libart\libart.dll
+	copy plug-ins\libart\libart.dll build\win32\dia	
 	
 build\win32\dia\misc.dll: build\win32\dia objects\Misc\misc.dll
 	copy objects\Misc\misc.dll build\win32\dia