diff --git a/Make.rules.in b/Make.rules.in index 9af2d3efe6..dea5fd0333 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -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@ diff --git a/configure b/configure index 4f30c4b1ce..5b032c611e 100755 --- a/configure +++ b/configure @@ -17365,13 +17365,13 @@ fi case $build_os in cygwin*|mingw32*) - LDPATH="PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$PATH\"" + LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"" ;; darwin*|macosx*) - LDPATH="DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$DYLD_LIBRARY_PATH\"" + LDPATH="DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$DYLD_LIBRARY_PATH\"" ;; *) - LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$LD_LIBRARY_PATH\"" + LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" ;; esac @@ -24363,7 +24363,7 @@ MAKE_LIB_RULES=libs/Makelib.rules MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hlink/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" +ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hlink/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -25170,7 +25170,6 @@ do "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; "libs/port/Makefile") CONFIG_FILES="$CONFIG_FILES libs/port/Makefile" ;; - "libs/unicode/Makefile") CONFIG_FILES="$CONFIG_FILES libs/unicode/Makefile" ;; "libs/wine/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wine/Makefile" ;; "libs/wpp/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;; "loader/Makefile") CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;; diff --git a/configure.ac b/configure.ac index eec60ef79a..bf94eaa1cf 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 19967c169a..50e8942db0 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -6,7 +6,6 @@ VPATH = @srcdir@ MODULE = advapi32.dll IMPORTLIB = libadvapi32.$(IMPLIBEXT) IMPORTS = kernel32 ntdll -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ advapi.c \ diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in index b1705c7ab6..5e73a761a1 100644 --- a/dlls/advpack/Makefile.in +++ b/dlls/advpack/Makefile.in @@ -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 \ diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 62e0a8f376..ee42ee14c0 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -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 \ diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index fab7b8a116..793b9257ff 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ acmstream.c \ diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 37689c592d..e5e242d642 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -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 \ diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 3557b95913..b246759c65 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -7,7 +7,6 @@ MODULE = comctl32.dll IMPORTLIB = libcomctl32.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 DELAYIMPORTS = winmm uxtheme -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ animate.c \ diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index 58a8efdc61..d3f28f816f 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ cdlg32.c \ diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index 937fc89a72..e171960485 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = crtdll.dll IMPORTLIB = libcrtdll.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 -EXTRALIBS = $(LIBUNICODE) MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index f26ee55eb4..f03b776fdc 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -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 \ diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in index c2b7329465..2bb731ef3c 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 = $(LIBUNICODE) -ldxguid -luuid +EXTRALIBS = -ldxguid -luuid C_SRCS = \ classfactory.c \ diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index cd91aa96af..eded608c5c 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 = $(LIBUNICODE) -ldxguid -luuid +EXTRALIBS = -ldxguid -luuid C_SRCS = \ buffer.c \ diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index cad167e02b..ddc14a5c09 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = dnsapi.dll IMPORTLIB = libdnsapi.$(IMPLIBEXT) IMPORTS = netapi32 kernel32 -EXTRALIBS = $(LIBUNICODE) @RESOLVLIBS@ +EXTRALIBS = @RESOLVLIBS@ C_SRCS = \ main.c \ diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index ad348c6960..ce6cd4dcae 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 = $(LIBUNICODE) -ldxguid -luuid +EXTRALIBS = -ldxguid -luuid C_SRCS = \ dpclassfactory.c \ diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index bec3759913..0414119918 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -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 \ diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in index 0086e67319..e8f08209b5 100644 --- a/dlls/gdi/Makefile.in +++ b/dlls/gdi/Makefile.in @@ -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 \ diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 02fc3a1bf7..bc17b2f714 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ chm.c \ diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in index 898ceb02d6..08d70df62a 100644 --- a/dlls/hlink/Makefile.in +++ b/dlls/hlink/Makefile.in @@ -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 \ diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index b899a4dfc7..1651dbd5bb 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -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 = \ diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index d12279dc48..561c26550f 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -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 = \ diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 37d8fa2d54..a0d1aa602b 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -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 = \ diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in index 742e59116e..dd71a6ff97 100644 --- a/dlls/kernel/Makefile.in +++ b/dlls/kernel/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = kernel32.dll IMPORTLIB = libkernel32.$(IMPLIBEXT) IMPORTS = ntdll -EXTRALIBS = $(LIBUNICODE) @COREFOUNDATIONLIB@ +EXTRALIBS = @COREFOUNDATIONLIB@ BASEADDRESS = 0x7b800000 SPEC_SRCS16 = \ diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in index 9f470f13f4..acfb207e6d 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lz32/Makefile.in @@ -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 diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index b9a7017d08..1e6e17b0d9 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -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 \ diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index 0863165722..2a95aa64bf 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ info.c \ diff --git a/dlls/mcicda/Makefile.in b/dlls/mcicda/Makefile.in index 99b5b03b88..ce8c1f8590 100644 --- a/dlls/mcicda/Makefile.in +++ b/dlls/mcicda/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mcicda.dll IMPORTS = winmm user32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ mcicda.c diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in index b7938b5add..deca206061 100644 --- a/dlls/mciseq/Makefile.in +++ b/dlls/mciseq/Makefile.in @@ -4,7 +4,6 @@ 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 a6f92df534..924e715574 100644 --- a/dlls/mciwave/Makefile.in +++ b/dlls/mciwave/Makefile.in @@ -4,7 +4,6 @@ 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 347dd9695c..6d56be3127 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = midimap.dll IMPORTS = winmm user32 advapi32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ midimap.c diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index 7d4e013e30..1d4f3194dc 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -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 = \ diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index 5ad211abe0..c74aa24e49 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = mpr.dll IMPORTLIB = libmpr.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ auth.c \ diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in index 67f259882b..dbadc6a97b 100644 --- a/dlls/msacm32.drv/Makefile.in +++ b/dlls/msacm32.drv/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msacm32.drv IMPORTS = msacm32 winmm user32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ wavemap.c diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index 4f3905c33f..d937343983 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = msacm32.dll IMPORTLIB = libmsacm32.$(IMPLIBEXT) IMPORTS = winmm user32 advapi32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ driver.c \ diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index 4e98357667..cdc3745728 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ dmoreg.c \ diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 9e25df8349..0efa862eb4 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -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 = \ diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 04ded54ec8..dabdf1ff13 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -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 \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index dd153be952..3f4b53d3c3 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -7,7 +7,6 @@ MODULE = msvcrt.dll IMPORTLIB = libmsvcrt.$(IMPLIBEXT) IMPORTS = kernel32 ntdll DELAYIMPORTS = user32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ console.c \ diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index 0cda8754f0..d575f4c26d 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -6,7 +6,6 @@ VPATH = @srcdir@ MODULE = msvcrt20.dll IMPORTLIB = libmsvcrt20.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = msvcrt20.c diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index a745ac1f5e..cbf12a3d73 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -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 \ diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 35e2fd346c..479c4ae57e 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -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 = \ diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index fa99da455e..646808feda 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ntdll.dll IMPORTLIB = libntdll.$(IMPLIBEXT) -EXTRALIBS = $(LIBUNICODE) @IOKITLIB@ +EXTRALIBS = @IOKITLIB@ BASEADDRESS = 0x7bc00000 C_SRCS = \ diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in index 8758adc89e..f0499c5908 100644 --- a/dlls/objsel/Makefile.in +++ b/dlls/objsel/Makefile.in @@ -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 \ diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index f247b22d4b..6790289f07 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = odbc32.dll IMPORTLIB = libodbc32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ proxyodbc.c diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in index f7713271e4..926576a25e 100644 --- a/dlls/odbccp32/Makefile.in +++ b/dlls/odbccp32/Makefile.in @@ -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 diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 7ca77f9a17..01b7ea6433 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -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 \ diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index ce81e8e799..b1be07b4dc 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -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 \ diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index b71d0411e7..318728a41c 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = powrprof.dll IMPORTLIB = libpowrprof.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 ntdll -EXTRALIBS = $(LIBUNICODE) C_SRCS = powrprof.c diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 6e52826841..208368f8fc 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -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 \ diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 32e0cd5265..8873a950a5 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -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 \ diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 8f4b22b5e5..3e644dbed6 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -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 = \ diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index b089f8940c..2688cf4074 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -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 \ diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index d27d75e88c..ab88a0a969 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ cproxy.c \ diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 910911e492..593ed88b1e 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = serialui.dll IMPORTLIB = libserialui.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ confdlg.c diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index d94b2599c8..c77f40c72d 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -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 \ diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index a5bf9ff095..137775dadb 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ classinfo.c \ diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index cd9066e29a..5241cbe885 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -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 \ diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 4dbb8d2056..da4d5c76cb 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -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 \ diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 7898aa5d7d..b54592dfa4 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ binding.c \ diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in index fea90ac03e..773a3332b8 100644 --- a/dlls/user/Makefile.in +++ b/dlls/user/Makefile.in @@ -7,7 +7,6 @@ MODULE = user32.dll IMPORTLIB = libuser32.$(IMPLIBEXT) IMPORTS = gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = imm32 -EXTRALIBS = $(LIBUNICODE) SPEC_SRCS16 = \ ddeml.spec \ diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index 5955922db2..b7550a92c4 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = userenv.dll IMPORTS = kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ userenv_main.c diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 355928b814..b73ef9a1c8 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -6,7 +6,6 @@ MODULE = uxtheme.dll IMPORTLIB = libuxtheme.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = msimg32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ draw.c \ diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index cddf024fa1..d56335e288 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = version.dll IMPORTLIB = libversion.$(IMPLIBEXT) IMPORTS = lz32 kernel32 ntdll -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ info.c \ diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index 88612e69b3..e3333f5417 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = winedos.dll IMPORTLIB = libwinedos.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 ntdll -EXTRALIBS = $(LIBUNICODE) SPEC_SRCS16 = wprocs.spec diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 294b6596f1..3c23496b74 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -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 \ diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index e3ff75eaee..af824267d6 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -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 \ diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index e421fd3103..2492e323b2 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -6,7 +6,6 @@ VPATH = @srcdir@ MODULE = winmm.dll IMPORTLIB = libwinmm.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 ntdll -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ driver.c \ diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in index aef4ecbd09..341383c654 100644 --- a/dlls/winmm/joystick/Makefile.in +++ b/dlls/winmm/joystick/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = joystick.drv IMPORTS = winmm user32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ joystick.c diff --git a/dlls/winmm/winearts/Makefile.in b/dlls/winmm/winearts/Makefile.in index 04b7f2862b..f277c83e3a 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@ $(LIBUNICODE) -ldxguid -luuid +EXTRALIBS = @ARTSLIBS@ -ldxguid -luuid C_SRCS = \ arts.c \ diff --git a/dlls/winmm/winejack/Makefile.in b/dlls/winmm/winejack/Makefile.in index 3c4c24bea8..bc22cc93f6 100644 --- a/dlls/winmm/winejack/Makefile.in +++ b/dlls/winmm/winejack/Makefile.in @@ -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 \ diff --git a/dlls/winmm/winenas/Makefile.in b/dlls/winmm/winenas/Makefile.in index d992cf9eb6..340681ffbd 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 = $(LIBUNICODE) -ldxguid -luuid @NASLIBS@ +EXTRALIBS = -ldxguid -luuid @NASLIBS@ C_SRCS = \ audio.c \ diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in index ce7db3b6c8..c3655263e8 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 = $(LIBUNICODE) -ldxguid -luuid +EXTRALIBS = -ldxguid -luuid C_SRCS = \ audio.c \ diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index c657b77836..4ab36b46cb 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -6,7 +6,6 @@ VPATH = @srcdir@ MODULE = winspool.drv IMPORTLIB = libwinspool.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 ntdll -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ info.c \ diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 9ae9023c9e..d8109ec42f 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wnaspi32.dll IMPORTLIB = libwnaspi32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ aspi.c \ diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 5187c38a84..096243486c 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -7,7 +7,6 @@ MODULE = ws2_32.dll IMPORTLIB = libws2_32.$(IMPLIBEXT) IMPORTS = iphlpapi kernel32 ntdll DELAYIMPORTS = user32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ async.c \ diff --git a/libs/Makefile.in b/libs/Makefile.in index 9157b4c540..7c513f67ff 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -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 diff --git a/libs/unicode/Makefile.in b/libs/unicode/Makefile.in deleted file mode 100644 index 31a3b990b4..0000000000 --- a/libs/unicode/Makefile.in +++ /dev/null @@ -1,89 +0,0 @@ -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: diff --git a/libs/unicode/wine_unicode.def b/libs/unicode/wine_unicode.def deleted file mode 100644 index e582d88c29..0000000000 --- a/libs/unicode/wine_unicode.def +++ /dev/null @@ -1,58 +0,0 @@ -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 diff --git a/libs/unicode/wine_unicode.map b/libs/unicode/wine_unicode.map deleted file mode 100644 index 7d98e64f2e..0000000000 --- a/libs/unicode/wine_unicode.map +++ /dev/null @@ -1,61 +0,0 @@ -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: *; -}; diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 7aa49e3437..1d35326fcc 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -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@ diff --git a/libs/unicode/c_037.c b/libs/wine/c_037.c similarity index 100% rename from libs/unicode/c_037.c rename to libs/wine/c_037.c diff --git a/libs/unicode/c_10000.c b/libs/wine/c_10000.c similarity index 100% rename from libs/unicode/c_10000.c rename to libs/wine/c_10000.c diff --git a/libs/unicode/c_10006.c b/libs/wine/c_10006.c similarity index 100% rename from libs/unicode/c_10006.c rename to libs/wine/c_10006.c diff --git a/libs/unicode/c_10007.c b/libs/wine/c_10007.c similarity index 100% rename from libs/unicode/c_10007.c rename to libs/wine/c_10007.c diff --git a/libs/unicode/c_10029.c b/libs/wine/c_10029.c similarity index 100% rename from libs/unicode/c_10029.c rename to libs/wine/c_10029.c diff --git a/libs/unicode/c_1006.c b/libs/wine/c_1006.c similarity index 100% rename from libs/unicode/c_1006.c rename to libs/wine/c_1006.c diff --git a/libs/unicode/c_10079.c b/libs/wine/c_10079.c similarity index 100% rename from libs/unicode/c_10079.c rename to libs/wine/c_10079.c diff --git a/libs/unicode/c_10081.c b/libs/wine/c_10081.c similarity index 100% rename from libs/unicode/c_10081.c rename to libs/wine/c_10081.c diff --git a/libs/unicode/c_1026.c b/libs/wine/c_1026.c similarity index 100% rename from libs/unicode/c_1026.c rename to libs/wine/c_1026.c diff --git a/libs/unicode/c_1250.c b/libs/wine/c_1250.c similarity index 100% rename from libs/unicode/c_1250.c rename to libs/wine/c_1250.c diff --git a/libs/unicode/c_1251.c b/libs/wine/c_1251.c similarity index 100% rename from libs/unicode/c_1251.c rename to libs/wine/c_1251.c diff --git a/libs/unicode/c_1252.c b/libs/wine/c_1252.c similarity index 100% rename from libs/unicode/c_1252.c rename to libs/wine/c_1252.c diff --git a/libs/unicode/c_1253.c b/libs/wine/c_1253.c similarity index 100% rename from libs/unicode/c_1253.c rename to libs/wine/c_1253.c diff --git a/libs/unicode/c_1254.c b/libs/wine/c_1254.c similarity index 100% rename from libs/unicode/c_1254.c rename to libs/wine/c_1254.c diff --git a/libs/unicode/c_1255.c b/libs/wine/c_1255.c similarity index 100% rename from libs/unicode/c_1255.c rename to libs/wine/c_1255.c diff --git a/libs/unicode/c_1256.c b/libs/wine/c_1256.c similarity index 100% rename from libs/unicode/c_1256.c rename to libs/wine/c_1256.c diff --git a/libs/unicode/c_1257.c b/libs/wine/c_1257.c similarity index 100% rename from libs/unicode/c_1257.c rename to libs/wine/c_1257.c diff --git a/libs/unicode/c_1258.c b/libs/wine/c_1258.c similarity index 100% rename from libs/unicode/c_1258.c rename to libs/wine/c_1258.c diff --git a/libs/unicode/c_20127.c b/libs/wine/c_20127.c similarity index 100% rename from libs/unicode/c_20127.c rename to libs/wine/c_20127.c diff --git a/libs/unicode/c_20866.c b/libs/wine/c_20866.c similarity index 100% rename from libs/unicode/c_20866.c rename to libs/wine/c_20866.c diff --git a/libs/unicode/c_20932.c b/libs/wine/c_20932.c similarity index 100% rename from libs/unicode/c_20932.c rename to libs/wine/c_20932.c diff --git a/libs/unicode/c_21866.c b/libs/wine/c_21866.c similarity index 100% rename from libs/unicode/c_21866.c rename to libs/wine/c_21866.c diff --git a/libs/unicode/c_28591.c b/libs/wine/c_28591.c similarity index 100% rename from libs/unicode/c_28591.c rename to libs/wine/c_28591.c diff --git a/libs/unicode/c_28592.c b/libs/wine/c_28592.c similarity index 100% rename from libs/unicode/c_28592.c rename to libs/wine/c_28592.c diff --git a/libs/unicode/c_28593.c b/libs/wine/c_28593.c similarity index 100% rename from libs/unicode/c_28593.c rename to libs/wine/c_28593.c diff --git a/libs/unicode/c_28594.c b/libs/wine/c_28594.c similarity index 100% rename from libs/unicode/c_28594.c rename to libs/wine/c_28594.c diff --git a/libs/unicode/c_28595.c b/libs/wine/c_28595.c similarity index 100% rename from libs/unicode/c_28595.c rename to libs/wine/c_28595.c diff --git a/libs/unicode/c_28596.c b/libs/wine/c_28596.c similarity index 100% rename from libs/unicode/c_28596.c rename to libs/wine/c_28596.c diff --git a/libs/unicode/c_28597.c b/libs/wine/c_28597.c similarity index 100% rename from libs/unicode/c_28597.c rename to libs/wine/c_28597.c diff --git a/libs/unicode/c_28598.c b/libs/wine/c_28598.c similarity index 100% rename from libs/unicode/c_28598.c rename to libs/wine/c_28598.c diff --git a/libs/unicode/c_28599.c b/libs/wine/c_28599.c similarity index 100% rename from libs/unicode/c_28599.c rename to libs/wine/c_28599.c diff --git a/libs/unicode/c_28600.c b/libs/wine/c_28600.c similarity index 100% rename from libs/unicode/c_28600.c rename to libs/wine/c_28600.c diff --git a/libs/unicode/c_28603.c b/libs/wine/c_28603.c similarity index 100% rename from libs/unicode/c_28603.c rename to libs/wine/c_28603.c diff --git a/libs/unicode/c_28604.c b/libs/wine/c_28604.c similarity index 100% rename from libs/unicode/c_28604.c rename to libs/wine/c_28604.c diff --git a/libs/unicode/c_28605.c b/libs/wine/c_28605.c similarity index 100% rename from libs/unicode/c_28605.c rename to libs/wine/c_28605.c diff --git a/libs/unicode/c_28606.c b/libs/wine/c_28606.c similarity index 100% rename from libs/unicode/c_28606.c rename to libs/wine/c_28606.c diff --git a/libs/unicode/c_424.c b/libs/wine/c_424.c similarity index 100% rename from libs/unicode/c_424.c rename to libs/wine/c_424.c diff --git a/libs/unicode/c_437.c b/libs/wine/c_437.c similarity index 100% rename from libs/unicode/c_437.c rename to libs/wine/c_437.c diff --git a/libs/unicode/c_500.c b/libs/wine/c_500.c similarity index 100% rename from libs/unicode/c_500.c rename to libs/wine/c_500.c diff --git a/libs/unicode/c_737.c b/libs/wine/c_737.c similarity index 100% rename from libs/unicode/c_737.c rename to libs/wine/c_737.c diff --git a/libs/unicode/c_775.c b/libs/wine/c_775.c similarity index 100% rename from libs/unicode/c_775.c rename to libs/wine/c_775.c diff --git a/libs/unicode/c_850.c b/libs/wine/c_850.c similarity index 100% rename from libs/unicode/c_850.c rename to libs/wine/c_850.c diff --git a/libs/unicode/c_852.c b/libs/wine/c_852.c similarity index 100% rename from libs/unicode/c_852.c rename to libs/wine/c_852.c diff --git a/libs/unicode/c_855.c b/libs/wine/c_855.c similarity index 100% rename from libs/unicode/c_855.c rename to libs/wine/c_855.c diff --git a/libs/unicode/c_856.c b/libs/wine/c_856.c similarity index 100% rename from libs/unicode/c_856.c rename to libs/wine/c_856.c diff --git a/libs/unicode/c_857.c b/libs/wine/c_857.c similarity index 100% rename from libs/unicode/c_857.c rename to libs/wine/c_857.c diff --git a/libs/unicode/c_860.c b/libs/wine/c_860.c similarity index 100% rename from libs/unicode/c_860.c rename to libs/wine/c_860.c diff --git a/libs/unicode/c_861.c b/libs/wine/c_861.c similarity index 100% rename from libs/unicode/c_861.c rename to libs/wine/c_861.c diff --git a/libs/unicode/c_862.c b/libs/wine/c_862.c similarity index 100% rename from libs/unicode/c_862.c rename to libs/wine/c_862.c diff --git a/libs/unicode/c_863.c b/libs/wine/c_863.c similarity index 100% rename from libs/unicode/c_863.c rename to libs/wine/c_863.c diff --git a/libs/unicode/c_864.c b/libs/wine/c_864.c similarity index 100% rename from libs/unicode/c_864.c rename to libs/wine/c_864.c diff --git a/libs/unicode/c_865.c b/libs/wine/c_865.c similarity index 100% rename from libs/unicode/c_865.c rename to libs/wine/c_865.c diff --git a/libs/unicode/c_866.c b/libs/wine/c_866.c similarity index 100% rename from libs/unicode/c_866.c rename to libs/wine/c_866.c diff --git a/libs/unicode/c_869.c b/libs/wine/c_869.c similarity index 100% rename from libs/unicode/c_869.c rename to libs/wine/c_869.c diff --git a/libs/unicode/c_874.c b/libs/wine/c_874.c similarity index 100% rename from libs/unicode/c_874.c rename to libs/wine/c_874.c diff --git a/libs/unicode/c_875.c b/libs/wine/c_875.c similarity index 100% rename from libs/unicode/c_875.c rename to libs/wine/c_875.c diff --git a/libs/unicode/c_878.c b/libs/wine/c_878.c similarity index 100% rename from libs/unicode/c_878.c rename to libs/wine/c_878.c diff --git a/libs/unicode/c_932.c b/libs/wine/c_932.c similarity index 100% rename from libs/unicode/c_932.c rename to libs/wine/c_932.c diff --git a/libs/unicode/c_936.c b/libs/wine/c_936.c similarity index 100% rename from libs/unicode/c_936.c rename to libs/wine/c_936.c diff --git a/libs/unicode/c_949.c b/libs/wine/c_949.c similarity index 100% rename from libs/unicode/c_949.c rename to libs/wine/c_949.c diff --git a/libs/unicode/c_950.c b/libs/wine/c_950.c similarity index 100% rename from libs/unicode/c_950.c rename to libs/wine/c_950.c diff --git a/libs/unicode/casemap.c b/libs/wine/casemap.c similarity index 100% rename from libs/unicode/casemap.c rename to libs/wine/casemap.c diff --git a/libs/unicode/collation.c b/libs/wine/collation.c similarity index 100% rename from libs/unicode/collation.c rename to libs/wine/collation.c diff --git a/libs/unicode/compose.c b/libs/wine/compose.c similarity index 100% rename from libs/unicode/compose.c rename to libs/wine/compose.c diff --git a/libs/unicode/cpmap.pl b/libs/wine/cpmap.pl similarity index 100% rename from libs/unicode/cpmap.pl rename to libs/wine/cpmap.pl diff --git a/libs/unicode/cptable.c b/libs/wine/cptable.c similarity index 100% rename from libs/unicode/cptable.c rename to libs/wine/cptable.c diff --git a/libs/unicode/defaults b/libs/wine/defaults similarity index 100% rename from libs/unicode/defaults rename to libs/wine/defaults diff --git a/libs/unicode/fold.c b/libs/wine/fold.c similarity index 100% rename from libs/unicode/fold.c rename to libs/wine/fold.c diff --git a/libs/unicode/mbtowc.c b/libs/wine/mbtowc.c similarity index 100% rename from libs/unicode/mbtowc.c rename to libs/wine/mbtowc.c diff --git a/libs/unicode/sortkey.c b/libs/wine/sortkey.c similarity index 100% rename from libs/unicode/sortkey.c rename to libs/wine/sortkey.c diff --git a/libs/unicode/string.c b/libs/wine/string.c similarity index 100% rename from libs/unicode/string.c rename to libs/wine/string.c diff --git a/libs/unicode/utf8.c b/libs/wine/utf8.c similarity index 100% rename from libs/unicode/utf8.c rename to libs/wine/utf8.c diff --git a/libs/unicode/wctomb.c b/libs/wine/wctomb.c similarity index 100% rename from libs/unicode/wctomb.c rename to libs/wine/wctomb.c diff --git a/libs/unicode/wctype.c b/libs/wine/wctype.c similarity index 100% rename from libs/unicode/wctype.c rename to libs/wine/wctype.c diff --git a/libs/wine/wine.def b/libs/wine/wine.def index 7f4ec26b02..6fe8ade9ee 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -9,7 +9,56 @@ EXPORTS __wine_main_argv __wine_main_environ __wine_main_wargv + 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_anon_mmap + 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_dbg_log wine_dbg_printf wine_dbg_sprintf @@ -25,6 +74,7 @@ EXPORTS wine_dlopen wine_dlsym wine_exec_wine_binary + wine_fold_string wine_get_build_dir wine_get_config_dir wine_get_cs @@ -34,10 +84,12 @@ EXPORTS wine_get_fs wine_get_gs wine_get_server_dir + wine_get_sortkey wine_get_ss wine_get_user_name wine_init wine_init_argv0_path + wine_is_dbcs_leadbyte wine_ldt_alloc_entries wine_ldt_alloc_fs wine_ldt_copy @@ -58,3 +110,6 @@ EXPORTS wine_set_fs wine_set_gs wine_switch_to_stack + wine_utf8_mbstowcs + wine_utf8_wcstombs + wine_wctype_table diff --git a/libs/wine/wine.map b/libs/wine/wine.map index a7e6f1d635..84e4e5d535 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -9,7 +9,56 @@ WINE_1.0 __wine_main_argv; __wine_main_environ; __wine_main_wargv; + 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_anon_mmap; + 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_dbg_log; wine_dbg_printf; wine_dbg_sprintf; @@ -25,6 +74,7 @@ WINE_1.0 wine_dlopen; wine_dlsym; wine_exec_wine_binary; + wine_fold_string; wine_get_build_dir; wine_get_config_dir; wine_get_cs; @@ -34,10 +84,12 @@ WINE_1.0 wine_get_fs; wine_get_gs; wine_get_server_dir; + wine_get_sortkey; wine_get_ss; wine_get_user_name; wine_init; wine_init_argv0_path; + wine_is_dbcs_leadbyte; wine_ldt_alloc_entries; wine_ldt_alloc_fs; wine_ldt_copy; @@ -58,6 +110,9 @@ WINE_1.0 wine_set_fs; wine_set_gs; wine_switch_to_stack; + wine_utf8_mbstowcs; + wine_utf8_wcstombs; + wine_wctype_table; local: *; }; diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 2ddd27248f..7c4344a932 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = msiexec.exe APPMODE = -mconsole IMPORTS = msi shell32 ole32 advapi32 user32 kernel32 -EXTRALIBS = $(LIBUNICODE) C_SRCS = \ msiexec.c diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in index 2e5f16e5da..11332b331a 100644 --- a/programs/rundll32/Makefile.in +++ b/programs/rundll32/Makefile.in @@ -5,7 +5,6 @@ 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 e70490bc50..ea8fb2f011 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 = $(LIBUNICODE) -luuid +EXTRALIBS = -luuid C_SRCS = \ winemenubuilder.c diff --git a/server/Makefile.in b/server/Makefile.in index fbcc1ae84b..3e87bb6019 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -60,7 +60,7 @@ all: $(PROGRAMS) $(MANPAGES) LDEXERPATH = @LDEXERPATH@ wineserver: $(OBJS) - $(CC) -o $@ $(LDEXERPATH) $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LDFLAGS) $(LIBS) + $(CC) -o $@ $(LDEXERPATH) $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) install:: $(PROGRAMS) $(MANPAGES) $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) diff --git a/tools/Makefile.in b/tools/Makefile.in index 361278f16b..16e0a63429 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -64,7 +64,7 @@ relpath$(EXEEXT): relpath.o $(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT) $(LDFLAGS) sfnt2fnt$(EXEEXT): sfnt2fnt.o - $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) + $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) bin2res$(EXEEXT): bin2res.o $(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT) $(LDFLAGS) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index e467ec7869..b6d0b5de32 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -25,7 +25,7 @@ mcl.o: mcy.tab.h @MAKE_RULES@ wmc$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) mcy.tab.c mcy.tab.h: mcy.y $(BISON) -d -t $(SRCDIR)/mcy.y -o mcy.tab.c diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 3207b20c87..b58c67ebbf 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -27,7 +27,7 @@ all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a - $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR)/wpp -lwpp $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) parser.tab.c parser.tab.h: parser.y $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c