X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=cb557a307b21e65f4f573ae4f977d583b6092c45;hb=d9c9ebf22b8d633909c7583b64c779b5dc57a80e;hp=ad4787ff4aed3e51c2cdaf53fa6aef3238e5a43a;hpb=e9e3ee43cb302909917b5919f6043347b73c6995;p=palacios.releases.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index ad4787f..cb557a3 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -208,7 +208,11 @@ DECODER_LIBS=
 ifeq ($(DECODER),XED)
 DECODER_SRCS := vmm_xed.c
 DECODER_FLAGS :=  -L../lib/xed
+ifeq ($(ARCH),64)
+DECODER_LIBS := $(PROJECT_ROOT)/lib/xed/libxed32e.a
+else 
 DECODER_LIBS := $(PROJECT_ROOT)/lib/xed/libxed.a
+endif
 else
 # This is an error
 endif
@@ -306,16 +310,23 @@ V3LIBS := $(DECODER_LIBS)
 #   This section defines programs that are used to build GeekOS.
 # ----------------------------------------------------------------------
 
-
+ifeq ($(ARCH),64)
+V3_ARCH := __V3_64BIT__
+else 
 V3_ARCH := __V3_32BIT__
-#V3_ARCH := __V3_64BIT__
+endif
+
 
 # Uncomment if cross compiling
 #TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
 #TARGET_CC_PREFIX :=  i386-elf-
 
 # Target C compiler.  gcc 2.95.2 or later should work.
+ifeq ($(ARCH),64)
+TARGET_CC := $(TARGET_CC_PREFIX)gcc
+else 
 TARGET_CC := $(TARGET_CC_PREFIX)gcc -m32
+endif
 #TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32
 
 
@@ -341,7 +352,12 @@ NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
 CPP := cpp
 
 
+ifeq ($(ARCH),64)
+AS = as
+else 
 AS = as --32
+endif
+
 
 # Tool to build PFAT filesystem images.
 BUILDFAT := tools/builtFat.exe
@@ -489,7 +505,7 @@ force:
 
 # Clean build directories of generated files
 clean :
-	for d in palacios devices; do \
+	for d in palacios devices xed; do \
 		(cd $$d && rm -f *); \
 	done