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

Conflicts:
	src/unity_internals.h
This commit is contained in:
John Van Enk
2012-06-20 20:03:36 -04:00
3 changed files with 8 additions and 3 deletions
+3 -2
View File
@@ -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: []