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

Fixture rakefile has a conflict defining UNITY_OUTPUT_CHAR

Browse Source 
Make core Unity rakefile helper follow Fixture define procedure.
 This commit reverts parts of 36e2ca1.
This commit is contained in:
jsalling
2016-01-19 23:47:32 -06:00
parent 10146392c8
commit cd472439bf
9 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/rakefile_helper.rb
View File

@@ -97,7 +97,7 @@ module RakefileHelpers
if $cfg['compiler']['defines']['items'].nil?
defines = ''
else
defines = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'])
defines = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=putcharSpy'])
end
options = squash('', $cfg['compiler']['options'])
includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])