Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5e0479c4
Commit
5e0479c4
authored
Sep 22, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Don't use winegcc to build native Unix libraries.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ae06f748
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
131 additions
and
50 deletions
+131
-50
Makefile.in
Makefile.in
+2
-0
configure
configure
+58
-0
configure.ac
configure.ac
+8
-4
Makefile.in
dlls/ntdll/Makefile.in
+1
-1
Makefile.in
dlls/winepulse.drv/Makefile.in
+1
-1
makedep.c
tools/makedep.c
+61
-44
No files found.
Makefile.in
View file @
5e0479c4
...
@@ -47,6 +47,8 @@ MSVCRTFLAGS = @MSVCRTFLAGS@
...
@@ -47,6 +47,8 @@ MSVCRTFLAGS = @MSVCRTFLAGS@
TARGETFLAGS
=
@TARGETFLAGS@
TARGETFLAGS
=
@TARGETFLAGS@
LDDLLFLAGS
=
@LDDLLFLAGS@
LDDLLFLAGS
=
@LDDLLFLAGS@
LDEXECFLAGS
=
@LDEXECFLAGS@
LDEXECFLAGS
=
@LDEXECFLAGS@
UNIXDLLFLAGS
=
@UNIXDLLFLAGS@
UNIXLDFLAGS
=
@UNIXLDFLAGS@
LIBS
=
@LIBS@
LIBS
=
@LIBS@
BISON
=
@BISON@
BISON
=
@BISON@
FLEX
=
@FLEX@
FLEX
=
@FLEX@
...
...
configure
View file @
5e0479c4
...
@@ -751,6 +751,8 @@ WINEPRELOADER_LDFLAGS
...
@@ -751,6 +751,8 @@ WINEPRELOADER_LDFLAGS
WINELOADER_LDFLAGS
WINELOADER_LDFLAGS
TOP_INSTALL_DEV
TOP_INSTALL_DEV
TOP_INSTALL_LIB
TOP_INSTALL_LIB
UNIXLDFLAGS
UNIXDLLFLAGS
LDEXECFLAGS
LDEXECFLAGS
LDDLLFLAGS
LDDLLFLAGS
DLLFLAGS
DLLFLAGS
...
@@ -7940,6 +7942,10 @@ LDDLLFLAGS=""
...
@@ -7940,6 +7942,10 @@ LDDLLFLAGS=""
LDEXECFLAGS
=
""
LDEXECFLAGS
=
""
UNIXDLLFLAGS
=
"-fPIC"
UNIXLDFLAGS
=
"-shared -Wl,-Bsymbolic -Wl,-soname,
\$
(UNIXLIB)"
TOP_INSTALL_LIB
=
""
TOP_INSTALL_LIB
=
""
TOP_INSTALL_DEV
=
""
TOP_INSTALL_DEV
=
""
...
@@ -9118,6 +9124,7 @@ fi
...
@@ -9118,6 +9124,7 @@ fi
LIBS
=
"
$ac_save_LIBS
"
LIBS
=
"
$ac_save_LIBS
"
fi
fi
UNIXLDFLAGS
=
"-dynamiclib -install_name @loader_path/
\$
(UNIXLIB)"
LIBWINE_SHAREDLIB
=
"libwine.
$libwine_version
.dylib"
LIBWINE_SHAREDLIB
=
"libwine.
$libwine_version
.dylib"
LIBWINE_LDFLAGS
=
"-dynamiclib -install_name @rpath/libwine.
$libwine_soversion
.dylib -Wl,-rpath,@loader_path/ -compatibility_version
$libwine_soversion
-current_version
$libwine_version
"
LIBWINE_LDFLAGS
=
"-dynamiclib -install_name @rpath/libwine.
$libwine_soversion
.dylib -Wl,-rpath,@loader_path/ -compatibility_version
$libwine_soversion
-current_version
$libwine_version
"
...
@@ -9132,6 +9139,31 @@ fi
...
@@ -9132,6 +9139,31 @@ fi
LDDLLFLAGS
=
"-fPIC"
LDDLLFLAGS
=
"-fPIC"
LDEXECFLAGS
=
"-Wl,-pie"
LDEXECFLAGS
=
"-Wl,-pie"
enable_wineandroid_drv
=
${
enable_wineandroid_drv
:-
yes
}
enable_wineandroid_drv
=
${
enable_wineandroid_drv
:-
yes
}
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,-z,defs"
>
&5
$as_echo_n
"checking whether the compiler supports -Wl,-z,defs... "
>
&6
;
}
if
${
ac_cv_cflags__Wl__z_defs
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
ac_wine_try_cflags_saved
=
$CFLAGS
CFLAGS
=
"
$CFLAGS
-Wl,-z,defs"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
int main(int argc, char **argv) { return 0; }
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_cflags__Wl__z_defs
=
yes
else
ac_cv_cflags__Wl__z_defs
=
no
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
CFLAGS
=
$ac_wine_try_cflags_saved
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_cflags__Wl__z_defs
"
>
&5
$as_echo
"
$ac_cv_cflags__Wl__z_defs
"
>
&6
;
}
if
test
"x
$ac_cv_cflags__Wl__z_defs
"
=
xyes
;
then
:
UNIXLDFLAGS
=
"
$UNIXLDFLAGS
-Wl,-z,defs"
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -fPIC -Wl,--export-dynamic"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -fPIC -Wl,--export-dynamic"
>
&5
$as_echo_n
"checking whether the compiler supports -fPIC -Wl,--export-dynamic... "
>
&6
;
}
$as_echo_n
"checking whether the compiler supports -fPIC -Wl,--export-dynamic... "
>
&6
;
}
if
${
ac_cv_cflags__fPIC__Wl___export_dynamic
+
:
}
false
;
then
:
if
${
ac_cv_cflags__fPIC__Wl___export_dynamic
+
:
}
false
;
then
:
...
@@ -9346,6 +9378,31 @@ if test "x$ac_cv_cflags__shared__Wl___version_script_conftest_map" = xyes; then
...
@@ -9346,6 +9378,31 @@ if test "x$ac_cv_cflags__shared__Wl___version_script_conftest_map" = xyes; then
fi
fi
rm
-f
conftest.map
rm
-f
conftest.map
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,-z,defs"
>
&5
$as_echo_n
"checking whether the compiler supports -Wl,-z,defs... "
>
&6
;
}
if
${
ac_cv_cflags__Wl__z_defs
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
ac_wine_try_cflags_saved
=
$CFLAGS
CFLAGS
=
"
$CFLAGS
-Wl,-z,defs"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
int main(int argc, char **argv) { return 0; }
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_cflags__Wl__z_defs
=
yes
else
ac_cv_cflags__Wl__z_defs
=
no
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
CFLAGS
=
$ac_wine_try_cflags_saved
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_cflags__Wl__z_defs
"
>
&5
$as_echo
"
$ac_cv_cflags__Wl__z_defs
"
>
&6
;
}
if
test
"x
$ac_cv_cflags__Wl__z_defs
"
=
xyes
;
then
:
UNIXLDFLAGS
=
"
$UNIXLDFLAGS
-Wl,-z,defs"
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,--export-dynamic"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,--export-dynamic"
>
&5
$as_echo_n
"checking whether the compiler supports -Wl,--export-dynamic... "
>
&6
;
}
$as_echo_n
"checking whether the compiler supports -Wl,--export-dynamic... "
>
&6
;
}
if
${
ac_cv_cflags__Wl___export_dynamic
+
:
}
false
;
then
:
if
${
ac_cv_cflags__Wl___export_dynamic
+
:
}
false
;
then
:
...
@@ -17828,6 +17885,7 @@ if test "$ac_cv_c_cfi_support" = "yes"
...
@@ -17828,6 +17885,7 @@ if test "$ac_cv_c_cfi_support" = "yes"
then
then
DLLFLAGS
=
"
$DLLFLAGS
-fasynchronous-unwind-tables"
DLLFLAGS
=
"
$DLLFLAGS
-fasynchronous-unwind-tables"
LDDLLFLAGS
=
"
$LDDLLFLAGS
-fasynchronous-unwind-tables"
LDDLLFLAGS
=
"
$LDDLLFLAGS
-fasynchronous-unwind-tables"
UNIXDLLFLAGS
=
"
$UNIXDLLFLAGS
-fasynchronous-unwind-tables"
else
else
if
test
"x
$enable_win64
"
=
"xyes"
if
test
"x
$enable_win64
"
=
"xyes"
then
then
...
...
configure.ac
View file @
5e0479c4
...
@@ -701,6 +701,8 @@ dnl **** Check for working dll ****
...
@@ -701,6 +701,8 @@ dnl **** Check for working dll ****
AC_SUBST(DLLFLAGS,"")
AC_SUBST(DLLFLAGS,"")
AC_SUBST(LDDLLFLAGS,"")
AC_SUBST(LDDLLFLAGS,"")
AC_SUBST(LDEXECFLAGS,"")
AC_SUBST(LDEXECFLAGS,"")
AC_SUBST(UNIXDLLFLAGS,"-fPIC")
AC_SUBST(UNIXLDFLAGS,["-shared -Wl,-Bsymbolic -Wl,-soname,\$(UNIXLIB)"])
AC_SUBST(TOP_INSTALL_LIB,"")
AC_SUBST(TOP_INSTALL_LIB,"")
AC_SUBST(TOP_INSTALL_DEV,"")
AC_SUBST(TOP_INSTALL_DEV,"")
AC_SUBST(WINELOADER_LDFLAGS,"")
AC_SUBST(WINELOADER_LDFLAGS,"")
...
@@ -862,6 +864,7 @@ case $host_os in
...
@@ -862,6 +864,7 @@ case $host_os in
LIBS="$ac_save_LIBS"
LIBS="$ac_save_LIBS"
fi
fi
UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)"
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib")
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib")
AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")
AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")
...
@@ -873,8 +876,8 @@ case $host_os in
...
@@ -873,8 +876,8 @@ case $host_os in
LDDLLFLAGS="-fPIC"
LDDLLFLAGS="-fPIC"
LDEXECFLAGS="-Wl,-pie"
LDEXECFLAGS="-Wl,-pie"
enable_wineandroid_drv=${enable_wineandroid_drv:-yes}
enable_wineandroid_drv=${enable_wineandroid_drv:-yes}
WINE_TRY_CFLAGS([-
fPIC -Wl,--export-dynamic],
WINE_TRY_CFLAGS([-
Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"])
[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
WINE_CHECK_SONAME(EGL,eglGetProcAddress)
WINE_CHECK_SONAME(EGL,eglGetProcAddress)
...
@@ -909,8 +912,8 @@ case $host_os in
...
@@ -909,8 +912,8 @@ case $host_os in
[LIBWINE_LDFLAGS="$LIBWINE_LDFLAGS -Wl,--version-script=\$(srcdir)/wine.map"])
[LIBWINE_LDFLAGS="$LIBWINE_LDFLAGS -Wl,--version-script=\$(srcdir)/wine.map"])
rm -f conftest.map
rm -f conftest.map
WINE_TRY_CFLAGS([-Wl,-
-export-dynamic],
WINE_TRY_CFLAGS([-Wl,-
z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"])
[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
WINE_TRY_CFLAGS([-Wl,--export-dynamic],
[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
case $host_cpu in
case $host_cpu in
...
@@ -2101,6 +2104,7 @@ if test "$ac_cv_c_cfi_support" = "yes"
...
@@ -2101,6 +2104,7 @@ if test "$ac_cv_c_cfi_support" = "yes"
then
then
DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables"
DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables"
LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables"
LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables"
UNIXDLLFLAGS="$UNIXDLLFLAGS -fasynchronous-unwind-tables"
else
else
if test "x$enable_win64" = "xyes"
if test "x$enable_win64" = "xyes"
then
then
...
...
dlls/ntdll/Makefile.in
View file @
5e0479c4
...
@@ -4,7 +4,7 @@ UNIXLIB = ntdll.so
...
@@ -4,7 +4,7 @@ UNIXLIB = ntdll.so
IMPORTLIB
=
ntdll
IMPORTLIB
=
ntdll
IMPORTS
=
winecrt0
IMPORTS
=
winecrt0
EXTRAINCL
=
$(UNWIND_CFLAGS)
EXTRAINCL
=
$(UNWIND_CFLAGS)
EXTRALIBS
=
-lwinecrt0
$(IOKIT_LIBS)
$(COREFOUNDATION_LIBS)
$(CORESERVICES_LIBS)
$(RT_LIBS)
$(PTHREAD_LIBS)
$(UNWIND_LIBS)
$(I386_LIBS)
$(PROCSTAT_LIBS)
EXTRALIBS
=
-lwinecrt0
$(IOKIT_LIBS)
$(COREFOUNDATION_LIBS)
$(CORESERVICES_LIBS)
$(RT_LIBS)
$(PTHREAD_LIBS)
$(UNWIND_LIBS)
$(I386_LIBS)
$(PROCSTAT_LIBS)
-lm
EXTRADLLFLAGS
=
-nodefaultlibs
-Wl
,--image-base,0x7bc00000
EXTRADLLFLAGS
=
-nodefaultlibs
-Wl
,--image-base,0x7bc00000
...
...
dlls/winepulse.drv/Makefile.in
View file @
5e0479c4
MODULE
=
winepulse.drv
MODULE
=
winepulse.drv
UNIXLIB
=
winepulse.so
UNIXLIB
=
winepulse.so
IMPORTS
=
dxguid uuid winmm user32 advapi32 ole32
IMPORTS
=
dxguid uuid winmm user32 advapi32 ole32
EXTRALIBS
=
$(PULSE_LIBS)
$(PTHREAD_LIBS)
EXTRALIBS
=
$(PULSE_LIBS)
$(PTHREAD_LIBS)
-lm
EXTRAINCL
=
$(PULSE_CFLAGS)
EXTRAINCL
=
$(PULSE_CFLAGS)
C_SRCS
=
\
C_SRCS
=
\
...
...
tools/makedep.c
View file @
5e0479c4
...
@@ -137,6 +137,7 @@ enum install_rules { INSTALL_LIB, INSTALL_DEV, NB_INSTALL_RULES };
...
@@ -137,6 +137,7 @@ enum install_rules { INSTALL_LIB, INSTALL_DEV, NB_INSTALL_RULES };
/* variables common to all makefiles */
/* variables common to all makefiles */
static
struct
strarray
linguas
;
static
struct
strarray
linguas
;
static
struct
strarray
dll_flags
;
static
struct
strarray
dll_flags
;
static
struct
strarray
unix_dllflags
;
static
struct
strarray
target_flags
;
static
struct
strarray
target_flags
;
static
struct
strarray
msvcrt_flags
;
static
struct
strarray
msvcrt_flags
;
static
struct
strarray
extra_cflags
;
static
struct
strarray
extra_cflags
;
...
@@ -2013,7 +2014,8 @@ static void add_generated_sources( struct makefile *make )
...
@@ -2013,7 +2014,8 @@ static void add_generated_sources( struct makefile *make )
if
(
strendswith
(
objs
.
str
[
i
],
".o"
))
if
(
strendswith
(
objs
.
str
[
i
],
".o"
))
{
{
file
=
add_generated_source
(
make
,
objs
.
str
[
i
],
replace_extension
(
objs
.
str
[
i
],
".o"
,
".c"
));
file
=
add_generated_source
(
make
,
objs
.
str
[
i
],
replace_extension
(
objs
.
str
[
i
],
".o"
,
".c"
));
if
(
make
->
module
||
make
->
staticlib
)
file
->
file
->
flags
|=
FLAG_C_UNIX
;
file
->
file
->
flags
|=
FLAG_C_UNIX
;
file
->
use_msvcrt
=
0
;
}
}
else
if
(
strendswith
(
objs
.
str
[
i
],
".res"
))
else
if
(
strendswith
(
objs
.
str
[
i
],
".res"
))
add_generated_source
(
make
,
replace_extension
(
objs
.
str
[
i
],
".res"
,
".rc"
),
NULL
);
add_generated_source
(
make
,
replace_extension
(
objs
.
str
[
i
],
".res"
,
".rc"
),
NULL
);
...
@@ -3170,7 +3172,11 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
...
@@ -3170,7 +3172,11 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
output
(
"%s.o: %s
\n
"
,
obj_dir_path
(
make
,
obj
),
source
->
filename
);
output
(
"%s.o: %s
\n
"
,
obj_dir_path
(
make
,
obj
),
source
->
filename
);
output
(
"
\t
%s$(CC) -c -o $@ %s"
,
cmd_prefix
(
"CC"
),
source
->
filename
);
output
(
"
\t
%s$(CC) -c -o $@ %s"
,
cmd_prefix
(
"CC"
),
source
->
filename
);
output_filenames
(
defines
);
output_filenames
(
defines
);
if
(
make
->
module
||
make
->
staticlib
||
make
->
sharedlib
||
make
->
testdll
)
if
(
make
->
sharedlib
||
(
make
->
staticlib
&&
!
make
->
module
)
||
(
source
->
file
->
flags
&
FLAG_C_UNIX
))
{
output_filenames
(
unix_dllflags
);
}
else
if
(
make
->
module
||
make
->
staticlib
||
make
->
testdll
)
{
{
output_filenames
(
dll_flags
);
output_filenames
(
dll_flags
);
if
(
source
->
use_msvcrt
)
output_filenames
(
msvcrt_flags
);
if
(
source
->
use_msvcrt
)
output_filenames
(
msvcrt_flags
);
...
@@ -3413,14 +3419,24 @@ static void output_module( struct makefile *make )
...
@@ -3413,14 +3419,24 @@ static void output_module( struct makefile *make )
output
(
"%s:"
,
obj_dir_path
(
make
,
make
->
unixlib
));
output
(
"%s:"
,
obj_dir_path
(
make
,
make
->
unixlib
));
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output_filenames
(
unix_deps
);
output_filenames
(
unix_deps
);
if
(
!
make
->
native_unix_lib
)
output_filename
(
tools_path
(
make
,
"winebuild"
));
output_filename
(
tools_path
(
make
,
"winegcc"
));
if
(
make
->
native_unix_lib
)
output
(
"
\n
"
);
{
output_winegcc_command
(
make
,
0
);
output
(
"
\n
"
);
output_filename
(
"-munix"
);
output
(
"
\t
%s$(CC) -o $@"
,
cmd_prefix
(
"CCLD"
));
output_filename
(
"-shared"
);
output_filenames
(
get_expanded_make_var_array
(
make
,
"UNIXLDFLAGS"
));
if
(
spec_file
&&
!
make
->
native_unix_lib
)
output_filename
(
spec_file
);
}
if
(
strarray_exists
(
&
make
->
extradllflags
,
"-nodefaultlibs"
))
output_filename
(
"-nodefaultlibs"
);
else
{
output_filename
(
tools_path
(
make
,
"winebuild"
));
output_filename
(
tools_path
(
make
,
"winegcc"
));
output
(
"
\n
"
);
output_winegcc_command
(
make
,
0
);
output_filename
(
"-munix"
);
output_filename
(
"-shared"
);
if
(
spec_file
)
output_filename
(
spec_file
);
if
(
strarray_exists
(
&
make
->
extradllflags
,
"-nodefaultlibs"
))
output_filename
(
"-nodefaultlibs"
);
}
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output_filenames
(
unix_libs
);
output_filenames
(
unix_libs
);
output_filename
(
"$(LDFLAGS)"
);
output_filename
(
"$(LDFLAGS)"
);
...
@@ -3559,7 +3575,7 @@ static void output_shared_lib( struct makefile *make )
...
@@ -3559,7 +3575,7 @@ static void output_shared_lib( struct makefile *make )
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames
(
dep_libs
);
output_filenames
(
dep_libs
);
output
(
"
\n
"
);
output
(
"
\n
"
);
output
(
"
\t
%s$(CC) -o $@"
,
cmd_prefix
(
"CC"
));
output
(
"
\t
%s$(CC) -o $@"
,
cmd_prefix
(
"CC
LD
"
));
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames
(
all_libs
);
output_filenames
(
all_libs
);
output_filename
(
"$(LDFLAGS)"
);
output_filename
(
"$(LDFLAGS)"
);
...
@@ -4415,40 +4431,41 @@ int main( int argc, char *argv[] )
...
@@ -4415,40 +4431,41 @@ int main( int argc, char *argv[] )
top_makefile
=
parse_makefile
(
NULL
);
top_makefile
=
parse_makefile
(
NULL
);
target_flags
=
get_expanded_make_var_array
(
top_makefile
,
"TARGETFLAGS"
);
target_flags
=
get_expanded_make_var_array
(
top_makefile
,
"TARGETFLAGS"
);
msvcrt_flags
=
get_expanded_make_var_array
(
top_makefile
,
"MSVCRTFLAGS"
);
msvcrt_flags
=
get_expanded_make_var_array
(
top_makefile
,
"MSVCRTFLAGS"
);
dll_flags
=
get_expanded_make_var_array
(
top_makefile
,
"DLLFLAGS"
);
dll_flags
=
get_expanded_make_var_array
(
top_makefile
,
"DLLFLAGS"
);
extra_cflags
=
get_expanded_make_var_array
(
top_makefile
,
"EXTRACFLAGS"
);
extra_cflags
=
get_expanded_make_var_array
(
top_makefile
,
"EXTRACFLAGS"
);
extra_cross_cflags
=
get_expanded_make_var_array
(
top_makefile
,
"EXTRACROSSCFLAGS"
);
extra_cross_cflags
=
get_expanded_make_var_array
(
top_makefile
,
"EXTRACROSSCFLAGS"
);
cpp_flags
=
get_expanded_make_var_array
(
top_makefile
,
"CPPFLAGS"
);
unix_dllflags
=
get_expanded_make_var_array
(
top_makefile
,
"UNIXDLLFLAGS"
);
lddll_flags
=
get_expanded_make_var_array
(
top_makefile
,
"LDDLLFLAGS"
);
cpp_flags
=
get_expanded_make_var_array
(
top_makefile
,
"CPPFLAGS"
);
libs
=
get_expanded_make_var_array
(
top_makefile
,
"LIBS"
);
lddll_flags
=
get_expanded_make_var_array
(
top_makefile
,
"LDDLLFLAGS"
);
enable_tests
=
get_expanded_make_var_array
(
top_makefile
,
"ENABLE_TESTS"
);
libs
=
get_expanded_make_var_array
(
top_makefile
,
"LIBS"
);
delay_load_flag
=
get_expanded_make_variable
(
top_makefile
,
"DELAYLOADFLAG"
);
enable_tests
=
get_expanded_make_var_array
(
top_makefile
,
"ENABLE_TESTS"
);
top_install_lib
=
get_expanded_make_var_array
(
top_makefile
,
"TOP_INSTALL_LIB"
);
top_install_lib
=
get_expanded_make_var_array
(
top_makefile
,
"TOP_INSTALL_LIB"
);
top_install_dev
=
get_expanded_make_var_array
(
top_makefile
,
"TOP_INSTALL_DEV"
);
top_install_dev
=
get_expanded_make_var_array
(
top_makefile
,
"TOP_INSTALL_DEV"
);
root_src_dir
=
get_expanded_make_variable
(
top_makefile
,
"srcdir"
);
delay_load_flag
=
get_expanded_make_variable
(
top_makefile
,
"DELAYLOADFLAG"
);
tools_dir
=
get_expanded_make_variable
(
top_makefile
,
"TOOLSDIR"
);
root_src_dir
=
get_expanded_make_variable
(
top_makefile
,
"srcdir"
);
tools_ext
=
get_expanded_make_variable
(
top_makefile
,
"TOOLSEXT"
);
tools_dir
=
get_expanded_make_variable
(
top_makefile
,
"TOOLSDIR"
);
exe_ext
=
get_expanded_make_variable
(
top_makefile
,
"EXEEXT"
);
tools_ext
=
get_expanded_make_variable
(
top_makefile
,
"TOOLSEXT"
);
man_ext
=
get_expanded_make_variable
(
top_makefile
,
"api_manext"
);
exe_ext
=
get_expanded_make_variable
(
top_makefile
,
"EXEEXT"
);
dll_ext
=
(
exe_ext
&&
!
strcmp
(
exe_ext
,
".exe"
))
?
""
:
".so"
;
man_ext
=
get_expanded_make_variable
(
top_makefile
,
"api_manext"
);
host_cpu
=
get_expanded_make_variable
(
top_makefile
,
"host_cpu"
);
dll_ext
=
(
exe_ext
&&
!
strcmp
(
exe_ext
,
".exe"
))
?
""
:
".so"
;
crosstarget
=
get_expanded_make_variable
(
top_makefile
,
"CROSSTARGET"
);
host_cpu
=
get_expanded_make_variable
(
top_makefile
,
"host_cpu"
);
crossdebug
=
get_expanded_make_variable
(
top_makefile
,
"CROSSDEBUG"
);
crosstarget
=
get_expanded_make_variable
(
top_makefile
,
"CROSSTARGET"
);
fontforge
=
get_expanded_make_variable
(
top_makefile
,
"FONTFORGE"
);
crossdebug
=
get_expanded_make_variable
(
top_makefile
,
"CROSSDEBUG"
);
convert
=
get_expanded_make_variable
(
top_makefile
,
"CONVERT"
);
fontforge
=
get_expanded_make_variable
(
top_makefile
,
"FONTFORGE"
);
flex
=
get_expanded_make_variable
(
top_makefile
,
"FLEX"
);
convert
=
get_expanded_make_variable
(
top_makefile
,
"CONVERT"
);
bison
=
get_expanded_make_variable
(
top_makefile
,
"BISON"
);
flex
=
get_expanded_make_variable
(
top_makefile
,
"FLEX"
);
ar
=
get_expanded_make_variable
(
top_makefile
,
"AR"
);
bison
=
get_expanded_make_variable
(
top_makefile
,
"BISON"
);
ranlib
=
get_expanded_make_variable
(
top_makefile
,
"RANLIB"
);
ar
=
get_expanded_make_variable
(
top_makefile
,
"AR"
);
rsvg
=
get_expanded_make_variable
(
top_makefile
,
"RSVG"
);
ranlib
=
get_expanded_make_variable
(
top_makefile
,
"RANLIB"
);
icotool
=
get_expanded_make_variable
(
top_makefile
,
"ICOTOOL"
);
rsvg
=
get_expanded_make_variable
(
top_makefile
,
"RSVG"
);
dlltool
=
get_expanded_make_variable
(
top_makefile
,
"DLLTOOL"
);
icotool
=
get_expanded_make_variable
(
top_makefile
,
"ICOTOOL"
);
msgfmt
=
get_expanded_make_variable
(
top_makefile
,
"MSGFMT"
);
dlltool
=
get_expanded_make_variable
(
top_makefile
,
"DLLTOOL"
);
sed_cmd
=
get_expanded_make_variable
(
top_makefile
,
"SED_CMD"
);
msgfmt
=
get_expanded_make_variable
(
top_makefile
,
"MSGFMT"
);
ln_s
=
get_expanded_make_variable
(
top_makefile
,
"LN_S"
);
sed_cmd
=
get_expanded_make_variable
(
top_makefile
,
"SED_CMD"
);
ln_s
=
get_expanded_make_variable
(
top_makefile
,
"LN_S"
);
if
(
root_src_dir
&&
!
strcmp
(
root_src_dir
,
"."
))
root_src_dir
=
NULL
;
if
(
root_src_dir
&&
!
strcmp
(
root_src_dir
,
"."
))
root_src_dir
=
NULL
;
if
(
tools_dir
&&
!
strcmp
(
tools_dir
,
"."
))
tools_dir
=
NULL
;
if
(
tools_dir
&&
!
strcmp
(
tools_dir
,
"."
))
tools_dir
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment