3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-27 18:24:27 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:ThrowTheSwitch/Unity

Browse Source 
Conflicts:
	src/unity_internals.h
This commit is contained in:
John Van Enk
2012-06-20 20:03:36 -04:00
parent 4724af154c 4742b5d77a
commit b7d9d007ce
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rakefile.rb
View File

@@ -25,7 +25,7 @@ task :prepare_for_tests => TEMP_DIRS
include RakefileHelpers include RakefileHelpers
# Load default configuration, for now # Load default configuration, for now
DEFAULT_CONFIG_FILE = 'gcc.yml' DEFAULT_CONFIG_FILE = 'gcc_32.yml'
configure_toolchain(DEFAULT_CONFIG_FILE) configure_toolchain(DEFAULT_CONFIG_FILE)
desc "Test unity with its own unit tests" desc "Test unity with its own unit tests"

4
src/unity_internals.h
View File

@@ -155,6 +155,10 @@ typedef _US64 _U_SINT;
// Pointer Support // Pointer Support
//------------------------------------------------------- //-------------------------------------------------------
#ifndef UNITY_POINTER_WIDTH
#define UNITY_POINTER_WIDTH (32)
#endif /* UNITY_POINTER_WIDTH */
#if (UNITY_POINTER_WIDTH == 32) #if (UNITY_POINTER_WIDTH == 32)
typedef _UU32 _UP; typedef _UU32 _UP;
#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32 #define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32

3
targets/gcc.yml → targets/gcc_32.yml
View File

@@ -5,6 +5,7 @@ compiler:
build_path: &build_path 'build/' build_path: &build_path 'build/'
options: options:
- '-c' - '-c'
- '-m32'
- '-Wall' - '-Wall'
- '-Wno-address' - '-Wno-address'
- '-std=c99' - '-std=c99'
@@ -18,7 +19,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_SUPPORT_64
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
object_files: object_files:
@@ -29,6 +29,7 @@ linker:
path: gcc path: gcc
options: options:
- -lm - -lm
- '-m32'
includes: includes:
prefix: '-I' prefix: '-I'
object_files: object_files: