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
87eb0a54
Commit
87eb0a54
authored
Nov 22, 2022
by
Brendan Shanks
Committed by
Alexandre Julliard
Dec 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Always enable Mac driver on macOS.
parent
e2c081a8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
22 deletions
+2
-22
configure
configure
+1
-13
configure.ac
configure.ac
+1
-9
No files found.
configure
View file @
87eb0a54
...
...
@@ -9807,6 +9807,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LIBEXT
=
"dylib"
DLLFLAGS
=
"
$DLLFLAGS
-fPIC"
LDDLLFLAGS
=
"-fPIC"
enable_winemac_drv
=
${
enable_winemac_drv
:-
yes
}
COREFOUNDATION_LIBS
=
"-framework CoreFoundation"
IOKIT_LIBS
=
"-framework IOKit -framework CoreFoundation"
...
...
@@ -10036,19 +10037,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if
test
"
$ac_cv_header_ApplicationServices_ApplicationServices_h
"
=
"yes"
then
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"
$LIBS
$APPLICATIONSERVICES_LIBS
"
ac_fn_c_check_func
"
$LINENO
"
"CGDisplayModeGetWidth"
"ac_cv_func_CGDisplayModeGetWidth"
if
test
"x
$ac_cv_func_CGDisplayModeGetWidth
"
=
xyes
then
:
enable_winemac_drv
=
${
enable_winemac_drv
:-
yes
}
fi
LIBS
=
"
$ac_save_LIBS
"
fi
UNIXLDFLAGS
=
"-dynamiclib -install_name @rpath/
\$
(UNIXLIB) -Wl,-rpath,@loader_path
\/
"
LIBWINE_SHAREDLIB
=
"libwine.
$libwine_version
.dylib"
...
...
configure.ac
View file @
87eb0a54
...
...
@@ -682,6 +682,7 @@ case $host_os in
LIBEXT="dylib"
DLLFLAGS="$DLLFLAGS -fPIC"
LDDLLFLAGS="-fPIC"
enable_winemac_drv=${enable_winemac_drv:-yes}
dnl declare needed frameworks
AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation")
AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation")
...
...
@@ -760,15 +761,6 @@ case $host_os in
AC_LANG_POP([Objective C])
fi
dnl Enable Mac driver on Mac OS X 10.6 or later
if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
then
ac_save_LIBS="$LIBS"
LIBS="$LIBS $APPLICATIONSERVICES_LIBS"
AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes})
LIBS="$ac_save_LIBS"
fi
UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
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"])
...
...
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