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
80fc252f
Commit
80fc252f
authored
Jun 15, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Pass the dll extension from configure.
parent
a58ec769
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
configure
configure
+5
-0
configure.ac
configure.ac
+2
-0
makedep.c
tools/makedep.c
+2
-1
No files found.
configure
View file @
80fc252f
...
@@ -766,6 +766,7 @@ SUBDIRS
...
@@ -766,6 +766,7 @@ SUBDIRS
READELF
READELF
OTOOL
OTOOL
LDD
LDD
DLLEXT
WINEPRELOADER_LDFLAGS
WINEPRELOADER_LDFLAGS
WINELOADER_LDFLAGS
WINELOADER_LDFLAGS
TOP_INSTALL_DEV
TOP_INSTALL_DEV
...
@@ -9146,6 +9147,8 @@ WINELOADER_LDFLAGS=""
...
@@ -9146,6 +9147,8 @@ WINELOADER_LDFLAGS=""
WINEPRELOADER_LDFLAGS
=
""
WINEPRELOADER_LDFLAGS
=
""
DLLEXT
=
".so"
LIBEXT
=
"so"
LIBEXT
=
"so"
# Extract the first word of "ldd", so it can be a program name with args.
# Extract the first word of "ldd", so it can be a program name with args.
set
dummy ldd
;
ac_word
=
$2
set
dummy ldd
;
ac_word
=
$2
...
@@ -9437,6 +9440,7 @@ $ac_links:
...
@@ -9437,6 +9440,7 @@ $ac_links:
case
$host_os
in
case
$host_os
in
cygwin
*
|
mingw32
*
)
cygwin
*
|
mingw32
*
)
LIBEXT
=
"dll"
LIBEXT
=
"dll"
DLLEXT
=
""
EXTRACFLAGS
=
"-D__WINE_PE_BUILD"
EXTRACFLAGS
=
"-D__WINE_PE_BUILD"
case
$host_cpu
in
case
$host_cpu
in
*
i[3456]86
*
)
{
printf
"%s
\n
"
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,--disable-stdcall-fixup"
>
&5
*
i[3456]86
*
)
{
printf
"%s
\n
"
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the compiler supports -Wl,--disable-stdcall-fixup"
>
&5
...
@@ -23204,6 +23208,7 @@ TOP_INSTALL_LIB = $TOP_INSTALL_LIB
...
@@ -23204,6 +23208,7 @@ TOP_INSTALL_LIB = $TOP_INSTALL_LIB
TOP_INSTALL_DEV =
$TOP_INSTALL_DEV
TOP_INSTALL_DEV =
$TOP_INSTALL_DEV
WINELOADER_LDFLAGS =
$WINELOADER_LDFLAGS
WINELOADER_LDFLAGS =
$WINELOADER_LDFLAGS
WINEPRELOADER_LDFLAGS =
$WINEPRELOADER_LDFLAGS
WINEPRELOADER_LDFLAGS =
$WINEPRELOADER_LDFLAGS
DLLEXT =
$DLLEXT
LDD =
$LDD
LDD =
$LDD
OTOOL =
$OTOOL
OTOOL =
$OTOOL
READELF =
$READELF
READELF =
$READELF
...
...
configure.ac
View file @
80fc252f
...
@@ -643,6 +643,7 @@ AC_SUBST(TOP_INSTALL_LIB,"")
...
@@ -643,6 +643,7 @@ AC_SUBST(TOP_INSTALL_LIB,"")
AC_SUBST(TOP_INSTALL_DEV,"")
AC_SUBST(TOP_INSTALL_DEV,"")
AC_SUBST(WINELOADER_LDFLAGS,"")
AC_SUBST(WINELOADER_LDFLAGS,"")
AC_SUBST(WINEPRELOADER_LDFLAGS,"")
AC_SUBST(WINEPRELOADER_LDFLAGS,"")
AC_SUBST(DLLEXT,".so")
LIBEXT="so"
LIBEXT="so"
WINE_PATH_SONAME_TOOLS
WINE_PATH_SONAME_TOOLS
WINE_CONFIG_HELPERS
WINE_CONFIG_HELPERS
...
@@ -650,6 +651,7 @@ WINE_CONFIG_HELPERS
...
@@ -650,6 +651,7 @@ WINE_CONFIG_HELPERS
case $host_os in
case $host_os in
cygwin*|mingw32*)
cygwin*|mingw32*)
LIBEXT="dll"
LIBEXT="dll"
DLLEXT=""
EXTRACFLAGS="-D__WINE_PE_BUILD"
EXTRACFLAGS="-D__WINE_PE_BUILD"
dnl Disable stdcall fixups to catch prototype mismatches
dnl Disable stdcall fixups to catch prototype mismatches
case $host_cpu in
case $host_cpu in
...
...
tools/makedep.c
View file @
80fc252f
...
@@ -4407,7 +4407,7 @@ int main( int argc, char *argv[] )
...
@@ -4407,7 +4407,7 @@ int main( int argc, char *argv[] )
tools_dir
=
get_expanded_make_variable
(
top_makefile
,
"toolsdir"
);
tools_dir
=
get_expanded_make_variable
(
top_makefile
,
"toolsdir"
);
tools_ext
=
get_expanded_make_variable
(
top_makefile
,
"toolsext"
);
tools_ext
=
get_expanded_make_variable
(
top_makefile
,
"toolsext"
);
exe_ext
=
get_expanded_make_variable
(
top_makefile
,
"EXEEXT"
);
exe_ext
=
get_expanded_make_variable
(
top_makefile
,
"EXEEXT"
);
dll_ext
=
(
exe_ext
&&
!
strcmp
(
exe_ext
,
".exe"
))
?
""
:
".so"
;
dll_ext
=
get_expanded_make_variable
(
top_makefile
,
"DLLEXT"
)
;
fontforge
=
get_expanded_make_variable
(
top_makefile
,
"FONTFORGE"
);
fontforge
=
get_expanded_make_variable
(
top_makefile
,
"FONTFORGE"
);
convert
=
get_expanded_make_variable
(
top_makefile
,
"CONVERT"
);
convert
=
get_expanded_make_variable
(
top_makefile
,
"CONVERT"
);
flex
=
get_expanded_make_variable
(
top_makefile
,
"FLEX"
);
flex
=
get_expanded_make_variable
(
top_makefile
,
"FLEX"
);
...
@@ -4424,6 +4424,7 @@ int main( int argc, char *argv[] )
...
@@ -4424,6 +4424,7 @@ int main( int argc, char *argv[] )
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
;
if
(
!
exe_ext
)
exe_ext
=
""
;
if
(
!
exe_ext
)
exe_ext
=
""
;
if
(
!
dll_ext
)
dll_ext
=
""
;
if
(
!
tools_ext
)
tools_ext
=
""
;
if
(
!
tools_ext
)
tools_ext
=
""
;
strarray_add
(
&
archs
,
get_expanded_make_variable
(
top_makefile
,
"HOST_ARCH"
));
strarray_add
(
&
archs
,
get_expanded_make_variable
(
top_makefile
,
"HOST_ARCH"
));
...
...
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