ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-use the loader directory for the main wine loader, and get rid of 

the miscemu directory.
This commit is contained in:
Alexandre Julliard 2003-11-06 01:17:56 +00:00
parent b9efd4afcb
commit 357c7401b9
10 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DEVELOPERS-HINTS
View File

@ -169,7 +169,7 @@ Support programs, libraries, etc:
libs/uuid/ - Windows-compatible UUID numbers libs/uuid/ - Windows-compatible UUID numbers
libs/wine/ - Wine bootstrap library libs/wine/ - Wine bootstrap library
libs/wpp/ - C preprocessor libs/wpp/ - C preprocessor
miscemu/ - the main Wine program loader/ - the main Wine loader
server/ - the Wine server server/ - the Wine server
tools/ - relay code builder, resource compiler, etc. tools/ - relay code builder, resource compiler, etc.
@ -181,7 +181,6 @@ Note: these directories will ultimately get moved into their
respective dlls. respective dlls.
files/ - KERNEL file I/O files/ - KERNEL file I/O
loader/ - KERNEL loader code
memory/ - KERNEL memory management memory/ - KERNEL memory management
misc/ - KERNEL shell, registry, winsock, etc. misc/ - KERNEL shell, registry, winsock, etc.
msdos/ - KERNEL DOS support msdos/ - KERNEL DOS support

8
Makefile.in
View File

@ -32,7 +32,7 @@ SUBDIRS = \
documentation \ documentation \
include \ include \
libs \ libs \
miscemu \ loader \
programs \ programs \
server \ server \
tools tools
@ -40,7 +40,7 @@ SUBDIRS = \
# Sub-directories to install for install-lib # Sub-directories to install for install-lib
INSTALLLIBSUBDIRS = \ INSTALLLIBSUBDIRS = \
documentation \ documentation \
miscemu \ loader \
programs \ programs \
server server
@ -105,13 +105,13 @@ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
all: $(SUBDIRS) all: $(SUBDIRS)
dlls: libs tools dlls: libs tools
miscemu server: libs tools loader server: libs tools
programs: dlls libs tools programs: dlls libs tools
tools: libs tools: libs
dlls/__install-lib__ dlls/__install-dev__: libs tools dlls/__install-lib__ dlls/__install-dev__: libs tools
libs/__install-lib__ libs/__install-dev__: libs libs/__install-lib__ libs/__install-dev__: libs
miscemu/__install__ server/__install__: libs tools loader/__install__ server/__install__: libs tools
programs/__install__: libs tools dlls/__install-lib__ programs/__install__: libs tools dlls/__install-lib__
tools/__install__: tools tools/__install__: tools

9
configure vendored
View File

File diff suppressed because one or more lines are too long

3
configure.ac
View File

@ -1387,7 +1387,6 @@ WINE_CONFIG_EXTRA_DIR(files)
WINE_CONFIG_EXTRA_DIR(graphics) WINE_CONFIG_EXTRA_DIR(graphics)
WINE_CONFIG_EXTRA_DIR(graphics/x11drv) WINE_CONFIG_EXTRA_DIR(graphics/x11drv)
WINE_CONFIG_EXTRA_DIR(include/wine) WINE_CONFIG_EXTRA_DIR(include/wine)
WINE_CONFIG_EXTRA_DIR(loader)
WINE_CONFIG_EXTRA_DIR(memory) WINE_CONFIG_EXTRA_DIR(memory)
WINE_CONFIG_EXTRA_DIR(misc) WINE_CONFIG_EXTRA_DIR(misc)
WINE_CONFIG_EXTRA_DIR(msdos) WINE_CONFIG_EXTRA_DIR(msdos)
@ -1568,7 +1567,7 @@ libs/unicode/Makefile
libs/uuid/Makefile libs/uuid/Makefile
libs/wine/Makefile libs/wine/Makefile
libs/wpp/Makefile libs/wpp/Makefile
miscemu/Makefile loader/Makefile
programs/Makefile programs/Makefile
programs/avitools/Makefile programs/avitools/Makefile
programs/clock/Makefile programs/clock/Makefile

0
miscemu/.cvsignore → loader/.cvsignore
View File

0
miscemu/Makefile.in → loader/Makefile.in
View File

0
miscemu/main.c → loader/main.c
View File

2
tools/winapi/msvcmaker
View File

@ -88,7 +88,7 @@ sub read_spec_file {
} }
my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv graphics objects); my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv graphics objects);
my @ntdll_dirs = qw(files loader/ne loader memory misc msdos scheduler win32); my @ntdll_dirs = qw(files memory misc msdos);
my @user32_dirs = qw(controls dlls/user/dde windows); my @user32_dirs = qw(controls dlls/user/dde windows);
push @makefile_in_files, "tools/winebuild/Makefile.in"; push @makefile_in_files, "tools/winebuild/Makefile.in";

13
tools/winapi_check/modules.dat
View File

@ -199,25 +199,17 @@ dlls/iphlpapi
dlls/kernel dlls/kernel
files files
loader/ne
loader
memory memory
misc misc
msdos msdos
scheduler
win32
% dlls/kernel/kernel32.spec % dlls/kernel/kernel32.spec
dlls/kernel dlls/kernel
files files
loader/ne
loader
memory memory
msdos msdos
misc misc
scheduler
win32
% dlls/mapi32/mapi32.spec % dlls/mapi32/mapi32.spec
@ -263,8 +255,6 @@ misc
% dlls/kernel/toolhelp.spec % dlls/kernel/toolhelp.spec
dlls/kernel dlls/kernel
loader/ne
loader
memory memory
% dlls/kernel/win87em.spec % dlls/kernel/win87em.spec
@ -342,8 +332,6 @@ dlls/netapi32
% dlls/ntdll/ntdll.spec % dlls/ntdll/ntdll.spec
dlls/ntdll dlls/ntdll
misc
scheduler
% dlls/odbc32/odbc32.spec % dlls/odbc32/odbc32.spec
@ -534,7 +522,6 @@ windows
controls controls
dlls/user dlls/user
dlls/user/dde dlls/user/dde
loader
objects objects
windows windows

2
tools/winewrapper
View File

@ -70,7 +70,7 @@ else
fi fi
WINEDLLPATH="$topdir/dlls:$topdir/programs" WINEDLLPATH="$topdir/dlls:$topdir/programs"
WINESERVER="$topdir/server/wineserver" WINESERVER="$topdir/server/wineserver"
WINELOADER="$topdir/miscemu/wine" WINELOADER="$topdir/loader/wine"
export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER
# any local settings ? # any local settings ?