diff options
| author | ruki <[email protected]> | 2015-06-02 15:39:44 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-02 15:39:44 +0800 |
| commit | f639faef588a95b28ec02c781dee2a581f7a7992 (patch) | |
| tree | fb50924f053cf26b9ad53c46c440aceeb82f8e45 /core | |
| parent | 6ed13d09ec37896b0176e90ddaa99c90ecaccd1d (diff) | |
impl rebuild and update
Diffstat (limited to 'core')
| -rw-r--r-- | core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h | 2 | ||||
| -rwxr-xr-x | core/pkg/tbox.pkg/inc/tbox/prefix/arch.h | 42 | ||||
| -rw-r--r-- | core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb | bin | 290816 -> 290816 bytes | |||
| -rw-r--r-- | core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb | bin | 282624 -> 282624 bytes |
4 files changed, 22 insertions, 22 deletions
diff --git a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h index b6ee12239..f48896de0 100644 --- a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h +++ b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h @@ -15,7 +15,7 @@ #define TB_CONFIG_VERSION_ALTER 8 // build version -#define TB_CONFIG_VERSION_BUILD 201505201458 +#define TB_CONFIG_VERSION_BUILD 201506021443 // small #define TB_CONFIG_SMALL (0) diff --git a/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h b/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h index 722bfad25..8364dceb6 100755 --- a/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h +++ b/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h @@ -77,27 +77,7 @@ # endif #elif defined(__arm__) || defined(__arm64) || defined(__arm64__) # define TB_ARCH_ARM -# if defined(__ARM_ARCH) -# define TB_ARCH_ARM_VERSION __ARM_ARCH -# if __ARM_ARCH >= 8 -# define TB_ARCH_ARM_v8 -# if defined(__arm64) || defined(__arm64__) -# define TB_ARCH_ARM64 -# define TB_ARCH_STRING "arm64" -# else -# define TB_ARCH_STRING "armv7s" -# endif -# elif __ARM_ARCH >= 7 -# define TB_ARCH_ARM_v7 -# define TB_ARCH_STRING "armv7" -# elif __ARM_ARCH >= 6 -# define TB_ARCH_ARM_v6 -# define TB_ARCH_STRING "armv6" -# else -# define TB_ARCH_ARM_v5 -# define TB_ARCH_STRING "armv5" -# endif -# elif defined(__ARM64_ARCH_8__) +# if defined(__ARM64_ARCH_8__) # define TB_ARCH_ARM64 # define TB_ARCH_ARM_VERSION (8) # define TB_ARCH_ARM_v8 @@ -122,6 +102,26 @@ # define TB_ARCH_ARM_VERSION (5) # define TB_ARCH_ARM_v5 # define TB_ARCH_STRING "armv5" +# elif defined(__ARM_ARCH) +# define TB_ARCH_ARM_VERSION __ARM_ARCH +# if __ARM_ARCH >= 8 +# define TB_ARCH_ARM_v8 +# if defined(__arm64) || defined(__arm64__) +# define TB_ARCH_ARM64 +# define TB_ARCH_STRING "arm64" +# else +# define TB_ARCH_STRING "armv7s" +# endif +# elif __ARM_ARCH >= 7 +# define TB_ARCH_ARM_v7 +# define TB_ARCH_STRING "armv7" +# elif __ARM_ARCH >= 6 +# define TB_ARCH_ARM_v6 +# define TB_ARCH_STRING "armv6" +# else +# define TB_ARCH_ARM_v5 +# define TB_ARCH_STRING "armv5" +# endif # else # error unknown arm arch version # endif diff --git a/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb b/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb Binary files differindex 62089bb48..cac9103b7 100644 --- a/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb +++ b/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb diff --git a/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb b/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb Binary files differindex 3850e0cf2..cbff71939 100644 --- a/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb +++ b/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb |