From c03ea6d0ce21a15bfa89b79b316084a87ade0c4f Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Wed, 8 Aug 2007 16:34:54 +0000
Subject: [PATCH] use unicode directive

svn path=/trunk/; revision=28246
---
 rosapps/cardsbav/cardsbav.rbuild     | 4 +---
 rosapps/downloader/downloader.rbuild | 4 +---
 rosapps/gettype/gettype.rbuild       | 4 +---
 rosapps/imagesoft/imagesoft.rbuild   | 4 +---
 rosapps/screenshot/screenshot.rbuild | 4 +---
 rosapps/sysutils/ctm/ctm.rbuild      | 4 +---
 rosapps/winver/winver.rbuild         | 4 +---
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/rosapps/cardsbav/cardsbav.rbuild b/rosapps/cardsbav/cardsbav.rbuild
index e80d691e50b..955fa53de43 100644
--- a/rosapps/cardsbav/cardsbav.rbuild
+++ b/rosapps/cardsbav/cardsbav.rbuild
@@ -1,8 +1,6 @@
-<module name="cardsbav" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cardsbav.dll">
+<module name="cardsbav" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cardsbav.dll" unicode="yes">
 	<importlibrary definition="cardsbav.def" />
 	<include base="cardsbav">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
diff --git a/rosapps/downloader/downloader.rbuild b/rosapps/downloader/downloader.rbuild
index bd276dabc9f..4b3a834a937 100644
--- a/rosapps/downloader/downloader.rbuild
+++ b/rosapps/downloader/downloader.rbuild
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <installfile base="system32">downloader.xml</installfile>    
-<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe">
+<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
 	<include base="downloader">.</include>
 	<include base="expat">.</include>
 
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>
 	<define name="_WIN32_IE>0x0600</define>
diff --git a/rosapps/gettype/gettype.rbuild b/rosapps/gettype/gettype.rbuild
index 3ea425f17d0..1f3ba190804 100644
--- a/rosapps/gettype/gettype.rbuild
+++ b/rosapps/gettype/gettype.rbuild
@@ -1,9 +1,7 @@
-<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe">
+<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe" unicode="yes">
 	<include base="gettype">.</include>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>shell32</library>
 	<library>mpr</library>
diff --git a/rosapps/imagesoft/imagesoft.rbuild b/rosapps/imagesoft/imagesoft.rbuild
index 0eec8a139c1..60fb3de44f6 100644
--- a/rosapps/imagesoft/imagesoft.rbuild
+++ b/rosapps/imagesoft/imagesoft.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-	<module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe">
+	<module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe" unicode="yes">
 		<include base="imagesoft">.</include>
-		<define name="UNICODE" />
-		<define name="_UNICODE" />
 		<define name="__USE_W32API" />
 		<define name="_WIN32_IE">0x0600</define>
 		<define name="_WIN32_WINNT">0x0501</define>
diff --git a/rosapps/screenshot/screenshot.rbuild b/rosapps/screenshot/screenshot.rbuild
index 1d2ed1f6d23..bdcb1ee642c 100644
--- a/rosapps/screenshot/screenshot.rbuild
+++ b/rosapps/screenshot/screenshot.rbuild
@@ -1,8 +1,6 @@
-<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe">
+<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe" unicode="yes">
 	<include base="screenshot">.</include>
 	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
diff --git a/rosapps/sysutils/ctm/ctm.rbuild b/rosapps/sysutils/ctm/ctm.rbuild
index 63d4fc7089b..acecfda5aba 100644
--- a/rosapps/sysutils/ctm/ctm.rbuild
+++ b/rosapps/sysutils/ctm/ctm.rbuild
@@ -1,7 +1,5 @@
-<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe">
+<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" unicode="yes">
 	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>epsapi</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/rosapps/winver/winver.rbuild b/rosapps/winver/winver.rbuild
index c05f055ba22..6de37889478 100644
--- a/rosapps/winver/winver.rbuild
+++ b/rosapps/winver/winver.rbuild
@@ -1,8 +1,6 @@
-<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" >
+<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" unicode="yes">
 	<include base="winver">.</include>
 	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>shell32</library>
-- 
2.17.1