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
424cb27e
Commit
424cb27e
authored
Dec 26, 2008
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: When cross-compiling, propagate the target specification to winebuild.
parent
53626dbd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
Make.rules.in
Make.rules.in
+2
-1
configure
configure
+6
-0
configure.ac
configure.ac
+4
-0
Makedll.rules.in
dlls/Makedll.rules.in
+1
-1
No files found.
Make.rules.in
View file @
424cb27e
...
@@ -43,6 +43,7 @@ STRIP = @STRIP@
...
@@ -43,6 +43,7 @@ STRIP = @STRIP@
WINDRES = @WINDRES@
WINDRES = @WINDRES@
LN = @LN@
LN = @LN@
LN_S = @LN_S@
LN_S = @LN_S@
TARGET = @TARGET@
TOOLSDIR = @TOOLSDIR@
TOOLSDIR = @TOOLSDIR@
AS = @AS@
AS = @AS@
LD = @LD@
LD = @LD@
...
@@ -61,7 +62,7 @@ EXTRACFLAGS = @EXTRACFLAGS@
...
@@ -61,7 +62,7 @@ EXTRACFLAGS = @EXTRACFLAGS@
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
WINEBUILDFLAGS = $(DLLFLAGS) --as-cmd "$(AS)"
WINEBUILDFLAGS = $(DLLFLAGS)
$(TARGET:%=--target %)
--as-cmd "$(AS)"
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
...
...
configure
View file @
424cb27e
...
@@ -745,6 +745,7 @@ X_PRE_LIBS
...
@@ -745,6 +745,7 @@ X_PRE_LIBS
X_CFLAGS
X_CFLAGS
CPP
CPP
XMKMF
XMKMF
TARGET
TOOLSDIR
TOOLSDIR
CPPBIN
CPPBIN
ac_ct_CXX
ac_ct_CXX
...
@@ -3873,6 +3874,11 @@ fi
...
@@ -3873,6 +3874,11 @@ fi
$as_echo
"
$wine_cv_toolsdir
"
>
&6
;
}
$as_echo
"
$wine_cv_toolsdir
"
>
&6
;
}
TOOLSDIR
=
$wine_cv_toolsdir
TOOLSDIR
=
$wine_cv_toolsdir
if
test
"
$cross_compiling
"
=
"yes"
then
TARGET
=
"
$host_alias
"
fi
ac_ext
=
c
ac_ext
=
c
...
...
configure.ac
View file @
424cb27e
...
@@ -159,6 +159,10 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
...
@@ -159,6 +159,10 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.])
AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.])
fi])
fi])
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
if test "$cross_compiling" = "yes"
then
AC_SUBST(TARGET,"$host_alias")
fi
AC_PATH_XTRA
AC_PATH_XTRA
...
...
dlls/Makedll.rules.in
View file @
424cb27e
...
@@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
...
@@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
$(WINEBUILD)
$(TARGET:%=--target %)
-w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
$(RM) $@
$(RM) $@
...
...
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