From f060051183c033132211111299b48141163f46d9 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Mon, 24 Mar 2003 23:02:08 +0000 Subject: [PATCH] changes to makedefs to support AMD 64 bit --- Make/makedefs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index 4ca015c3d..60fa3e947 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -254,8 +254,8 @@ ifeq ($(OS),Linux) DBGF = -g -DOSG_COMPILE_UNIT_TESTS ifeq ($(SYSARCH),ia64) ARCHARGS = - ARCH = 64 - ARCHINST = 64 + ARCH = IA64 + ARCHINST = IA64 else ARCHARGS = ARCH = 32 @@ -268,7 +268,7 @@ ifeq ($(OS),Linux) DBGF = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS SYSARCH := $(shell arch) ifeq ($(SYSARCH),x86_64) - ARCHARGS = -m64 -DARCH64 + ARCHARGS = ARCH = 64 ARCHINST = 64 else @@ -280,7 +280,11 @@ ifeq ($(OS),Linux) SHARED = -shared - LINKARGS = -L/usr/X11R6/lib + ifeq ($(SYSARCH),x86_64) + LINKARGS = -L/usr/X11R6/lib64 + else + LINKARGS = -L/usr/X11R6/lib + endif DYNAMICLIBRARYLIB = -ldl OSG_LIBS = -losgGA -losgDB -losgUtil -losg FREETYPE_LIB = -lfreetype