Former-commit-id: 8b28f2fc77bb6dc6b82b48298bb5b5b76ea95359

SConscript

@@ -4,7 +4,7 @@ argenv=Environment()
 # command line options
 argenv.Replace(debug=ARGUMENTS.get("debug",0))
 argenv.Replace(do_64bit_analysis=ARGUMENTS.get("do_64bit_analysis",1))
-argenv.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",0))
+argenv.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",2))
 argenv.Replace(build_ida=ARGUMENTS.get("build_ida",1))
 argenv.Replace(build_irdb=ARGUMENTS.get("build_irdb",0))
 argenv.Replace(build_irdb_driver=ARGUMENTS.get("build_irdb_driver",0))
@@ -44,12 +44,18 @@ if int(argenv['do_64bit_analysis']) == 1:
 Export('argenv', 'STARS_CCFLAGS')
 
 if int(argenv['build_ida']) == 1:
+	print "Build IDA Plugin"
+	if int(argenv['do_64bit_build']) == 2:
+		argenv['do_64bit_build'] = 0
 	lib=SConscript('SConscript.ida', variant_dir='build_ida')
 if int(argenv['build_irdb']) == 1 or int(argenv['build_irdb_driver']) == 1:
+	print "Build IDA/IRDB library"
 	lib=SConscript('SConscript.irdb_lib', variant_dir='build_irdb_lib')
 if int(argenv['build_irdb_driver']) == 1:
+	print "Build IDA driver"
 	lib=SConscript('SConscript.irdb_driver', variant_dir='build_irdb_driver')
 
 Default(lib)
 
 
+

SConscript.irdb_driver

@@ -33,7 +33,9 @@ IRDB_LDFLAGS=" "
 
 
 # set 32/64 bit build properly
-if int(argenv['do_64bit_build']) == 1:
+if int(argenv['do_64bit_build']) == 2:
+        print "Defaulting to mach-dep 32/64 bit build parameter" 
+elif int(argenv['do_64bit_build']) == 1:
 	IRDB_CCFLAGS+=" -m64 "
 	IRDB_LDFLAGS+=" -m64 "
 else:

SConscript.irdb_lib

@@ -36,7 +36,9 @@ IRDB_LDFLAGS=" "
 
 
 # set 32/64 bit build properly
-if int(argenv['do_64bit_build']) == 1:
+if int(argenv['do_64bit_build']) == 2:
+	print "Defaulting to mach-dep 32/64 bit build parameter"
+elif int(argenv['do_64bit_build']) == 1:
 	IRDB_CCFLAGS+=" -m64 "
 	IRDB_LDFLAGS+=" -m64 "
 else:
@@ -49,7 +51,8 @@ else:
 #print 'dirs: ',dirs
 libfiles=[]
 for dir in libdirs:
-	libfiles=libfiles+Glob(os.path.join(dir,"*.cpp"))
+	libfiles=libfiles+ Glob( os.path.join( Dir('.').srcnode().abspath, dir,"*.cpp"))
+
 
 #setup the environment
 irdbenv=argenv.Clone(CCFLAGS=IRDB_CCFLAGS, LINKFLAGS=IRDB_LDFLAGS, CPPPATH=Split(cpppath));