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

Conflicts: src/unity_internals.h
ThrowTheSwitch · Jun 21, 2012 · b7d9d00 · b7d9d00
2 parents 4724af1 + 4742b5d
commit b7d9d00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/rakefile.rb b/rakefile.rb
@@ -25,7 +25,7 @@
 include RakefileHelpers
 
 # Load default configuration, for now
-DEFAULT_CONFIG_FILE = 'gcc.yml'
+DEFAULT_CONFIG_FILE = 'gcc_32.yml'
 configure_toolchain(DEFAULT_CONFIG_FILE)
 
 desc "Test unity with its own unit tests"

diff --git a/src/unity_internals.h b/src/unity_internals.h
@@ -155,6 +155,10 @@ typedef _US64 _U_SINT;
 // Pointer Support
 //-------------------------------------------------------
 
+#ifndef UNITY_POINTER_WIDTH
+#define UNITY_POINTER_WIDTH (32)
+#endif /* UNITY_POINTER_WIDTH */
+
 #if (UNITY_POINTER_WIDTH == 32)
     typedef _UU32 _UP;
 #define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32

diff --git a/targets/gcc.yml → targets/gcc_32.yml b/targets/gcc.yml → targets/gcc_32.yml
@@ -5,6 +5,7 @@ compiler:
   build_path:      &build_path 'build/'
   options:
     - '-c'
+    - '-m32'
     - '-Wall'
     - '-Wno-address'
     - '-std=c99'
@@ -18,7 +19,6 @@ compiler:
   defines:
     prefix: '-D'
     items:
-      - UNITY_SUPPORT_64
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
   object_files:
@@ -29,6 +29,7 @@ linker:
   path: gcc
   options:
     - -lm
+    - '-m32'
   includes:
     prefix: '-I'
   object_files:
@@ -40,4 +41,4 @@ linker:
     destination: *build_path
 colour: true
 :unity:
-  :plugins: []
+  :plugins: []