Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
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
Zsolt Vadász
wine
Commits
58c64190
Commit
58c64190
authored
18 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Define _WIN64 when building on a 64-bit platform.
parent
94529273
Loading
Loading
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
configure
+31
-0
31 additions, 0 deletions
configure
configure.ac
+2
-1
2 additions, 1 deletion
configure.ac
include/basetsd.h
+1
-1
1 addition, 1 deletion
include/basetsd.h
include/windef.h
+1
-1
1 addition, 1 deletion
include/windef.h
tools/winegcc/winegcc.c
+7
-0
7 additions, 0 deletions
tools/winegcc/winegcc.c
with
42 additions
and
3 deletions
configure
+
31
−
0
View file @
58c64190
...
...
@@ -24167,6 +24167,37 @@ if test $ac_cv_cpp_def___x86_64__ = yes; then
CFLAGS="$CFLAGS -D__x86_64__"
LINTFLAGS="$LINTFLAGS -D__x86_64__"
fi
{ echo "$as_me:$LINENO: checking whether we need to define _WIN64" >&5
echo $ECHO_N "checking whether we need to define _WIN64... $ECHO_C" >&6; }
if test "${ac_cv_cpp_def__WIN64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifndef _WIN64
yes
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then
ac_cv_cpp_def__WIN64=yes
else
ac_cv_cpp_def__WIN64=no
fi
rm -f conftest*
fi
{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def__WIN64" >&5
echo "${ECHO_T}$ac_cv_cpp_def__WIN64" >&6; }
if test $ac_cv_cpp_def__WIN64 = yes; then
CFLAGS="$CFLAGS -D_WIN64"
LINTFLAGS="$LINTFLAGS -D_WIN64"
fi
;;
*alpha*) { echo "$as_me:$LINENO: checking whether we need to define __ALPHA__" >&5
echo $ECHO_N "checking whether we need to define __ALPHA__... $ECHO_C" >&6; }
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
2
−
1
View file @
58c64190
...
...
@@ -1502,7 +1502,8 @@ dnl *** check for the need to define platform-specific symbols
case $host_cpu in
*i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;;
*x86_64*) WINE_CHECK_DEFINE([__x86_64__]) ;;
*x86_64*) WINE_CHECK_DEFINE([__x86_64__])
WINE_CHECK_DEFINE([_WIN64]) ;;
*alpha*) WINE_CHECK_DEFINE([__ALPHA__]) ;;
*sparc*) WINE_CHECK_DEFINE([__sparc__]) ;;
*powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;;
...
...
This diff is collapsed.
Click to expand it.
include/basetsd.h
+
1
−
1
View file @
58c64190
...
...
@@ -38,7 +38,7 @@ extern "C" {
* type model where int and long are 32 bit and pointer is 64-bit.
*/
#ifdef
__x86_64__
#if
def
ined(
__x86_64__
) && !defined(_WIN64)
#define _WIN64
#endif
...
...
This diff is collapsed.
Click to expand it.
include/windef.h
+
1
−
1
View file @
58c64190
...
...
@@ -45,7 +45,7 @@ extern "C" {
# define __i386__
#endif
#ifdef
__x86_64__
#if
def
ined(
__x86_64__
) && !defined(_WIN64)
#define _WIN64
#endif
...
...
This diff is collapsed.
Click to expand it.
tools/winegcc/winegcc.c
+
7
−
0
View file @
58c64190
...
...
@@ -269,10 +269,17 @@ static void compile(struct options* opts, const char* lang)
strarray_addall
(
comp_args
,
strarray_fromstring
(
DLLFLAGS
,
" "
));
}
#ifdef _WIN64
strarray_add
(
comp_args
,
"-DWIN64"
);
strarray_add
(
comp_args
,
"-D_WIN64"
);
strarray_add
(
comp_args
,
"-D__WIN64"
);
strarray_add
(
comp_args
,
"-D__WIN64__"
);
#else
strarray_add
(
comp_args
,
"-DWIN32"
);
strarray_add
(
comp_args
,
"-D_WIN32"
);
strarray_add
(
comp_args
,
"-D__WIN32"
);
strarray_add
(
comp_args
,
"-D__WIN32__"
);
#endif
strarray_add
(
comp_args
,
"-D__WINNT"
);
strarray_add
(
comp_args
,
"-D__WINNT__"
);
...
...
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