commit 0eaf03f3b458c162de46ae876c72d5d86849a552
author Pierre Ossman <ossman@cendio.se> Thu Feb 18 10:12:32 2010 +0000
committer Pierre Ossman <ossman@cendio.se> Thu Feb 18 10:12:32 2010 +0000
tree 9b4c9a2d88861e5049468777bea2cbb9f5029783
parent 4d9fb7789f060541cd80457b77ebb149d43d405a

Configure nasm properly for Win64.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3990 3789f03b-4d11-0410-bbf8-ca57d06f2519

common/jpeg/acinclude.m4

diff --git a/common/jpeg/acinclude.m4 b/common/jpeg/acinclude.m4
index e8d7d08..3627d23 100644
--- a/common/jpeg/acinclude.m4
+++ b/common/jpeg/acinclude.m4
@@ -9,7 +9,14 @@
 AC_MSG_CHECKING([for object file format of host system])
 case "$host_os" in
   cygwin* | mingw* | pw32* | interix*)
-    objfmt='Win32-COFF'
+    case "$host_cpu" in
+      x86_64)
+        objfmt='Win64-COFF'
+        ;;
+      *)
+        objfmt='Win32-COFF'
+        ;;
+    esac
   ;;
   msdosdjgpp* | go32*)
     objfmt='COFF'
@@ -75,6 +82,7 @@
 case "$objfmt" in
   MSOMF)      NAFLAGS='-fobj -DOBJ32';;
   Win32-COFF) NAFLAGS='-fwin32 -DWIN32';;
+  Win64-COFF) NAFLAGS='-fwin64 -DWIN32 -D__x86_64__';;
   COFF)       NAFLAGS='-fcoff -DCOFF';;
   a.out)      NAFLAGS='-faout -DAOUT';;
   BSD-a.out)  NAFLAGS='-faoutb -DAOUT';;