makefiles: Add a -mcygwin flag to specify the inverse of -mno-cygwin.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-09-20 16:58:11 +02:00
parent eda25a58c5
commit 6ba7773121
69 changed files with 140 additions and 9 deletions

View File

@ -2,4 +2,6 @@ MODULE = capi2032.dll
IMPORTLIB = capi2032
EXTRAINCL = $(CAPI20_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = cap20wxx.c

View File

@ -1,4 +1,6 @@
MODULE = ctapi32.dll
IMPORTS = advapi32
EXTRADLLFLAGS = -mcygwin
C_SRCS = ctapi32.c

View File

@ -4,5 +4,7 @@ IMPORTS = dxgi dxguid gdi32 user32 uuid
EXTRALIBS = $(VKD3D_LIBS)
EXTRAINCL = $(VKD3D_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
d3d12_main.c

View File

@ -4,6 +4,8 @@ IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700
EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
ansi.c \
config.c \

View File

@ -5,6 +5,8 @@ EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800
EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
PARENTSRC = ../dinput
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
ansi.c \
config.c \

View File

@ -3,6 +3,8 @@ IMPORTLIB = dxgi
IMPORTS = gdi32 dxguid uuid wined3d user32
EXTRAINCL = $(VKD3D_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
adapter.c \
device.c \

View File

@ -3,6 +3,8 @@ IMPORTS = comctl32 user32 gdi32 advapi32
EXTRALIBS = $(GPHOTO2_LIBS) $(GPHOTO2_PORT_LIBS)
EXTRAINCL = $(GPHOTO2_CFLAGS) $(GPHOTO2_PORT_CFLAGS) $(JPEG_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
capability.c \
ds_image.c \

View File

@ -2,6 +2,8 @@ MODULE = iphlpapi.dll
IMPORTLIB = iphlpapi
IMPORTS = advapi32 dnsapi nsi uuid
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
icmp.c \
iphlpapi_main.c

View File

@ -3,5 +3,7 @@ IMPORTS = winmm user32
EXTRAINCL = $(MPG123_CFLAGS)
EXTRALIBS = $(MPG123_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
mpegl3.c

View File

@ -1,10 +1,11 @@
MODULE = mountmgr.sys
IMPORTS = uuid advapi32 ntoskrnl
DELAYIMPORTS = user32 iphlpapi
EXTRADLLFLAGS = -Wl,--subsystem,native
EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS)
EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_LIBS) $(SECURITY_LIBS)
EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin
C_SRCS = \
dbus.c \
device.c \

View File

@ -3,6 +3,8 @@ IMPORTS = dmoguids msdmo ole32 uuid wmcodecdspuuid
EXTRAINCL = $(MPG123_CFLAGS)
EXTRALIBS = $(MPG123_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
mp3dmod.c

View File

@ -1,4 +1,6 @@
MODULE = msgsm32.acm
IMPORTS = winmm user32
EXTRADLLFLAGS = -mcygwin
C_SRCS = msgsm32.c

View File

@ -3,6 +3,8 @@ IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRALIBS = $(XML2_LIBS)
EXTRAINCL = $(XML2_CFLAGS) $(XSLT_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
attribute.c \
bsc.c \

View File

@ -1,7 +1,8 @@
MODULE = nsiproxy.sys
IMPORTS = ntoskrnl uuid
EXTRALIBS = $(PROCSTAT_LIBS)
EXTRADLLFLAGS = -Wl,--subsystem,native
EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin
C_SRCS = \
device.c \

View File

@ -1,7 +1,7 @@
MODULE = openal32.dll
EXTRALIBS = $(OPENAL_LIBS)
EXTRADLLFLAGS = -Wb,--prefer-native
EXTRADLLFLAGS = -Wb,--prefer-native -mcygwin
C_SRCS = \
openal.c

View File

@ -3,7 +3,8 @@ EXTRADEFS = -D_OPENGL32_
IMPORTLIB = opengl32
IMPORTS = user32 gdi32 advapi32
DELAYIMPORTS = glu32
EXTRADLLFLAGS = -Wl,--image-base,0x7a800000
EXTRADLLFLAGS = -Wl,--image-base,0x7a800000 -mcygwin
C_SRCS = \
opengl_ext.c \

View File

@ -2,6 +2,8 @@ MODULE = sane.ds
IMPORTS = comctl32 user32 gdi32
EXTRAINCL = $(SANE_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
capability.c \
ds_ctrl.c \

View File

@ -3,6 +3,8 @@ IMPORTS = uuid ole32 advapi32
DELAYIMPORTS = winmm
EXTRALIBS = $(ALSA_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
midi.c \
mmdevdrv.c

View File

@ -1,6 +1,8 @@
MODULE = wineandroid.drv
IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
device.c \
init.c \

View File

@ -3,6 +3,8 @@ IMPORTS = uuid ole32 user32 advapi32
DELAYIMPORTS = winmm
EXTRALIBS = $(COREAUDIO_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
audiounit.c \
coreaudio.c \

View File

@ -3,6 +3,8 @@ IMPORTLIB = wined3d
IMPORTS = opengl32 user32 gdi32 advapi32
EXTRAINCL = $(VKD3D_SHADER_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
adapter_gl.c \
adapter_vk.c \

View File

@ -2,6 +2,8 @@ MODULE = winejoystick.drv
IMPORTS = winmm user32
EXTRALIBS = $(IOKIT_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
joystick.c \
joystick_linux.c \

View File

@ -3,6 +3,8 @@ IMPORTS = uuid setupapi rpcrt4 user32 gdi32 advapi32
DELAYIMPORTS = ole32 shell32 imm32
EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
clipboard.c \
display.c \

View File

@ -4,6 +4,8 @@ DELAYIMPORTS = winmm
EXTRALIBS = $(OSS4_LIBS)
EXTRAINCL = $(OSS4_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
midi.c \
midipatch.c \

View File

@ -3,6 +3,8 @@ IMPORTS = strmiids uuid ole32 advapi32
EXTRALIBS = $(QUICKTIME_LIBS)
PARENTSRC = ../strmbase
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
filter.c \
main.c \

View File

@ -2,7 +2,8 @@ MODULE = wineusb.sys
IMPORTS = ntoskrnl
EXTRALIBS = $(USB_LIBS)
EXTRAINCL = $(USB_CFLAGS)
EXTRADLLFLAGS = -Wl,--subsystem,native
EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin
C_SRCS = \
wineusb.c

View File

@ -4,6 +4,8 @@ DELAYIMPORTS = comctl32 ole32 shell32 imm32
EXTRAINCL = $(X_CFLAGS)
EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
bitblt.c \
brush.c \

View File

@ -5,6 +5,8 @@ IMPORTS = user32 gdi32 advapi32
EXTRAINCL = $(CUPS_CFLAGS)
EXTRALIBS = $(APPLICATIONSERVICES_LIBS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
info.c \
wspool.c

View File

@ -2,6 +2,8 @@ MODULE = wnaspi32.dll
IMPORTLIB = wnaspi32
IMPORTS = advapi32
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
aspi.c \
winaspi32.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
x3daudio.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -4,6 +4,8 @@ EXTRADEFS = -DXACT3_VER=0x0307
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xact_dll.c

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xapo.c \
xapofx.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xapo.c \
xapofx.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xapo.c \
xapofx.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xapo.c \
xapofx.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
xapo.c \
xapofx.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
xapo.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
xapo.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
xapo.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
xapo.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
xapo.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
xapo.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
xapo.c \

View File

@ -4,6 +4,8 @@ IMPORTS = advapi32 ole32 user32 uuid
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
x3daudio.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
x3daudio.c \

View File

@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
EXTRALIBS = $(FAUDIO_LIBS)
EXTRAINCL = $(FAUDIO_CFLAGS)
EXTRADLLFLAGS = -mcygwin
C_SRCS = \
compat.c \
x3daudio.c \

View File

@ -1,6 +1,7 @@
MODULE = winebrowser.exe
APPMODE = -mwindows -municode
IMPORTS = urlmon oleaut32 shell32 user32 advapi32
EXTRADLLFLAGS = -mwindows -municode -mcygwin
C_SRCS = \
main.c

View File

@ -1,9 +1,10 @@
MODULE = winedbg.exe
APPMODE = -mconsole
IMPORTS = dbghelp advapi32
DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32
EXTRALIBS = $(POLL_LIBS)
EXTRADLLFLAGS = -mconsole -mcygwin
C_SRCS = \
be_arm.c \
be_arm64.c \

View File

@ -1,6 +1,7 @@
MODULE = winemenubuilder.exe
APPMODE = -mwindows -municode
IMPORTS = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32
EXTRADLLFLAGS = -mwindows -municode -mcygwin
C_SRCS = \
winemenubuilder.c

View File

@ -1,7 +1,8 @@
MODULE = winevdm.exe
APPMODE = -mwindows
IMPORTS = user32 kernel comctl32
EXTRADLLFLAGS = -mwindows -mcygwin
C_SRCS = \
winevdm.c

View File

@ -1888,6 +1888,11 @@ int main(int argc, char **argv)
raw_compiler_arg = 0;
raw_winebuild_arg = 1;
}
if (strcmp("-mcygwin", opts.args->base[i]) == 0)
{
opts.use_msvcrt = 0;
raw_compiler_arg = 0;
}
else if (strcmp("-mwindows", opts.args->base[i]) == 0)
{
opts.gui_app = 1;