Changeset 39:f9c840ac038d in xplcommon

Timestamp:

01/03/13 09:07:56 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 2 'hg:/home/ivaradi/xplane/hg/xplcommon' '/'>, 'public')

Message:

Added the possibility to distinguish between 32-bit and 64-bit Windows

Files:

• configure.ac (modified) (1 diff)
• src/xplcommon/Makefile.am (modified) (2 diffs)
• src/xplcommon/config.h.in (modified) (1 diff)

configure.ac

@@ -14 +14 @@
 
 AM_CONDITIONAL([TARGET_API_WIN32], test $_target_win32 -eq 0)
+AM_CONDITIONAL([TARGET_API_WIN64], test $_target_win32 -eq 0 -a "$host_cpu" = "x86_64")
 AM_CONDITIONAL([TARGET_API_POSIX], test $_target_win32 -ne 0)
 if test $_target_win32 -eq 0; then
+   if test "$host_cpu" = "x86_64"; then
+       AC_DEFINE([TARGET_API_WIN64], [1], [Define if the target is the 64-bit Win32 API.])
+   fi
    AC_DEFINE([TARGET_API_WIN32], [1], [Define if the target is the Win32 API.])
 else

src/xplcommon/Makefile.am

@@ -2 +2 @@
 
 SUBDIRS=
+
 if TARGET_API_POSIX
 SUBDIRS+=posix
@@ -11 +12 @@
 SUBDIRS+=win32
 AM_CPPFLAGS=-DIBM
-AM_LDFLAGS=@XPSDK_LDFLAGS@ -lXPLM -no-undefined
+AM_LDFLAGS=@XPSDK_LDFLAGS@ -no-undefined
+if TARGET_API_WIN64
+AM_LDFLAGS+=-lXPLM_64
+else
+AM_LDFLAGS+=-lXPLM
+endif
 endif
 

src/xplcommon/config.h.in

@@ -50 +50 @@
 #undef TARGET_API_WIN32
 
+/* Define if the target is the 64-bit Win32 API. */
+#undef TARGET_API_WIN64
+
 /* Version number of package */
 #undef VERSION