Alexandre Julliard : Link against libwine_unicode everywhere we use Unicode functions.

Alexandre Julliard julliard at wine.codeweavers.com
Wed May 24 11:29:19 CDT 2006 

Module: wine
Branch: refs/heads/master
Commit: 9ca8a86914ab7659e934b42840862218bb4153c0
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=9ca8a86914ab7659e934b42840862218bb4153c0

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed May 24 18:05:40 2006 +0200

Link against libwine_unicode everywhere we use Unicode functions.

---

 dlls/avifil32/Makefile.in            |    2 +-
 dlls/comdlg32/Makefile.in            |    2 +-
 dlls/dmloader/Makefile.in            |    2 +-
 dlls/dmusic/Makefile.in              |    2 +-
 dlls/dplayx/Makefile.in              |    2 +-
 dlls/hhctrl.ocx/Makefile.in          |    2 +-
 dlls/mciavi32/Makefile.in            |    1 +
 dlls/mciseq/Makefile.in              |    1 +
 dlls/mciwave/Makefile.in             |    1 +
 dlls/midimap/Makefile.in             |    1 +
 dlls/msacm32.drv/Makefile.in         |    1 +
 dlls/msdmo/Makefile.in               |    2 +-
 dlls/odbc32/Makefile.in              |    1 +
 dlls/rpcrt4/Makefile.in              |    2 +-
 dlls/shdocvw/Makefile.in             |    2 +-
 dlls/urlmon/Makefile.in              |    2 +-
 dlls/winmm/winearts/Makefile.in      |    2 +-
 dlls/winmm/winenas/Makefile.in       |    2 +-
 dlls/winmm/wineoss/Makefile.in       |    2 +-
 programs/msiexec/Makefile.in         |    1 +
 programs/rundll32/Makefile.in        |    1 +
 programs/winemenubuilder/Makefile.in |    2 +-
 22 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 793b925..fab7b8a 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = avifil32.dll
 IMPORTLIB = libavifil32.$(IMPLIBEXT)
 IMPORTS   = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32 ntdll
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	acmstream.c \
diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index ee86f05..968a24f 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -6,7 +6,7 @@ MODULE    = comdlg32.dll
 IMPORTLIB = libcomdlg32.$(IMPLIBEXT)
 IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = ole32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	cdlg32.c \
diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in
index 2bb731e..c2b7329 100644
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmloader.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	classfactory.c \
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in
index eded608..cd91aa9 100644
--- a/dlls/dmusic/Makefile.in
+++ b/dlls/dmusic/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic.dll
 IMPORTS   = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	buffer.c \
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index ce6cd4d..ad348c6 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = dplayx.dll
 IMPORTLIB = libdplayx.$(IMPLIBEXT)
 IMPORTS   = winmm ole32 user32 advapi32 kernel32
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	dpclassfactory.c \
diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in
index bc17b2f..02fc3a1 100644
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hhctrl.ocx
 IMPORTS   = advapi32 comctl32 shell32 ole32 oleaut32 user32 gdi32 kernel32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	chm.c \
diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in
index 2a95aa6..0863165 100644
--- a/dlls/mciavi32/Makefile.in
+++ b/dlls/mciavi32/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi32.dll
 IMPORTS   = msvfw32 winmm user32 gdi32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	info.c \
diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in
index deca206..b7938b5 100644
--- a/dlls/mciseq/Makefile.in
+++ b/dlls/mciseq/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.dll
 IMPORTS   = winmm user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	mcimidi.c
diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in
index 924e715..a6f92df 100644
--- a/dlls/mciwave/Makefile.in
+++ b/dlls/mciwave/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.dll
 IMPORTS   = winmm user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	mciwave.c
diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in
index 6d56be3..347dd96 100644
--- a/dlls/midimap/Makefile.in
+++ b/dlls/midimap/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.dll
 IMPORTS   = winmm user32 advapi32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	midimap.c
diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in
index dbadc6a..67f2598 100644
--- a/dlls/msacm32.drv/Makefile.in
+++ b/dlls/msacm32.drv/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.drv
 IMPORTS   = msacm32 winmm user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	wavemap.c
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index cdc3745..4e98357 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msdmo.dll
 IMPORTLIB = libmsdmo.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 advapi32 kernel32 
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	dmoreg.c \
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index 6790289..f247b22 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = odbc32.dll
 IMPORTLIB = libodbc32.$(IMPLIBEXT)
 IMPORTS   = advapi32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	proxyodbc.c
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 2b57ccc..fc36609 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -7,7 +7,7 @@ MODULE    = rpcrt4.dll
 IMPORTLIB = librpcrt4.$(IMPLIBEXT)
 IMPORTS   = iphlpapi advapi32 kernel32 ntdll
 DELAYIMPORTS = secur32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	cproxy.c \
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index 137775d..a5bf9ff 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -7,7 +7,7 @@ MODULE    = shdocvw.dll
 IMPORTLIB = libshdocvw.$(IMPLIBEXT)
 IMPORTS   = shell32 shlwapi user32 advapi32 kernel32
 DELAYIMPORTS = urlmon ole32 oleaut32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	classinfo.c \
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index b54592d..7898aa5 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = urlmon.dll
 IMPORTLIB = liburlmon.$(IMPLIBEXT)
 IMPORTS   = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	binding.c \
diff --git a/dlls/winmm/winearts/Makefile.in b/dlls/winmm/winearts/Makefile.in
index f277c83..04b7f28 100644
--- a/dlls/winmm/winearts/Makefile.in
+++ b/dlls/winmm/winearts/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winearts.drv
 IMPORTS   = winmm user32 kernel32 ntdll
 EXTRAINCL = @ARTSINCL@
-EXTRALIBS = @ARTSLIBS@ -ldxguid -luuid
+EXTRALIBS = @ARTSLIBS@ $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	arts.c \
diff --git a/dlls/winmm/winenas/Makefile.in b/dlls/winmm/winenas/Makefile.in
index 340681f..d992cf9 100644
--- a/dlls/winmm/winenas/Makefile.in
+++ b/dlls/winmm/winenas/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winenas.drv
 IMPORTS   = winmm user32 kernel32
 EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = -ldxguid -luuid @NASLIBS@
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid @NASLIBS@
 
 C_SRCS = \
 	audio.c \
diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in
index c365526..ce7db3b 100644
--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
 IMPORTS   = winmm user32 kernel32
-EXTRALIBS = -ldxguid -luuid
+EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
 
 C_SRCS = \
 	audio.c \
diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in
index 6949d20..22815a0 100644
--- a/programs/msiexec/Makefile.in
+++ b/programs/msiexec/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msiexec.exe
 APPMODE   = -mconsole
 IMPORTS   = msi ole32 advapi32 user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	msiexec.c
diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in
index 11332b3..2e5f16e 100644
--- a/programs/rundll32/Makefile.in
+++ b/programs/rundll32/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = rundll32.exe
 APPMODE   = -mconsole
 IMPORTS   = user32 kernel32
+EXTRALIBS = $(LIBUNICODE)
 
 C_SRCS = \
 	rundll32.c
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index ea8fb2f..e70490b 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows
 IMPORTS   = shell32 ole32 user32 advapi32 kernel32
-EXTRALIBS = -luuid
+EXTRALIBS = $(LIBUNICODE) -luuid
 
 C_SRCS = \
 	winemenubuilder.c

More information about the wine-cvs mailing list