Merge branch 'master' into msvc2

This commit is contained in:
Nguyen Anh Quynh
2017-04-21 01:17:00 +08:00
16 changed files with 54 additions and 19 deletions

View File

@ -12,8 +12,7 @@ module Common =
let UC_VERSION_MAJOR = 1
let UC_VERSION_MINOR = 0
let UC_VERSION_EXTRA = 0
let UC_VERSION_EXTRA = 1
let UC_SECOND_SCALE = 1000000
let UC_MILISECOND_SCALE = 1000
let UC_ARCH_ARM = 1

View File

@ -7,8 +7,7 @@ const (
VERSION_MAJOR = 1
VERSION_MINOR = 0
VERSION_EXTRA = 0
VERSION_EXTRA = 1
SECOND_SCALE = 1000000
MILISECOND_SCALE = 1000
ARCH_ARM = 1

View File

@ -9,8 +9,7 @@ public interface UnicornConst {
public static final int UC_VERSION_MAJOR = 1;
public static final int UC_VERSION_MINOR = 0;
public static final int UC_VERSION_EXTRA = 0;
public static final int UC_VERSION_EXTRA = 1;
public static final int UC_SECOND_SCALE = 1000000;
public static final int UC_MILISECOND_SCALE = 1000;
public static final int UC_ARCH_ARM = 1;

View File

@ -82,7 +82,7 @@ _path_list = [pkg_resources.resource_filename(__name__, 'lib'),
'',
distutils.sysconfig.get_python_lib(),
"/usr/local/lib/" if sys.platform == 'darwin' else '/usr/lib64',
os.environ['PATH']]
os.getenv('PATH', '')]
#print(_path_list)
#print("-" * 80)

View File

@ -5,8 +5,7 @@ UC_API_MINOR = 0
UC_VERSION_MAJOR = 1
UC_VERSION_MINOR = 0
UC_VERSION_EXTRA = 0
UC_VERSION_EXTRA = 1
UC_SECOND_SCALE = 1000000
UC_MILISECOND_SCALE = 1000
UC_ARCH_ARM = 1

View File

@ -7,8 +7,7 @@ module Unicorn
UC_VERSION_MAJOR = 1
UC_VERSION_MINOR = 0
UC_VERSION_EXTRA = 0
UC_VERSION_EXTRA = 1
UC_SECOND_SCALE = 1000000
UC_MILISECOND_SCALE = 1000
UC_ARCH_ARM = 1