system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-03 08:19:41 +00:00
Code Issues Projects Releases Wiki Activity

makefiles: Use the defined external lib variables also when building the libs themselves.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2022-06-29 09:33:15 +02:00
parent d461cca19a
commit e2d96342df
9 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Makefile.in
View File

@ -429,6 +429,7 @@ SOURCES = \
mimeole.idl \
minidumpapiset.h \
minmax.h \
minschannel.h \
mlang.idl \
mmc.idl \
mmddk.h \

2
libs/faudio/Makefile.in
View File

@ -1,5 +1,5 @@
EXTLIB = libfaudio.a
EXTRAINCL = -I$(srcdir)/include
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC -DNDEBUG
C_SRCS = \

2
libs/gsm/Makefile.in
View File

@ -1,5 +1,5 @@
EXTLIB = libgsm.a
EXTRAINCL = -I$(srcdir)/inc
EXTRAINCL = $(GSM_PE_CFLAGS)
EXTRADEFS = -DWAV49
C_SRCS = \

3
libs/jxr/Makefile.in
View File

@ -1,5 +1,6 @@
EXTLIB = libjxr.a
EXTRAINCL = -I$(srcdir)/jxrgluelib -I$(srcdir)/image/sys -DDISABLE_PERF_MEASUREMENT
EXTRAINCL = $(JXR_PE_CFLAGS)
EXTRADEFS = -DDISABLE_PERF_MEASUREMENT
C_SRCS = \
image/decode/JXRTranscode.c \

2
libs/lcms2/Makefile.in
View File

@ -1,5 +1,5 @@
EXTLIB = liblcms2.a
EXTRAINCL = -I$(srcdir)/include
EXTRAINCL = $(LCMS2_PE_CFLAGS)
C_SRCS = \
src/cmsalpha.c \

2
libs/mpg123/Makefile.in
View File

@ -1,5 +1,5 @@
EXTLIB = libmpg123.a
EXTRAINCL = -I$(srcdir)/src -I$(srcdir)/src/compat -I$(srcdir)/src/libmpg123
EXTRAINCL = -I$(srcdir)/src -I$(srcdir)/src/compat $(MPG123_PE_CFLAGS)
EXTRADEFS = -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DNO_CATCHSIGNAL -DMPG123_NO_LARGENAME
C_SRCS = \

2
libs/tiff/Makefile.in
View File

@ -1,5 +1,5 @@
EXTLIB = libtiff.a
EXTRAINCL = -I$(srcdir)/libtiff $(JPEG_PE_CFLAGS) $(ZLIB_PE_CFLAGS)
EXTRAINCL = $(TIFF_PE_CFLAGS) $(JPEG_PE_CFLAGS) $(ZLIB_PE_CFLAGS)
C_SRCS = \
libtiff/tif_aux.c \

2
libs/vkd3d/Makefile.in
View File

@ -1,5 +1,5 @@
EXTLIB = libvkd3d.a
EXTRAINCL = -I$(srcdir)/include -I$(srcdir)/include/private -I$(srcdir)/libs/vkd3d -I$(srcdir)/libs/vkd3d-shader
EXTRAINCL = $(VKD3D_PE_CFLAGS) -I$(srcdir)/include/private -I$(srcdir)/libs/vkd3d -I$(srcdir)/libs/vkd3d-shader
EXTRADEFS = \
-DWINE_NO_NAMELESS_EXTENSION \
-DCONST_VTABLE \

12
tools/makedep.c
View File

@ -4152,10 +4152,20 @@ static void load_sources( struct makefile *make )
value = get_expanded_make_var_array( make, "EXTRAINCL" );
for (i = 0; i < value.count; i++)
{
if (!strncmp( value.str[i], "-I", 2 ))
strarray_add_uniq( &make->include_paths, value.str[i] + 2 );
{
const char *dir = value.str[i] + 2;
if (!strncmp( dir, "./", 2 ))
{
dir += 2;
while (*dir == '/') dir++;
}
strarray_add_uniq( &make->include_paths, dir );
}
else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 ))
strarray_add_uniq( &make->define_args, value.str[i] );
}
strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));
strarray_add( &make->include_args, strmake( "-I%s", obj_dir_path( make, "" )));