marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Always build 16-bit modules with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Alexandre Julliard 2020-04-02 11:09:19 +02:00
parent 024f9ebd1a
commit fbbad0f10a
46 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/avifile.dll16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = avifile.dll16
IMPORTS = avifil32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,avifil32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,avifil32.dll
C_SRCS = \
main.c

2
dlls/commdlg.dll16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = commdlg.dll16
IMPORTS = comdlg32 user32 gdi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,comdlg32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll
C_SRCS = \
colordlg.c \

2
dlls/compobj.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = compobj.dll16
IMPORTS = uuid ole32 advapi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
C_SRCS = compobj.c

2
dlls/ctl3d.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = ctl3d.dll16
IMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ctl3d32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll
C_SRCS = ctl3d.c

2
dlls/ctl3dv2.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = ctl3dv2.dll16
IMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ctl3d32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll
C_SRCS = ctl3d.c

2
dlls/ddeml.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = ddeml.dll16
IMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = ddeml.c

2
dlls/dispdib.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = dispdib.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = dispdib.c

2
dlls/display.drv16/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = display.drv16
IMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = display.c

2
dlls/gdi.exe16/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = gdi.exe16
IMPORTS = user32 advapi32 gdi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,gdi32.dll,--heap,65520
EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520
C_SRCS = \
bidi.c \

2
dlls/keyboard.drv16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = keyboard.drv16
IMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = keyboard.c

2
dlls/krnl386.exe16/Makefile.in
View File

@ -2,7 +2,7 @@ MODULE = krnl386.exe16
IMPORTLIB = kernel
IMPORTS = kernel32 ntdll winecrt0
DELAYIMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin -nodefaultlibs -Wb,--dll-name,kernel
EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel
C_SRCS = \
atom.c \

2
dlls/lzexpand.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = lzexpand.dll16
IMPORTS = lz32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,lz32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,lz32.dll
C_SRCS = lzexpand.c

2
dlls/mmsystem.dll16/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = mmsystem.dll16
IMPORTS = winmm user32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll
C_SRCS = \
driver.c \

2
dlls/mouse.drv16/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = mouse.drv16
IMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = mouse.c

2
dlls/msacm.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = msacm.dll16
IMPORTS = msacm32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,msacm32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,msacm32.dll
C_SRCS = msacm.c

2
dlls/msvideo.dll16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = msvideo.dll16
IMPORTS = msvfw32 version advapi32 user32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,msvfw32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,msvfw32.dll
C_SRCS = msvideo16.c

2
dlls/ole2.dll16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = ole2.dll16
IMPORTS = uuid ole32 user32 gdi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
C_SRCS = \
memlockbytes.c \

2
dlls/ole2disp.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = ole2disp.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,oleaut32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll
C_SRCS = ole2disp.c

2
dlls/ole2nls.dll16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = ole2nls.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
C_SRCS = ole2nls.c

2
dlls/olecli.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = olecli.dll16
IMPORTS = gdi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olecli32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll
C_SRCS = olecli.c

2
dlls/olesvr.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = olesvr.dll16
IMPORTS = gdi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olesvr32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll
C_SRCS = olesvr.c

2
dlls/setupx.dll16/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = setupx.dll16
IMPORTS = setupapi user32 advapi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,setupapi.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,setupapi.dll
C_SRCS = \
devinst16.c \

2
dlls/shell.dll16/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = shell.dll16
IMPORTS = shell32 user32 gdi32 advapi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,shell32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,shell32.dll
C_SRCS = shell.c

2
dlls/sound.drv16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = sound.drv16
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll
C_SRCS = sound.c

2
dlls/storage.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = storage.dll16
IMPORTS = uuid ole32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
C_SRCS = storage.c

2
dlls/stress.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = stress.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = stress.c

2
dlls/system.drv16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = system.drv16
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = system.c

2
dlls/toolhelp.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = toolhelp.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = toolhelp.c

2
dlls/twain.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = twain.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,twain_32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,twain_32.dll
C_SRCS = twain.c

2
dlls/typelib.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = typelib.dll16
IMPORTS = oleaut32 advapi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,oleaut32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll
C_SRCS = typelib.c

2
dlls/user.exe16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = user.exe16
IMPORTS = mpr user32 gdi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,user32.dll,--heap,65520
EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
C_SRCS = \
bidi.c \

2
dlls/ver.dll16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = ver.dll16
IMPORTS = version lz32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,version.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,version.dll
C_SRCS = version.c

2
dlls/w32sys.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = w32sys.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,w32skrnl.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll
C_SRCS = w32sys.c

2
dlls/win32s16.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = win32s16.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,w32skrnl.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll
C_SRCS = win32s16.c

2
dlls/win87em.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = win87em.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = win87em.c

2
dlls/winaspi.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = winaspi.dll16
IMPORTS = wnaspi32 advapi32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,wnaspi32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,wnaspi32.dll
C_SRCS = winaspi.c

2
dlls/windebug.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = windebug.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = windebug.c

2
dlls/wineps16.drv16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = wineps16.drv16
IMPORTS = winspool
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = driver.c

2
dlls/wing.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = wing.dll16
IMPORTS = gdi32
EXTRADLLFLAGS = -m16 -mno-cygwin
EXTRADLLFLAGS = -m16
C_SRCS = wing.c

2
dlls/winnls.dll16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = winnls.dll16
IMPORTS = winnls32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winnls32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,winnls32.dll
C_SRCS = winnls.c

2
dlls/winsock.dll16/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = winsock.dll16
IMPORTS = ws2_32
DELAYIMPORTS = user32
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ws2_32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,ws2_32.dll
C_SRCS = socket.c

2
dlls/wintab.dll16/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = wintab.dll16
EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,wintab32.dll
EXTRADLLFLAGS = -m16 -Wb,--main-module,wintab32.dll
C_SRCS = wintab.c

2
programs/rundll.exe16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = rundll.exe16
EXTRADLLFLAGS = -mconsole -m16 -mno-cygwin
EXTRADLLFLAGS = -mconsole -m16
C_SRCS = rundll.c

2
programs/winhelp.exe16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = winhelp.exe16
EXTRADLLFLAGS = -mconsole -m16 -mno-cygwin
EXTRADLLFLAGS = -mconsole -m16
C_SRCS = winhelp.c

2
programs/winoldap.mod16/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = winoldap.mod16
EXTRADLLFLAGS = -mconsole -m16 -mno-cygwin
EXTRADLLFLAGS = -mconsole -m16
C_SRCS = winoldap.c

6
tools/makedep.c
View File

@ -4204,12 +4204,12 @@ static void load_sources( struct makefile *make )
if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module;
if ((make->module && make->staticlib) || make->testdll)
strarray_add( &make->extradllflags, "-mno-cygwin" );
make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );
if ((make->module && make->staticlib) || make->testdll || make->is_win16)
strarray_add_uniq( &make->extradllflags, "-mno-cygwin" );
strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" ));
make->disabled = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir );
make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );
make->use_msvcrt = strarray_exists( &make->extradllflags, "-mno-cygwin" );
make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) ||
strarray_exists( &make->extradllflags, "-mwindows" );