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
7ed7e8fd
Commit
7ed7e8fd
authored
May 15, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Make libraries properly relocatable on MacOS.
Also set the compatibility version.
parent
17689c07
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
+8
-7
configure
configure
+1
-1
configure.ac
configure.ac
+1
-1
Makelib.rules.in
libs/Makelib.rules.in
+6
-2
Makefile.in
libs/wine/Makefile.in
+0
-3
No files found.
configure
View file @
7ed7e8fd
...
...
@@ -14188,7 +14188,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6
then
LIBEXT
=
"dylib"
LDDLLFLAGS
=
"-bundle"
LDSHARED
=
"
\$
(CC) -dynamiclib"
LDSHARED
=
"
\$
(CC) -dynamiclib
-install_name @executable_path/
\`\$
(RELPATH)
\$
(bindir)
\$
(libdir)
\`
/
\$
(DYNAME)
\$
(SOVERSION:%=-compatibility_version %)
"
STRIP
=
"
$STRIP
-u -r"
COREFOUNDATIONLIB
=
"-framework CoreFoundation"
...
...
configure.ac
View file @
7ed7e8fd
...
...
@@ -1127,7 +1127,7 @@ case $host_os in
then
LIBEXT="dylib"
LDDLLFLAGS="-bundle"
LDSHARED="\$(CC) -dynamiclib"
LDSHARED="\$(CC) -dynamiclib
-install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME) \$(SOVERSION:%=-compatibility_version %)
"
STRIP="$STRIP -u -r"
dnl declare needed frameworks
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
...
...
libs/Makelib.rules.in
View file @
7ed7e8fd
...
...
@@ -13,6 +13,7 @@ LIBEXT = @LIBEXT@
LIBNAME = lib$(LIBRARY)
DEFNAME = $(LIBRARY).def
SONAME = $(LIBNAME).so.$(SOVERSION)
DYNAME = $(LIBNAME).$(SOVERSION).dylib
MODULE = $(LIBNAME).$(LIBEXT)
all: $(MODULE) $(MODULE:.dll=.a)
...
...
@@ -31,8 +32,8 @@ $(LIBNAME).a: $(DEFNAME)
$(LIBNAME).dll: $(OBJS) $(DEFNAME) Makefile.in
$(DLLWRAP) --def $(SRCDIR)/$(DEFNAME) -o $@ $(OBJS) $(EXTRALIBS)
$(LIBNAME).$(SOVERSION).dylib: $(OBJS) Makefile.in
$(LDSHARED)
-install_name $(libdir)/$(LIBNAME).$(SOVERSION).dylib
$(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
$(LIBNAME).$(SOVERSION).dylib: $(OBJS)
$(RELPATH)
Makefile.in
$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
$(LIBNAME).dylib: $(LIBNAME).$(SOVERSION).dylib
$(RM) $@ && $(LN_S) $(LIBNAME).$(SOVERSION).dylib $@
...
...
@@ -71,3 +72,6 @@ uninstall::
clean::
$(RM) $(LIBNAME).so.$(SOVERSION) $(LIBNAME).dll $(LIBNAME).$(SOVERSION).dylib
$(RELPATH):
@cd $(TOOLSDIR)/tools && $(MAKE) relpath
libs/wine/Makefile.in
View file @
7ed7e8fd
...
...
@@ -30,7 +30,4 @@ CONFIGDIRS = \
config.o
:
config.c $(RELPATH)
$(CC)
-c
$(ALLCFLAGS)
-o
$@
$(SRCDIR)
/config.c
$(CONFIGDIRS)
$(RELPATH)
:
@
cd
$(TOOLSDIR)
/tools
&&
$(MAKE)
relpath
### Dependencies:
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