diff --git a/Make.rules.in b/Make.rules.in index 59ad06c0245..d2ed28adb84 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -72,7 +72,7 @@ LDPATH = @LDPATH@ DLLDIR = $(TOPOBJDIR)/dlls LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port LIBWINE = -L$(TOPOBJDIR)/library -lwine -LIBUNICODE = -L$(TOPOBJDIR)/unicode -lwine_unicode +LIBUNICODE = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode LIBUUID = -L$(TOPOBJDIR)/libs/uuid -lwine_uuid @SET_MAKE@ diff --git a/Makefile.in b/Makefile.in index b68641b9add..3c286b70120 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,8 +36,7 @@ SUBDIRS = \ miscemu \ programs \ server \ - tools \ - unicode + tools # Sub-directories to install for install-lib INSTALLLIBSUBDIRS = \ @@ -45,8 +44,7 @@ INSTALLLIBSUBDIRS = \ library \ miscemu \ programs \ - server \ - unicode + server # Sub-directories to install for install-dev INSTALLDEVSUBDIRS = include tools @@ -117,18 +115,17 @@ $(INSTALLBOTHSUBDIRS:%=%/__uninstall__): dummy # Dependencies between directories all: $(SUBDIRS) -dlls: library libs tools unicode -server: library libs tools unicode -miscemu programs: dlls library libs tools unicode -tools: library libs unicode +dlls: library libs tools +server: library libs tools +miscemu programs: dlls library libs tools +tools: library libs -dlls/__install-lib__ dlls/__install-dev__: library libs tools unicode -server/__install__: library libs tools unicode -miscemu/__install__ programs/__install__: library libs tools unicode dlls/__install-lib__ +dlls/__install-lib__ dlls/__install-dev__: library libs tools +server/__install__: library libs tools +miscemu/__install__ programs/__install__: library libs tools dlls/__install-lib__ library/__install__: library libs/__install__: libs tools/__install__: tools -unicode/__install__: unicode # Test rules diff --git a/configure b/configure index 7d9c097b742..6bd305b8f39 100755 --- a/configure +++ b/configure @@ -11895,10 +11895,10 @@ fi case $build_os in cygwin*|mingw32*) - LDPATH="PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$PATH\"" + LDPATH="PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$PATH\"" ;; *) - LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$LD_LIBRARY_PATH\"" + LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$LD_LIBRARY_PATH\"" ;; esac @@ -15683,7 +15683,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmusic/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile libs/Makefile libs/port/Makefile libs/uuid/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile unicode/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmusic/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -16344,6 +16344,7 @@ do "library/Makefile" ) CONFIG_FILES="$CONFIG_FILES library/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/uuid/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/uuid/Makefile" ;; "miscemu/Makefile" ) CONFIG_FILES="$CONFIG_FILES miscemu/Makefile" ;; "programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; @@ -16382,7 +16383,6 @@ do "tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;; "tools/wpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wpp/Makefile" ;; "tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;; - "unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES unicode/Makefile" ;; "controls" ) CONFIG_COMMANDS="$CONFIG_COMMANDS controls" ;; "dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;; "dlls/ddraw/dclipper" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dclipper" ;; diff --git a/configure.ac b/configure.ac index e7eb162c893..90936510b2a 100644 --- a/configure.ac +++ b/configure.ac @@ -825,9 +825,9 @@ fi case $build_os in cygwin*|mingw32*) - AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$PATH\"") ;; + AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$PATH\"") ;; *) - AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$LD_LIBRARY_PATH\"") ;; + AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$LD_LIBRARY_PATH\"") ;; esac dnl Mingw needs explicit msvcrt for linking libwine @@ -1516,6 +1516,7 @@ include/Makefile library/Makefile libs/Makefile libs/port/Makefile +libs/unicode/Makefile libs/uuid/Makefile miscemu/Makefile programs/Makefile @@ -1553,8 +1554,7 @@ tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile -tools/wrc/Makefile -unicode/Makefile]) +tools/wrc/Makefile]) AC_OUTPUT diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 8d7c4f91992..192ccd43cd7 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -49,7 +49,7 @@ $(SPEC_DEF): $(WINEBUILD) # Rules for checking that no imports are missing -CHECKLINK_RPATH = dlls library unicode +CHECKLINK_RPATH = dlls library libs/unicode .PHONY: checklink16 $(WIN16_FILES:%=__checklink16__%) diff --git a/libs/Makefile.in b/libs/Makefile.in index f0b98be35b3..bf4a4600399 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -6,10 +6,11 @@ MODULE = none SUBDIRS = \ port \ + unicode \ uuid # Sub-directories to install for install-lib -INSTALLLIBSUBDIRS = +INSTALLLIBSUBDIRS = unicode # Sub-directories to install for install-dev INSTALLDEVSUBDIRS = uuid diff --git a/libs/unicode/.cvsignore b/libs/unicode/.cvsignore new file mode 100644 index 00000000000..c5581565cc6 --- /dev/null +++ b/libs/unicode/.cvsignore @@ -0,0 +1,2 @@ +Makefile +libwine_unicode.so.1 diff --git a/unicode/Makefile.in b/libs/unicode/Makefile.in similarity index 92% rename from unicode/Makefile.in rename to libs/unicode/Makefile.in index dd85d6e53b4..289668fcdff 100644 --- a/unicode/Makefile.in +++ b/libs/unicode/Makefile.in @@ -1,12 +1,12 @@ DEFS = @DLLFLAGS@ -D__WINESRC__ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. +TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none -SOVERSION = 1.0 -SONAME = libwine_unicode.so +SOVERSION = 1 +SONAME = libwine_unicode.so.$(SOVERSION) CODEPAGES = \ 037 \ @@ -96,7 +96,6 @@ libwine_unicode.a: $(OBJS) $(AR) $@ $(OBJS) $(RANLIB) $@ -# --export-all doesn't work correctly because of dllwrap's bug libwine_unicode.dll: $(OBJS) wine_unicode.def $(DLLWRAP) --def $(SRCDIR)/wine_unicode.def --implib libwine_unicode.a -o libwine_unicode.dll $(OBJS) @@ -121,6 +120,6 @@ uninstall:: $(RM) $(libdir)/libwine_unicode.a $(libdir)/libwine_unicode.dll $(libdir)/libwine_unicode.so $(libdir)/libwine_unicode.so.$(SOVERSION) clean:: - $(RM) libwine_unicode.so.$(SOVERSION) + $(RM) libwine_unicode.so.$(SOVERSION) libwine_unicode.dll ### Dependencies: diff --git a/unicode/c_037.c b/libs/unicode/c_037.c similarity index 100% rename from unicode/c_037.c rename to libs/unicode/c_037.c diff --git a/unicode/c_042.c b/libs/unicode/c_042.c similarity index 100% rename from unicode/c_042.c rename to libs/unicode/c_042.c diff --git a/unicode/c_10000.c b/libs/unicode/c_10000.c similarity index 100% rename from unicode/c_10000.c rename to libs/unicode/c_10000.c diff --git a/unicode/c_10006.c b/libs/unicode/c_10006.c similarity index 100% rename from unicode/c_10006.c rename to libs/unicode/c_10006.c diff --git a/unicode/c_10007.c b/libs/unicode/c_10007.c similarity index 100% rename from unicode/c_10007.c rename to libs/unicode/c_10007.c diff --git a/unicode/c_10029.c b/libs/unicode/c_10029.c similarity index 100% rename from unicode/c_10029.c rename to libs/unicode/c_10029.c diff --git a/unicode/c_1006.c b/libs/unicode/c_1006.c similarity index 100% rename from unicode/c_1006.c rename to libs/unicode/c_1006.c diff --git a/unicode/c_10079.c b/libs/unicode/c_10079.c similarity index 100% rename from unicode/c_10079.c rename to libs/unicode/c_10079.c diff --git a/unicode/c_10081.c b/libs/unicode/c_10081.c similarity index 100% rename from unicode/c_10081.c rename to libs/unicode/c_10081.c diff --git a/unicode/c_1026.c b/libs/unicode/c_1026.c similarity index 100% rename from unicode/c_1026.c rename to libs/unicode/c_1026.c diff --git a/unicode/c_1250.c b/libs/unicode/c_1250.c similarity index 100% rename from unicode/c_1250.c rename to libs/unicode/c_1250.c diff --git a/unicode/c_1251.c b/libs/unicode/c_1251.c similarity index 100% rename from unicode/c_1251.c rename to libs/unicode/c_1251.c diff --git a/unicode/c_1252.c b/libs/unicode/c_1252.c similarity index 100% rename from unicode/c_1252.c rename to libs/unicode/c_1252.c diff --git a/unicode/c_1253.c b/libs/unicode/c_1253.c similarity index 100% rename from unicode/c_1253.c rename to libs/unicode/c_1253.c diff --git a/unicode/c_1254.c b/libs/unicode/c_1254.c similarity index 100% rename from unicode/c_1254.c rename to libs/unicode/c_1254.c diff --git a/unicode/c_1255.c b/libs/unicode/c_1255.c similarity index 100% rename from unicode/c_1255.c rename to libs/unicode/c_1255.c diff --git a/unicode/c_1256.c b/libs/unicode/c_1256.c similarity index 100% rename from unicode/c_1256.c rename to libs/unicode/c_1256.c diff --git a/unicode/c_1257.c b/libs/unicode/c_1257.c similarity index 100% rename from unicode/c_1257.c rename to libs/unicode/c_1257.c diff --git a/unicode/c_1258.c b/libs/unicode/c_1258.c similarity index 100% rename from unicode/c_1258.c rename to libs/unicode/c_1258.c diff --git a/unicode/c_20866.c b/libs/unicode/c_20866.c similarity index 100% rename from unicode/c_20866.c rename to libs/unicode/c_20866.c diff --git a/unicode/c_20932.c b/libs/unicode/c_20932.c similarity index 100% rename from unicode/c_20932.c rename to libs/unicode/c_20932.c diff --git a/unicode/c_28591.c b/libs/unicode/c_28591.c similarity index 100% rename from unicode/c_28591.c rename to libs/unicode/c_28591.c diff --git a/unicode/c_28592.c b/libs/unicode/c_28592.c similarity index 100% rename from unicode/c_28592.c rename to libs/unicode/c_28592.c diff --git a/unicode/c_28593.c b/libs/unicode/c_28593.c similarity index 100% rename from unicode/c_28593.c rename to libs/unicode/c_28593.c diff --git a/unicode/c_28594.c b/libs/unicode/c_28594.c similarity index 100% rename from unicode/c_28594.c rename to libs/unicode/c_28594.c diff --git a/unicode/c_28595.c b/libs/unicode/c_28595.c similarity index 100% rename from unicode/c_28595.c rename to libs/unicode/c_28595.c diff --git a/unicode/c_28596.c b/libs/unicode/c_28596.c similarity index 100% rename from unicode/c_28596.c rename to libs/unicode/c_28596.c diff --git a/unicode/c_28597.c b/libs/unicode/c_28597.c similarity index 100% rename from unicode/c_28597.c rename to libs/unicode/c_28597.c diff --git a/unicode/c_28598.c b/libs/unicode/c_28598.c similarity index 100% rename from unicode/c_28598.c rename to libs/unicode/c_28598.c diff --git a/unicode/c_28599.c b/libs/unicode/c_28599.c similarity index 100% rename from unicode/c_28599.c rename to libs/unicode/c_28599.c diff --git a/unicode/c_28600.c b/libs/unicode/c_28600.c similarity index 100% rename from unicode/c_28600.c rename to libs/unicode/c_28600.c diff --git a/unicode/c_28603.c b/libs/unicode/c_28603.c similarity index 100% rename from unicode/c_28603.c rename to libs/unicode/c_28603.c diff --git a/unicode/c_28604.c b/libs/unicode/c_28604.c similarity index 100% rename from unicode/c_28604.c rename to libs/unicode/c_28604.c diff --git a/unicode/c_28605.c b/libs/unicode/c_28605.c similarity index 100% rename from unicode/c_28605.c rename to libs/unicode/c_28605.c diff --git a/unicode/c_28606.c b/libs/unicode/c_28606.c similarity index 100% rename from unicode/c_28606.c rename to libs/unicode/c_28606.c diff --git a/unicode/c_424.c b/libs/unicode/c_424.c similarity index 100% rename from unicode/c_424.c rename to libs/unicode/c_424.c diff --git a/unicode/c_437.c b/libs/unicode/c_437.c similarity index 100% rename from unicode/c_437.c rename to libs/unicode/c_437.c diff --git a/unicode/c_500.c b/libs/unicode/c_500.c similarity index 100% rename from unicode/c_500.c rename to libs/unicode/c_500.c diff --git a/unicode/c_737.c b/libs/unicode/c_737.c similarity index 100% rename from unicode/c_737.c rename to libs/unicode/c_737.c diff --git a/unicode/c_775.c b/libs/unicode/c_775.c similarity index 100% rename from unicode/c_775.c rename to libs/unicode/c_775.c diff --git a/unicode/c_850.c b/libs/unicode/c_850.c similarity index 100% rename from unicode/c_850.c rename to libs/unicode/c_850.c diff --git a/unicode/c_852.c b/libs/unicode/c_852.c similarity index 100% rename from unicode/c_852.c rename to libs/unicode/c_852.c diff --git a/unicode/c_855.c b/libs/unicode/c_855.c similarity index 100% rename from unicode/c_855.c rename to libs/unicode/c_855.c diff --git a/unicode/c_856.c b/libs/unicode/c_856.c similarity index 100% rename from unicode/c_856.c rename to libs/unicode/c_856.c diff --git a/unicode/c_857.c b/libs/unicode/c_857.c similarity index 100% rename from unicode/c_857.c rename to libs/unicode/c_857.c diff --git a/unicode/c_860.c b/libs/unicode/c_860.c similarity index 100% rename from unicode/c_860.c rename to libs/unicode/c_860.c diff --git a/unicode/c_861.c b/libs/unicode/c_861.c similarity index 100% rename from unicode/c_861.c rename to libs/unicode/c_861.c diff --git a/unicode/c_862.c b/libs/unicode/c_862.c similarity index 100% rename from unicode/c_862.c rename to libs/unicode/c_862.c diff --git a/unicode/c_863.c b/libs/unicode/c_863.c similarity index 100% rename from unicode/c_863.c rename to libs/unicode/c_863.c diff --git a/unicode/c_864.c b/libs/unicode/c_864.c similarity index 100% rename from unicode/c_864.c rename to libs/unicode/c_864.c diff --git a/unicode/c_865.c b/libs/unicode/c_865.c similarity index 100% rename from unicode/c_865.c rename to libs/unicode/c_865.c diff --git a/unicode/c_866.c b/libs/unicode/c_866.c similarity index 100% rename from unicode/c_866.c rename to libs/unicode/c_866.c diff --git a/unicode/c_869.c b/libs/unicode/c_869.c similarity index 100% rename from unicode/c_869.c rename to libs/unicode/c_869.c diff --git a/unicode/c_874.c b/libs/unicode/c_874.c similarity index 100% rename from unicode/c_874.c rename to libs/unicode/c_874.c diff --git a/unicode/c_875.c b/libs/unicode/c_875.c similarity index 100% rename from unicode/c_875.c rename to libs/unicode/c_875.c diff --git a/unicode/c_878.c b/libs/unicode/c_878.c similarity index 100% rename from unicode/c_878.c rename to libs/unicode/c_878.c diff --git a/unicode/c_932.c b/libs/unicode/c_932.c similarity index 100% rename from unicode/c_932.c rename to libs/unicode/c_932.c diff --git a/unicode/c_936.c b/libs/unicode/c_936.c similarity index 100% rename from unicode/c_936.c rename to libs/unicode/c_936.c diff --git a/unicode/c_949.c b/libs/unicode/c_949.c similarity index 100% rename from unicode/c_949.c rename to libs/unicode/c_949.c diff --git a/unicode/c_950.c b/libs/unicode/c_950.c similarity index 100% rename from unicode/c_950.c rename to libs/unicode/c_950.c diff --git a/unicode/casemap.c b/libs/unicode/casemap.c similarity index 100% rename from unicode/casemap.c rename to libs/unicode/casemap.c diff --git a/unicode/compose.c b/libs/unicode/compose.c similarity index 100% rename from unicode/compose.c rename to libs/unicode/compose.c diff --git a/unicode/cpmap.pl b/libs/unicode/cpmap.pl similarity index 100% rename from unicode/cpmap.pl rename to libs/unicode/cpmap.pl diff --git a/unicode/cptable.c b/libs/unicode/cptable.c similarity index 100% rename from unicode/cptable.c rename to libs/unicode/cptable.c diff --git a/unicode/defaults b/libs/unicode/defaults similarity index 100% rename from unicode/defaults rename to libs/unicode/defaults diff --git a/unicode/mbtowc.c b/libs/unicode/mbtowc.c similarity index 100% rename from unicode/mbtowc.c rename to libs/unicode/mbtowc.c diff --git a/unicode/string.c b/libs/unicode/string.c similarity index 100% rename from unicode/string.c rename to libs/unicode/string.c diff --git a/unicode/utf8.c b/libs/unicode/utf8.c similarity index 100% rename from unicode/utf8.c rename to libs/unicode/utf8.c diff --git a/unicode/wctomb.c b/libs/unicode/wctomb.c similarity index 100% rename from unicode/wctomb.c rename to libs/unicode/wctomb.c diff --git a/unicode/wctype.c b/libs/unicode/wctype.c similarity index 100% rename from unicode/wctype.c rename to libs/unicode/wctype.c diff --git a/unicode/wine_unicode.def b/libs/unicode/wine_unicode.def similarity index 100% rename from unicode/wine_unicode.def rename to libs/unicode/wine_unicode.def diff --git a/tools/winewrapper b/tools/winewrapper index 649867077c2..e143692381e 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -64,9 +64,9 @@ topdir=`cd "$topdir" && pwd` if [ -n "$LD_LIBRARY_PATH" ] then - LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/unicode:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/libs/unicode:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/unicode" + LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/libs/unicode" fi WINEDLLPATH="$topdir/dlls:$topdir/programs" WINESERVER="$topdir/server/wineserver" diff --git a/unicode/.cvsignore b/unicode/.cvsignore deleted file mode 100644 index ef8deb739bb..00000000000 --- a/unicode/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -libwine_unicode.dll -libwine_unicode.so.1.0