Alexandre Julliard : libs: Merged libwine_unicode into libwine.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jul 12 06:53:36 CDT 2006


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jul 11 19:33:22 2006 +0200

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.

---

 Make.rules.in                        |    1 
 configure                            |    9 
 configure.ac                         |    7 
 dlls/advapi32/Makefile.in            |    1 
 dlls/advpack/Makefile.in             |    1 
 dlls/atl/Makefile.in                 |    2 
 dlls/avifil32/Makefile.in            |    2 
 dlls/comcat/Makefile.in              |    2 
 dlls/comctl32/Makefile.in            |    1 
 dlls/comdlg32/Makefile.in            |    2 
 dlls/crtdll/Makefile.in              |    1 
 dlls/devenum/Makefile.in             |    2 
 dlls/dmloader/Makefile.in            |    2 
 dlls/dmusic/Makefile.in              |    2 
 dlls/dnsapi/Makefile.in              |    2 
 dlls/dplayx/Makefile.in              |    2 
 dlls/dxdiagn/Makefile.in             |    2 
 dlls/gdi/Makefile.in                 |    2 
 dlls/hhctrl.ocx/Makefile.in          |    2 
 dlls/hlink/Makefile.in               |    2 
 dlls/infosoft/Makefile.in            |    2 
 dlls/inseng/Makefile.in              |    2 
 dlls/itss/Makefile.in                |    2 
 dlls/kernel/Makefile.in              |    2 
 dlls/lz32/Makefile.in                |    1 
 dlls/mapi32/Makefile.in              |    2 
 dlls/mciavi32/Makefile.in            |    1 
 dlls/mcicda/Makefile.in              |    1 
 dlls/mciseq/Makefile.in              |    1 
 dlls/mciwave/Makefile.in             |    1 
 dlls/midimap/Makefile.in             |    1 
 dlls/mlang/Makefile.in               |    2 
 dlls/mpr/Makefile.in                 |    1 
 dlls/msacm32.drv/Makefile.in         |    1 
 dlls/msacm32/Makefile.in             |    1 
 dlls/msdmo/Makefile.in               |    2 
 dlls/mshtml/Makefile.in              |    2 
 dlls/msi/Makefile.in                 |    2 
 dlls/msvcrt/Makefile.in              |    1 
 dlls/msvcrt20/Makefile.in            |    1 
 dlls/msvfw32/Makefile.in             |    1 
 dlls/msxml3/Makefile.in              |    2 
 dlls/ntdll/Makefile.in               |    2 
 dlls/objsel/Makefile.in              |    2 
 dlls/odbc32/Makefile.in              |    1 
 dlls/odbccp32/Makefile.in            |    2 
 dlls/ole32/Makefile.in               |    2 
 dlls/oleaut32/Makefile.in            |    2 
 dlls/powrprof/Makefile.in            |    1 
 dlls/qcap/Makefile.in                |    2 
 dlls/quartz/Makefile.in              |    2 
 dlls/query/Makefile.in               |    2 
 dlls/riched20/Makefile.in            |    2 
 dlls/rpcrt4/Makefile.in              |    2 
 dlls/serialui/Makefile.in            |    1 
 dlls/setupapi/Makefile.in            |    2 
 dlls/shdocvw/Makefile.in             |    2 
 dlls/shell32/Makefile.in             |    2 
 dlls/shlwapi/Makefile.in             |    2 
 dlls/urlmon/Makefile.in              |    2 
 dlls/user/Makefile.in                |    1 
 dlls/userenv/Makefile.in             |    1 
 dlls/uxtheme/Makefile.in             |    1 
 dlls/version/Makefile.in             |    1 
 dlls/winedos/Makefile.in             |    1 
 dlls/winex11.drv/Makefile.in         |    2 
 dlls/wininet/Makefile.in             |    2 
 dlls/winmm/Makefile.in               |    1 
 dlls/winmm/joystick/Makefile.in      |    1 
 dlls/winmm/winearts/Makefile.in      |    2 
 dlls/winmm/winejack/Makefile.in      |    2 
 dlls/winmm/winenas/Makefile.in       |    2 
 dlls/winmm/wineoss/Makefile.in       |    2 
 dlls/winspool.drv/Makefile.in        |    1 
 dlls/wnaspi32/Makefile.in            |    1 
 dlls/ws2_32/Makefile.in              |    1 
 libs/Makefile.in                     |    7 
 libs/unicode/Makefile.in             |   89 
 libs/unicode/c_037.c                 |  683 --
 libs/unicode/c_10000.c               |  683 --
 libs/unicode/c_10006.c               |  683 --
 libs/unicode/c_10007.c               |  716 ---
 libs/unicode/c_10029.c               |  683 --
 libs/unicode/c_1006.c                |  716 ---
 libs/unicode/c_10079.c               |  683 --
 libs/unicode/c_10081.c               |  683 --
 libs/unicode/c_1026.c                |  683 --
 libs/unicode/c_1250.c                |  683 --
 libs/unicode/c_1251.c                |  716 ---
 libs/unicode/c_1252.c                |  683 --
 libs/unicode/c_1253.c                |  683 --
 libs/unicode/c_1254.c                |  683 --
 libs/unicode/c_1255.c                |  716 ---
 libs/unicode/c_1256.c                |  716 ---
 libs/unicode/c_1257.c                |  683 --
 libs/unicode/c_1258.c                |  683 --
 libs/unicode/c_20127.c               |  683 --
 libs/unicode/c_20866.c               |  716 ---
 libs/unicode/c_20932.c               | 6298 -----------------------
 libs/unicode/c_21866.c               |  716 ---
 libs/unicode/c_28591.c               |  683 --
 libs/unicode/c_28592.c               |  683 --
 libs/unicode/c_28593.c               |  683 --
 libs/unicode/c_28594.c               |  683 --
 libs/unicode/c_28595.c               |  716 ---
 libs/unicode/c_28596.c               |  716 ---
 libs/unicode/c_28597.c               |  683 --
 libs/unicode/c_28598.c               |  716 ---
 libs/unicode/c_28599.c               |  683 --
 libs/unicode/c_28600.c               |  683 --
 libs/unicode/c_28603.c               |  683 --
 libs/unicode/c_28604.c               |  683 --
 libs/unicode/c_28605.c               |  683 --
 libs/unicode/c_28606.c               |  683 --
 libs/unicode/c_424.c                 |  716 ---
 libs/unicode/c_437.c                 |  683 --
 libs/unicode/c_500.c                 |  683 --
 libs/unicode/c_737.c                 |  683 --
 libs/unicode/c_775.c                 |  683 --
 libs/unicode/c_850.c                 |  683 --
 libs/unicode/c_852.c                 |  683 --
 libs/unicode/c_855.c                 |  716 ---
 libs/unicode/c_856.c                 |  716 ---
 libs/unicode/c_857.c                 |  683 --
 libs/unicode/c_860.c                 |  683 --
 libs/unicode/c_861.c                 |  683 --
 libs/unicode/c_862.c                 |  716 ---
 libs/unicode/c_863.c                 |  683 --
 libs/unicode/c_864.c                 |  716 ---
 libs/unicode/c_865.c                 |  683 --
 libs/unicode/c_866.c                 |  716 ---
 libs/unicode/c_869.c                 |  683 --
 libs/unicode/c_874.c                 |  716 ---
 libs/unicode/c_875.c                 |  683 --
 libs/unicode/c_878.c                 |  716 ---
 libs/unicode/c_932.c                 | 5242 -------------------
 libs/unicode/c_936.c                 | 7882 -----------------------------
 libs/unicode/c_949.c                 | 9301 ----------------------------------
 libs/unicode/c_950.c                 | 6595 ------------------------
 libs/unicode/casemap.c               | 1647 ------
 libs/unicode/collation.c             | 1657 ------
 libs/unicode/compose.c               | 1098 ----
 libs/unicode/cpmap.pl                | 1238 -----
 libs/unicode/cptable.c               |  181 -
 libs/unicode/defaults                |  202 -
 libs/unicode/fold.c                  |  198 -
 libs/unicode/mbtowc.c                |  300 -
 libs/unicode/sortkey.c               |  350 -
 libs/unicode/string.c                |  642 --
 libs/unicode/utf8.c                  |  200 -
 libs/unicode/wctomb.c                |  488 --
 libs/unicode/wctype.c                | 2026 -------
 libs/unicode/wine_unicode.def        |   58 
 libs/unicode/wine_unicode.map        |   61 
 libs/wine/Makefile.in                |   76 
 libs/wine/c_037.c                    |  683 ++
 libs/wine/c_10000.c                  |  683 ++
 libs/wine/c_10006.c                  |  683 ++
 libs/wine/c_10007.c                  |  716 +++
 libs/wine/c_10029.c                  |  683 ++
 libs/wine/c_1006.c                   |  716 +++
 libs/wine/c_10079.c                  |  683 ++
 libs/wine/c_10081.c                  |  683 ++
 libs/wine/c_1026.c                   |  683 ++
 libs/wine/c_1250.c                   |  683 ++
 libs/wine/c_1251.c                   |  716 +++
 libs/wine/c_1252.c                   |  683 ++
 libs/wine/c_1253.c                   |  683 ++
 libs/wine/c_1254.c                   |  683 ++
 libs/wine/c_1255.c                   |  716 +++
 libs/wine/c_1256.c                   |  716 +++
 libs/wine/c_1257.c                   |  683 ++
 libs/wine/c_1258.c                   |  683 ++
 libs/wine/c_20127.c                  |  683 ++
 libs/wine/c_20866.c                  |  716 +++
 libs/wine/c_20932.c                  | 6298 +++++++++++++++++++++++
 libs/wine/c_21866.c                  |  716 +++
 libs/wine/c_28591.c                  |  683 ++
 libs/wine/c_28592.c                  |  683 ++
 libs/wine/c_28593.c                  |  683 ++
 libs/wine/c_28594.c                  |  683 ++
 libs/wine/c_28595.c                  |  716 +++
 libs/wine/c_28596.c                  |  716 +++
 libs/wine/c_28597.c                  |  683 ++
 libs/wine/c_28598.c                  |  716 +++
 libs/wine/c_28599.c                  |  683 ++
 libs/wine/c_28600.c                  |  683 ++
 libs/wine/c_28603.c                  |  683 ++
 libs/wine/c_28604.c                  |  683 ++
 libs/wine/c_28605.c                  |  683 ++
 libs/wine/c_28606.c                  |  683 ++
 libs/wine/c_424.c                    |  716 +++
 libs/wine/c_437.c                    |  683 ++
 libs/wine/c_500.c                    |  683 ++
 libs/wine/c_737.c                    |  683 ++
 libs/wine/c_775.c                    |  683 ++
 libs/wine/c_850.c                    |  683 ++
 libs/wine/c_852.c                    |  683 ++
 libs/wine/c_855.c                    |  716 +++
 libs/wine/c_856.c                    |  716 +++
 libs/wine/c_857.c                    |  683 ++
 libs/wine/c_860.c                    |  683 ++
 libs/wine/c_861.c                    |  683 ++
 libs/wine/c_862.c                    |  716 +++
 libs/wine/c_863.c                    |  683 ++
 libs/wine/c_864.c                    |  716 +++
 libs/wine/c_865.c                    |  683 ++
 libs/wine/c_866.c                    |  716 +++
 libs/wine/c_869.c                    |  683 ++
 libs/wine/c_874.c                    |  716 +++
 libs/wine/c_875.c                    |  683 ++
 libs/wine/c_878.c                    |  716 +++
 libs/wine/c_932.c                    | 5242 +++++++++++++++++++
 libs/wine/c_936.c                    | 7882 +++++++++++++++++++++++++++++
 libs/wine/c_949.c                    | 9301 ++++++++++++++++++++++++++++++++++
 libs/wine/c_950.c                    | 6595 ++++++++++++++++++++++++
 libs/wine/casemap.c                  | 1647 ++++++
 libs/wine/collation.c                | 1657 ++++++
 libs/wine/compose.c                  | 1098 ++++
 libs/wine/cpmap.pl                   | 1238 +++++
 libs/wine/cptable.c                  |  181 +
 libs/wine/defaults                   |  202 +
 libs/wine/fold.c                     |  198 +
 libs/wine/mbtowc.c                   |  300 +
 libs/wine/sortkey.c                  |  350 +
 libs/wine/string.c                   |  642 ++
 libs/wine/utf8.c                     |  200 +
 libs/wine/wctomb.c                   |  488 ++
 libs/wine/wctype.c                   | 2026 +++++++
 libs/wine/wine.def                   |   55 
 libs/wine/wine.map                   |   55 
 programs/msiexec/Makefile.in         |    1 
 programs/rundll32/Makefile.in        |    1 
 programs/winemenubuilder/Makefile.in |    2 
 server/Makefile.in                   |    2 
 tools/Makefile.in                    |    2 
 tools/wmc/Makefile.in                |    2 
 tools/wrc/Makefile.in                |    2 
 238 files changed, 84627 insertions(+), 84694 deletions(-)
 delete mode 100644 libs/unicode/Makefile.in
 delete mode 100644 libs/unicode/c_037.c
 delete mode 100644 libs/unicode/c_10000.c
 delete mode 100644 libs/unicode/c_10006.c
 delete mode 100644 libs/unicode/c_10007.c
 delete mode 100644 libs/unicode/c_10029.c
 delete mode 100644 libs/unicode/c_1006.c
 delete mode 100644 libs/unicode/c_10079.c
 delete mode 100644 libs/unicode/c_10081.c
 delete mode 100644 libs/unicode/c_1026.c
 delete mode 100644 libs/unicode/c_1250.c
 delete mode 100644 libs/unicode/c_1251.c
 delete mode 100644 libs/unicode/c_1252.c
 delete mode 100644 libs/unicode/c_1253.c
 delete mode 100644 libs/unicode/c_1254.c
 delete mode 100644 libs/unicode/c_1255.c
 delete mode 100644 libs/unicode/c_1256.c
 delete mode 100644 libs/unicode/c_1257.c
 delete mode 100644 libs/unicode/c_1258.c
 delete mode 100644 libs/unicode/c_20127.c
 delete mode 100644 libs/unicode/c_20866.c
 delete mode 100644 libs/unicode/c_20932.c
 delete mode 100644 libs/unicode/c_21866.c
 delete mode 100644 libs/unicode/c_28591.c
 delete mode 100644 libs/unicode/c_28592.c
 delete mode 100644 libs/unicode/c_28593.c
 delete mode 100644 libs/unicode/c_28594.c
 delete mode 100644 libs/unicode/c_28595.c
 delete mode 100644 libs/unicode/c_28596.c
 delete mode 100644 libs/unicode/c_28597.c
 delete mode 100644 libs/unicode/c_28598.c
 delete mode 100644 libs/unicode/c_28599.c
 delete mode 100644 libs/unicode/c_28600.c
 delete mode 100644 libs/unicode/c_28603.c
 delete mode 100644 libs/unicode/c_28604.c
 delete mode 100644 libs/unicode/c_28605.c
 delete mode 100644 libs/unicode/c_28606.c
 delete mode 100644 libs/unicode/c_424.c
 delete mode 100644 libs/unicode/c_437.c
 delete mode 100644 libs/unicode/c_500.c
 delete mode 100644 libs/unicode/c_737.c
 delete mode 100644 libs/unicode/c_775.c
 delete mode 100644 libs/unicode/c_850.c
 delete mode 100644 libs/unicode/c_852.c
 delete mode 100644 libs/unicode/c_855.c
 delete mode 100644 libs/unicode/c_856.c
 delete mode 100644 libs/unicode/c_857.c
 delete mode 100644 libs/unicode/c_860.c
 delete mode 100644 libs/unicode/c_861.c
 delete mode 100644 libs/unicode/c_862.c
 delete mode 100644 libs/unicode/c_863.c
 delete mode 100644 libs/unicode/c_864.c
 delete mode 100644 libs/unicode/c_865.c
 delete mode 100644 libs/unicode/c_866.c
 delete mode 100644 libs/unicode/c_869.c
 delete mode 100644 libs/unicode/c_874.c
 delete mode 100644 libs/unicode/c_875.c
 delete mode 100644 libs/unicode/c_878.c
 delete mode 100644 libs/unicode/c_932.c
 delete mode 100644 libs/unicode/c_936.c
 delete mode 100644 libs/unicode/c_949.c
 delete mode 100644 libs/unicode/c_950.c
 delete mode 100644 libs/unicode/casemap.c
 delete mode 100644 libs/unicode/collation.c
 delete mode 100644 libs/unicode/compose.c
 delete mode 100755 libs/unicode/cpmap.pl
 delete mode 100644 libs/unicode/cptable.c
 delete mode 100644 libs/unicode/defaults
 delete mode 100644 libs/unicode/fold.c
 delete mode 100644 libs/unicode/mbtowc.c
 delete mode 100644 libs/unicode/sortkey.c
 delete mode 100644 libs/unicode/string.c
 delete mode 100644 libs/unicode/utf8.c
 delete mode 100644 libs/unicode/wctomb.c
 delete mode 100644 libs/unicode/wctype.c
 delete mode 100644 libs/unicode/wine_unicode.def
 delete mode 100644 libs/unicode/wine_unicode.map
 create mode 100644 libs/wine/c_037.c
 create mode 100644 libs/wine/c_10000.c
 create mode 100644 libs/wine/c_10006.c
 create mode 100644 libs/wine/c_10007.c
 create mode 100644 libs/wine/c_10029.c
 create mode 100644 libs/wine/c_1006.c
 create mode 100644 libs/wine/c_10079.c
 create mode 100644 libs/wine/c_10081.c
 create mode 100644 libs/wine/c_1026.c
 create mode 100644 libs/wine/c_1250.c
 create mode 100644 libs/wine/c_1251.c
 create mode 100644 libs/wine/c_1252.c
 create mode 100644 libs/wine/c_1253.c
 create mode 100644 libs/wine/c_1254.c
 create mode 100644 libs/wine/c_1255.c
 create mode 100644 libs/wine/c_1256.c
 create mode 100644 libs/wine/c_1257.c
 create mode 100644 libs/wine/c_1258.c
 create mode 100644 libs/wine/c_20127.c
 create mode 100644 libs/wine/c_20866.c
 create mode 100644 libs/wine/c_20932.c
 create mode 100644 libs/wine/c_21866.c
 create mode 100644 libs/wine/c_28591.c
 create mode 100644 libs/wine/c_28592.c
 create mode 100644 libs/wine/c_28593.c
 create mode 100644 libs/wine/c_28594.c
 create mode 100644 libs/wine/c_28595.c
 create mode 100644 libs/wine/c_28596.c
 create mode 100644 libs/wine/c_28597.c
 create mode 100644 libs/wine/c_28598.c
 create mode 100644 libs/wine/c_28599.c
 create mode 100644 libs/wine/c_28600.c
 create mode 100644 libs/wine/c_28603.c
 create mode 100644 libs/wine/c_28604.c
 create mode 100644 libs/wine/c_28605.c
 create mode 100644 libs/wine/c_28606.c
 create mode 100644 libs/wine/c_424.c
 create mode 100644 libs/wine/c_437.c
 create mode 100644 libs/wine/c_500.c
 create mode 100644 libs/wine/c_737.c
 create mode 100644 libs/wine/c_775.c
 create mode 100644 libs/wine/c_850.c
 create mode 100644 libs/wine/c_852.c
 create mode 100644 libs/wine/c_855.c
 create mode 100644 libs/wine/c_856.c
 create mode 100644 libs/wine/c_857.c
 create mode 100644 libs/wine/c_860.c
 create mode 100644 libs/wine/c_861.c
 create mode 100644 libs/wine/c_862.c
 create mode 100644 libs/wine/c_863.c
 create mode 100644 libs/wine/c_864.c
 create mode 100644 libs/wine/c_865.c
 create mode 100644 libs/wine/c_866.c
 create mode 100644 libs/wine/c_869.c
 create mode 100644 libs/wine/c_874.c
 create mode 100644 libs/wine/c_875.c
 create mode 100644 libs/wine/c_878.c
 create mode 100644 libs/wine/c_932.c
 create mode 100644 libs/wine/c_936.c
 create mode 100644 libs/wine/c_949.c
 create mode 100644 libs/wine/c_950.c
 create mode 100644 libs/wine/casemap.c
 create mode 100644 libs/wine/collation.c
 create mode 100644 libs/wine/compose.c
 create mode 100755 libs/wine/cpmap.pl
 create mode 100644 libs/wine/cptable.c
 create mode 100644 libs/wine/defaults
 create mode 100644 libs/wine/fold.c
 create mode 100644 libs/wine/mbtowc.c
 create mode 100644 libs/wine/sortkey.c
 create mode 100644 libs/wine/string.c
 create mode 100644 libs/wine/utf8.c
 create mode 100644 libs/wine/wctomb.c
 create mode 100644 libs/wine/wctype.c

Diff:   http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=eb8a40c36851944d5e75b3dbf62ada10dc797623



More information about the wine-cvs mailing list