Skip to content

W
wine-winehq
Commit eb8a40c3 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

libs: Merged libwine_unicode into libwine.

Most dlls use libwine_unicode at this point, so there's nothing to gain by having two separate libraries.
parent c0752da9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 295 deletions
Make.rules.in
View file @ eb8a40c3
......@@ -83,7 +83,6 @@ LDPATH = @LDPATH@
DLLDIR = $(TOPOBJDIR)/dlls
LIBDIR = $(TOPOBJDIR)/libs
LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port
LIBUNICODE = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode
LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine
@SET_MAKE@
......
configure.ac
View file @ eb8a40c3
......@@ -1204,11 +1204,11 @@ fi
case $build_os in
cygwin*|mingw32*)
AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$PATH\"") ;;
AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"") ;;
darwin*|macosx*)
AC_SUBST(LDPATH,"DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$DYLD_LIBRARY_PATH\"") ;;
AC_SUBST(LDPATH,"DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$DYLD_LIBRARY_PATH\"") ;;
*)
AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$LD_LIBRARY_PATH\"") ;;
AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"") ;;
esac
dnl Mingw needs explicit msvcrt for linking libwine and winsock for wininet
......@@ -1796,7 +1796,6 @@ fonts/Makefile
include/Makefile
libs/Makefile
libs/port/Makefile
libs/unicode/Makefile
libs/wine/Makefile
libs/wpp/Makefile
loader/Makefile
......
dlls/advapi32/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = advapi32.dll
IMPORTLIB = libadvapi32.$(IMPLIBEXT)
IMPORTS = kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
advapi.c \
......
dlls/advpack/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = advpack.dll
IMPORTLIB = libadvpack.$(IMPLIBEXT)
IMPORTS = setupapi version user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
advpack.c \
......
dlls/atl/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = atl.dll
IMPORTLIB = libatl.$(IMPLIBEXT)
IMPORTS = ole32 shlwapi user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
atl_main.c \
......
dlls/avifil32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = avifil32.dll
IMPORTLIB = libavifil32.$(IMPLIBEXT)
IMPORTS = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
acmstream.c \
......
dlls/comcat/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = comcat.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
comcat_main.c \
......
dlls/comctl32/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,6 @@ MODULE = comctl32.dll
IMPORTLIB = libcomctl32.$(IMPLIBEXT)
IMPORTS = user32 gdi32 advapi32 kernel32
DELAYIMPORTS = winmm uxtheme
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
animate.c \
......
dlls/comdlg32/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,7 @@ MODULE = comdlg32.dll
IMPORTLIB = libcomdlg32.$(IMPLIBEXT)
IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = ole32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
cdlg32.c \
......
dlls/crtdll/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = crtdll.dll
IMPORTLIB = libcrtdll.$(IMPLIBEXT)
IMPORTS = msvcrt kernel32
EXTRALIBS = $(LIBUNICODE)
MODCFLAGS = @BUILTINFLAG@
EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
......
dlls/devenum/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = devenum.dll
IMPORTS = ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE)
EXTRALIBS = -lstrmiids -luuid
C_SRCS = \
createdevenum.c \
......
dlls/dmloader/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmloader.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
classfactory.c \
......
dlls/dmusic/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmusic.dll
IMPORTS = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
buffer.c \
......
dlls/dnsapi/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = dnsapi.dll
IMPORTLIB = libdnsapi.$(IMPLIBEXT)
IMPORTS = netapi32 kernel32
EXTRALIBS = $(LIBUNICODE) @RESOLVLIBS@
EXTRALIBS = @RESOLVLIBS@
C_SRCS = \
main.c \
......
dlls/dplayx/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = dplayx.dll
IMPORTLIB = libdplayx.$(IMPLIBEXT)
IMPORTS = winmm ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
dpclassfactory.c \
......
dlls/dxdiagn/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dxdiagn.dll
IMPORTS = version ole32 oleaut32 user32 advapi32 kernel32
EXTRALIBS = -lstrmiids -ldxguid -luuid $(LIBUNICODE)
EXTRALIBS = -lstrmiids -ldxguid -luuid
C_SRCS = \
container.c \
......
dlls/gdi/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = gdi32.dll
IMPORTLIB = libgdi32.$(IMPLIBEXT)
IMPORTS = advapi32 kernel32 ntdll
EXTRAINCL = @FREETYPEINCL@
EXTRALIBS = $(LIBUNICODE) @ICULIBS@
EXTRALIBS = @ICULIBS@
SPEC_SRCS16 = \
dispdib.spec \
......
dlls/hhctrl.ocx/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = hhctrl.ocx
IMPORTS = advapi32 comctl32 shell32 ole32 oleaut32 user32 gdi32 kernel32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
chm.c \
......
dlls/hlink/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = hlink.dll
IMPORTS = ole32 advapi32 kernel32
DELAYIMPORTS = urlmon
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
C_SRCS = \
browse_ctx.c \
......
dlls/infosoft/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = infosoft.dll
IMPORTS = ole32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
......
dlls/inseng/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = inseng.dll
IMPORTS = ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
......
dlls/itss/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = itss.dll
IMPORTS = ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
......
dlls/kernel/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = kernel32.dll
IMPORTLIB = libkernel32.$(IMPLIBEXT)
IMPORTS = ntdll
EXTRALIBS = $(LIBUNICODE) @COREFOUNDATIONLIB@
EXTRALIBS = @COREFOUNDATIONLIB@
BASEADDRESS = 0x7b800000
SPEC_SRCS16 = \
......
dlls/lz32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = lz32.dll
IMPORTLIB = liblz32.$(IMPLIBEXT)
IMPORTS = kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = lzexpand_main.c
C_SRCS16 = lzexpand16.c
......
dlls/mapi32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = mapi32.dll
IMPORTLIB = libmapi32.$(IMPLIBEXT)
IMPORTS = shlwapi shell32 ole32 user32 kernel32 ntdll
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
C_SRCS = \
imalloc.c \
......
dlls/mciavi32/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciavi32.dll
IMPORTS = msvfw32 winmm user32 gdi32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
info.c \
......
dlls/mcicda/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mcicda.dll
IMPORTS = winmm user32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
mcicda.c
......
dlls/mciseq/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciseq.dll
IMPORTS = winmm user32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
mcimidi.c
......
dlls/mciwave/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciwave.dll
IMPORTS = winmm user32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
mciwave.c
......
dlls/midimap/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = midimap.dll
IMPORTS = winmm user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
midimap.c
......
dlls/mlang/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = mlang.dll
IMPORTLIB = libmlang.$(IMPLIBEXT)
IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
......
dlls/mpr/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = mpr.dll
IMPORTLIB = libmpr.$(IMPLIBEXT)
IMPORTS = user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
auth.c \
......
dlls/msacm32.drv/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msacm32.drv
IMPORTS = msacm32 winmm user32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
wavemap.c
......
dlls/msacm32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = msacm32.dll
IMPORTLIB = libmsacm32.$(IMPLIBEXT)
IMPORTS = winmm user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
driver.c \
......
dlls/msdmo/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = msdmo.dll
IMPORTLIB = libmsdmo.$(IMPLIBEXT)
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
dmoreg.c \
......
dlls/mshtml/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = mshtml.dll
IMPORTLIB = libmshtml.$(IMPLIBEXT)
IMPORTS = urlmon ole32 oleaut32 user32 gdi32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) -lstrmiids -luuid
EXTRALIBS = -lstrmiids -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
......
dlls/msi/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = msi.dll
IMPORTLIB = libmsi.$(IMPLIBEXT)
IMPORTS = comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
C_SRCS = \
action.c \
......
dlls/msvcrt/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,6 @@ MODULE = msvcrt.dll
IMPORTLIB = libmsvcrt.$(IMPLIBEXT)
IMPORTS = kernel32 ntdll
DELAYIMPORTS = user32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
console.c \
......
dlls/msvcrt20/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = msvcrt20.dll
IMPORTLIB = libmsvcrt20.$(IMPLIBEXT)
IMPORTS = msvcrt kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = msvcrt20.c
......
dlls/msvfw32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = msvfw32.dll
IMPORTLIB = libmsvfw32.$(IMPLIBEXT)
IMPORTS = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
mciwnd.c \
......
dlls/msxml3/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msxml3.dll
IMPORTS = urlmon shlwapi oleaut32 ole32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid $(LIBUNICODE) @XML2LIBS@ @XSLTLIBS@
EXTRALIBS = -luuid @XML2LIBS@ @XSLTLIBS@
EXTRAINCL = @XML2INCL@ @XSLTINCL@
C_SRCS = \
......
dlls/ntdll/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ntdll.dll
IMPORTLIB = libntdll.$(IMPLIBEXT)
EXTRALIBS = $(LIBUNICODE) @IOKITLIB@
EXTRALIBS = @IOKITLIB@
BASEADDRESS = 0x7bc00000
C_SRCS = \
......
dlls/objsel/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = objsel.dll
IMPORTS = ole32 oleaut32 user32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE)
EXTRALIBS = -lstrmiids -luuid
C_SRCS = \
factory.c \
......
dlls/odbc32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = odbc32.dll
IMPORTLIB = libodbc32.$(IMPLIBEXT)
IMPORTS = advapi32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
proxyodbc.c
......
dlls/odbccp32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = odbccp32.dll
IMPORTLIB = libodbccp32.$(IMPLIBEXT)
IMPORTS = ole32 advapi32 kernel32
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
C_SRCS = \
odbccp32.c
......
dlls/ole32/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = ole32.dll
IMPORTLIB = libole32.$(IMPLIBEXT)
IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
C_SRCS = \
antimoniker.c \
......
dlls/oleaut32/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = oleaut32.dll
IMPORTLIB = liboleaut32.$(IMPLIBEXT)
IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = comctl32 urlmon
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
connpt.c \
......
dlls/powrprof/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = powrprof.dll
IMPORTLIB = libpowrprof.$(IMPLIBEXT)
IMPORTS = advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
C_SRCS = powrprof.c
......
dlls/qcap/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = qcap.dll
IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE)
EXTRALIBS = -lstrmiids -luuid
C_SRCS = \
capturegraph.c \
......
dlls/quartz/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = quartz.dll
IMPORTLIB = libquartz.$(IMPLIBEXT)
IMPORTS = dsound msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE)
EXTRALIBS = -lstrmiids -luuid
C_SRCS = \
acmwrapper.c \
......
dlls/query/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = query.dll
IMPORTS = ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
......
dlls/riched20/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = riched20.dll
IMPORTLIB = libriched20.$(IMPLIBEXT)
IMPORTS = ole32 user32 gdi32 kernel32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
caret.c \
......
dlls/rpcrt4/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = rpcrt4.dll
IMPORTLIB = librpcrt4.$(IMPLIBEXT)
IMPORTS = iphlpapi advapi32 kernel32 ntdll
DELAYIMPORTS = secur32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
cproxy.c \
......
dlls/serialui/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = serialui.dll
IMPORTLIB = libserialui.$(IMPLIBEXT)
IMPORTS = user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
confdlg.c
......
dlls/setupapi/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = setupapi.dll
IMPORTLIB = libsetupapi.$(IMPLIBEXT)
IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll
DELAYIMPORTS = shell32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
devinst.c \
......
dlls/shdocvw/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = shdocvw.dll
IMPORTLIB = libshdocvw.$(IMPLIBEXT)
IMPORTS = shell32 shlwapi user32 advapi32 kernel32
DELAYIMPORTS = urlmon ole32 oleaut32
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
classinfo.c \
......
dlls/shell32/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = shell32.dll
IMPORTLIB = libshell32.$(IMPLIBEXT)
IMPORTS = shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = ole32 oleaut32
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
C_SRCS = \
authors.c \
......
dlls/shlwapi/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = shlwapi.dll
IMPORTLIB = libshlwapi.$(IMPLIBEXT)
IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = oleaut32
EXTRALIBS = -luuid $(LIBUNICODE)
EXTRALIBS = -luuid
C_SRCS = \
assoc.c \
......
dlls/urlmon/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = urlmon.dll
IMPORTLIB = liburlmon.$(IMPLIBEXT)
IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRALIBS = -luuid
C_SRCS = \
binding.c \
......
dlls/user/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,6 @@ MODULE = user32.dll
IMPORTLIB = libuser32.$(IMPLIBEXT)
IMPORTS = gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = imm32
EXTRALIBS = $(LIBUNICODE)
SPEC_SRCS16 = \
ddeml.spec \
......
dlls/userenv/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = userenv.dll
IMPORTS = kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
userenv_main.c
......
dlls/uxtheme/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,6 @@ MODULE = uxtheme.dll
IMPORTLIB = libuxtheme.$(IMPLIBEXT)
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = msimg32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
draw.c \
......
dlls/version/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = version.dll
IMPORTLIB = libversion.$(IMPLIBEXT)
IMPORTS = lz32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
info.c \
......
dlls/winedos/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = winedos.dll
IMPORTLIB = libwinedos.$(IMPLIBEXT)
IMPORTS = user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
SPEC_SRCS16 = wprocs.spec
......
dlls/winex11.drv/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = winex11.drv
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUNICODE) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
C_SRCS = \
bitblt.c \
......
dlls/wininet/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,7 @@ MODULE = wininet.dll
IMPORTLIB = libwininet.$(IMPLIBEXT)
IMPORTS = mpr shlwapi shell32 user32 advapi32 kernel32 ntdll
DELAYIMPORTS = crypt32
EXTRALIBS = $(LIBUNICODE) @SOCKETLIBS@
EXTRALIBS = @SOCKETLIBS@
C_SRCS = \
cookie.c \
......
dlls/winmm/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = winmm.dll
IMPORTLIB = libwinmm.$(IMPLIBEXT)
IMPORTS = user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
driver.c \
......
dlls/winmm/joystick/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = joystick.drv
IMPORTS = winmm user32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
joystick.c
......
dlls/winmm/winearts/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = winearts.drv
IMPORTS = winmm user32 kernel32 ntdll
EXTRAINCL = @ARTSINCL@
EXTRALIBS = @ARTSLIBS@ $(LIBUNICODE) -ldxguid -luuid
EXTRALIBS = @ARTSLIBS@ -ldxguid -luuid
C_SRCS = \
arts.c \
......
dlls/winmm/winejack/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winejack.drv
IMPORTS = winmm user32 kernel32
EXTRALIBS = -ldxguid -luuid $(LIBUNICODE)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
audio.c \
......
dlls/winmm/winenas/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = winenas.drv
IMPORTS = winmm user32 kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid @NASLIBS@
EXTRALIBS = -ldxguid -luuid @NASLIBS@
C_SRCS = \
audio.c \
......
dlls/winmm/wineoss/Makefile.in
View file @ eb8a40c3
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wineoss.drv
IMPORTS = winmm user32 kernel32
EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
audio.c \
......
dlls/winspool.drv/Makefile.in
View file @ eb8a40c3
......@@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = winspool.drv
IMPORTLIB = libwinspool.$(IMPLIBEXT)
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
info.c \
......
dlls/wnaspi32/Makefile.in
View file @ eb8a40c3
......@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = wnaspi32.dll
IMPORTLIB = libwnaspi32.$(IMPLIBEXT)
IMPORTS = advapi32 kernel32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
aspi.c \
......
dlls/ws2_32/Makefile.in
View file @ eb8a40c3
......@@ -7,7 +7,6 @@ MODULE = ws2_32.dll
IMPORTLIB = libws2_32.$(IMPLIBEXT)
IMPORTS = iphlpapi kernel32 ntdll
DELAYIMPORTS = user32
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
async.c \
......
libs/Makefile.in
View file @ eb8a40c3
......@@ -6,18 +6,15 @@ MODULE = none
SUBDIRS = \
port \
unicode \
wine \
wpp
INSTALLSUBDIRS = \
unicode \
wine
SYMLINKS = \
libwine.$(LIBEXT) \
libwine_port.a \
libwine_unicode.$(LIBEXT) \
libwpp.a
@MAKE_RULES@
......@@ -37,9 +34,6 @@ clean::
libwine.so libwine.so.1 libwine.dll libwine.dylib libwine.1.dylib libwine.a: wine/libwine.$(LIBEXT)
$(RM) $@ && $(LN_S) wine/$@ $@
libwine_unicode.so libwine_unicode.so.1 libwine_unicode.dll libwine_unicode.dylib libwine_unicode.1.dylib libwine_unicode.a: unicode/libwine_unicode.$(LIBEXT)
$(RM) $@ && $(LN_S) unicode/$@ $@
libwine_port.a: port/libwine_port.a
$(RM) $@ && $(LN_S) port/$@ $@
......@@ -49,7 +43,6 @@ libwpp.a: wpp/libwpp.a
# Directory dependencies
wine/libwine.$(LIBEXT): wine
unicode/libwine_unicode.$(LIBEXT): unicode
port/libwine_port.a: port
wpp/libwpp.a: wpp
......
libs/unicode/Makefile.in deleted 100644 → 0
View file @ c0752da9
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBRARY = wine_unicode
SOVERSION = 1
VERSCRIPT = $(SRCDIR)/wine_unicode.map
EXTRADEFS = -D__WINESRC__ -DNO_LIBWINE_PORT -DWINE_UNICODE_API=""
CODEPAGES = \
037 \
424 \
437 \
500 \
737 \
775 \
850 \
852 \
855 \
856 \
857 \
860 \
861 \
862 \
863 \
864 \
865 \
866 \
869 \
874 \
875 \
878 \
932 \
936 \
949 \
950 \
1006 \
1026 \
1250 \
1251 \
1252 \
1253 \
1254 \
1255 \
1256 \
1257 \
1258 \
10000 \
10006 \
10007 \
10029 \
10079 \
10081 \
20127 \
20866 \
20932 \
21866 \
28591 \
28592 \
28593 \
28594 \
28595 \
28596 \
28597 \
28598 \
28599 \
28600 \
28603 \
28604 \
28605 \
28606
C_SRCS = \
casemap.c \
collation.c \
compose.c \
cptable.c \
fold.c \
mbtowc.c \
sortkey.c \
string.c \
utf8.c \
wctomb.c \
wctype.c \
$(CODEPAGES:%=c_%.c)
@MAKE_LIB_RULES@
### Dependencies:
libs/unicode/wine_unicode.def deleted 100644 → 0
View file @ c0752da9
LIBRARY libwine_unicode.dll
EXPORTS
atoiW
atolW
get_char_typeW
isalnumW
isalphaW
iscntrlW
isdigitW
isgraphW
islowerW
isprintW
ispunctW
isspaceW
isupperW
isxdigitW
memchrW
memicmpW
memrchrW
snprintfW
sprintfW
strcatW
strchrW
strcmpW
strcmpiW
strcpyW
strcspnW
strlenW
strlwrW
strncmpW
strncmpiW
strpbrkW
strrchrW
strspnW
strstrW
strtolW
strtoulW
struprW
tolowerW
toupperW
vsnprintfW
vsprintfW
wine_casemap_lower
wine_casemap_upper
wine_compare_string
wine_cp_enum_table
wine_cp_get_table
wine_cp_mbstowcs
wine_cp_wcstombs
wine_cpsymbol_mbstowcs
wine_cpsymbol_wcstombs
wine_fold_string
wine_get_sortkey
wine_is_dbcs_leadbyte
wine_utf8_mbstowcs
wine_utf8_wcstombs
wine_wctype_table
libs/unicode/wine_unicode.map deleted 100644 → 0
View file @ c0752da9
WINE_1.0
{
global:
atoiW;
atolW;
get_char_typeW;
isalnumW;
isalphaW;
iscntrlW;
isdigitW;
isgraphW;
islowerW;
isprintW;
ispunctW;
isspaceW;
isupperW;
isxdigitW;
memchrW;
memicmpW;
memrchrW;
snprintfW;
sprintfW;
strcatW;
strchrW;
strcmpW;
strcmpiW;
strcpyW;
strcspnW;
strlenW;
strlwrW;
strncmpW;
strncmpiW;
strpbrkW;
strrchrW;
strspnW;
strstrW;
strtolW;
strtoulW;
struprW;
tolowerW;
toupperW;
vsnprintfW;
vsprintfW;
wine_casemap_lower;
wine_casemap_upper;
wine_compare_string;
wine_cp_enum_table;
wine_cp_get_table;
wine_cp_mbstowcs;
wine_cp_wcstombs;
wine_cpsymbol_mbstowcs;
wine_cpsymbol_wcstombs;
wine_fold_string;
wine_get_sortkey;
wine_is_dbcs_leadbyte;
wine_utf8_mbstowcs;
wine_utf8_wcstombs;
wine_wctype_table;
local: *;
};
libs/wine/Makefile.in
View file @ eb8a40c3
......@@ -5,16 +5,88 @@ VPATH = @srcdir@
LIBRARY = wine
SOVERSION = 1
VERSCRIPT = $(SRCDIR)/wine.map
EXTRADEFS = -D__WINESRC__
EXTRADEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@
C_SRCS = \
casemap.c \
collation.c \
compose.c \
config.c \
cptable.c \
debug.c \
fold.c \
ldt.c \
loader.c \
mbtowc.c \
mmap.c \
port.c
port.c \
sortkey.c \
string.c \
utf8.c \
wctomb.c \
wctype.c \
c_037.c \
c_424.c \
c_437.c \
c_500.c \
c_737.c \
c_775.c \
c_850.c \
c_852.c \
c_855.c \
c_856.c \
c_857.c \
c_860.c \
c_861.c \
c_862.c \
c_863.c \
c_864.c \
c_865.c \
c_866.c \
c_869.c \
c_874.c \
c_875.c \
c_878.c \
c_932.c \
c_936.c \
c_949.c \
c_950.c \
c_1006.c \
c_1026.c \
c_1250.c \
c_1251.c \
c_1252.c \
c_1253.c \
c_1254.c \
c_1255.c \
c_1256.c \
c_1257.c \
c_1258.c \
c_10000.c \
c_10006.c \
c_10007.c \
c_10029.c \
c_10079.c \
c_10081.c \
c_20127.c \
c_20866.c \
c_20932.c \
c_21866.c \
c_28591.c \
c_28592.c \
c_28593.c \
c_28594.c \
c_28595.c \
c_28596.c \
c_28597.c \
c_28598.c \
c_28599.c \
c_28600.c \
c_28603.c \
c_28604.c \
c_28605.c \
c_28606.c
@MAKE_LIB_RULES@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment