Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
9eb2d6ba
Commit
9eb2d6ba
authored
8 years ago
by
Józef Kucia
Browse files
Options
Downloads
Patches
Plain Diff
build: Use "vkd3d" prefix for autoconf variables.
parent
5f91e2de
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
m4/check-cflags.m4
+7
-7
7 additions, 7 deletions
m4/check-cflags.m4
m4/check-mingw-prog.m4
+10
-10
10 additions, 10 deletions
m4/check-mingw-prog.m4
with
17 additions
and
17 deletions
m4/check-cflags.m4
+
7
−
7
View file @
9eb2d6ba
dnl VKD3D_CHECK_CFLAGS(flags)
AC_DEFUN([VKD3D_CHECK_CFLAGS],
[AS_VAR_PUSHDEF([
ac_var], ac
_cv_cflags_[[$1]])dnl
AC_CACHE_CHECK([whether the compiler supports $1],
ac_var
,
[
ac_
vkd3d_
check_
cflags_saved=$CFLAGS
[AS_VAR_PUSHDEF([
vkd3d_cflags], vkd3d
_cv_cflags_[[$1]])dnl
AC_CACHE_CHECK([whether the compiler supports $1],
vkd3d_cflags
,
[vkd3d_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS $1 -Werror"
AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]])],
[AS_VAR_SET(
ac_var
, yes)], [AS_VAR_SET(
ac_var
, no)])
CFLAGS=$
ac_
vkd3d_
check_
cflags_saved])
AS_VAR_IF([
ac_var
], [yes], [VKD3D_CFLAGS="$VKD3D_CFLAGS $1"])dnl
AS_VAR_POPDEF([
ac_var
])])
[AS_VAR_SET(
vkd3d_cflags
, yes)], [AS_VAR_SET(
vkd3d_cflags
, no)])
CFLAGS=$vkd3d_cflags_saved])
AS_VAR_IF([
vkd3d_cflags
], [yes], [VKD3D_CFLAGS="$VKD3D_CFLAGS $1"])dnl
AS_VAR_POPDEF([
vkd3d_cflags
])])
This diff is collapsed.
Click to expand it.
m4/check-mingw-prog.m4
+
10
−
10
View file @
9eb2d6ba
...
...
@@ -2,13 +2,13 @@ dnl VKD3D_CHECK_MINGW32_PROG(variable, crosstarget-variable, [value-if-not-found
AC_DEFUN([VKD3D_CHECK_MINGW32_PROG],
[
AC_SUBST([$2], [$3])dnl
ac_prefix
_list="m4_foreach([
ac_
vkd3d_prefix], [w64-mingw32, pc-mingw32, mingw32
msvc
, mingw32],
m4_foreach([
ac_
vkd3d_cpu], [i686, i586, i486, i386], [
ac_
vkd3d_cpu-
ac_
vkd3d_prefix-gcc ]))
vkd3d_mingw
_list="m4_foreach([vkd3d_
mingw_
prefix], [w64-mingw32, pc-mingw32, mingw32, mingw32
msvc
],
m4_foreach([vkd3d_cpu], [i686, i586, i486, i386], [vkd3d_cpu-vkd3d_
mingw_
prefix-gcc ]))
mingw32-gcc"
AC_CHECK_PROGS([$1], [$
ac_prefix
_list], [$3], [$4])
AC_CHECK_PROGS([$1], [$
vkd3d_mingw
_list], [$3], [$4])
if test "x[$]$1" != x$3
then
ac_
vkd3d_save
_CC
="$CC"
vkd3d_
cc_
save
d
="$CC"
CC="[$]$1"
AC_MSG_CHECKING([whether $CC works])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
...
...
@@ -23,7 +23,7 @@ then
shift
done],
[AC_MSG_RESULT([no])])
CC="$
ac_
vkd3d_save
_CC
"
CC="$vkd3d_
cc_
save
d
"
fi
])
...
...
@@ -31,12 +31,12 @@ dnl VKD3D_CHECK_MINGW64_PROG(variable, crosstarget-variable, [value-if-not-found
AC_DEFUN([VKD3D_CHECK_MINGW64_PROG],
[
AC_SUBST([$2], [$3])dnl
ac_prefix
_list="m4_foreach([
ac_
vkd3d_prefix], [pc-mingw32, w64-mingw32, mingw32msvc],
m4_foreach([
ac_
vkd3d_cpu], [x86_64, amd64], [
ac_
vkd3d_cpu-
ac_
vkd3d_prefix-gcc ]))"
AC_CHECK_PROGS([$1], [$
ac_prefix
_list], [$3], [$4])
vkd3d_mingw
_list="m4_foreach([vkd3d_
mingw_
prefix], [pc-mingw32, w64-mingw32, mingw32msvc],
m4_foreach([vkd3d_cpu], [x86_64, amd64], [vkd3d_cpu-vkd3d_
mingw_
prefix-gcc ]))"
AC_CHECK_PROGS([$1], [$
vkd3d_mingw
_list], [$3], [$4])
if test "x[$]$1" != x$3
then
ac_
vkd3d_save
_CC
="$CC"
vkd3d_
cc_
save
d
="$CC"
CC="[$]$1"
AC_MSG_CHECKING([whether $CC works])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
...
...
@@ -51,6 +51,6 @@ then
shift
done],
[AC_MSG_RESULT([no])])
CC="$
ac_
vkd3d_save
_CC
"
CC="$vkd3d_
cc_
save
d
"
fi
])
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment