Permalink
Browse files

Merge pull request #2 from wtcdev/master

Required changes to get this to build in Momentics.
  • Loading branch information...
2 parents 5e4f181 + 823a1e6 commit 48e34edb16a9c2860368901577a9b5f22d88e823 @hungc hungc committed Dec 15, 2012
Showing with 17 additions and 14 deletions.
  1. +16 −14 .cproject
  2. +1 −0 .gitignore
View
@@ -36,7 +36,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1018641543" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.384548056" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -48,7 +48,7 @@
<tool id="com.qnx.qcc.tool.assembler.1106780787" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.1673901517" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.assembler.includePath.1063334056" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<inputType id="com.qnx.qcc.inputType.assembler.1409624522" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
@@ -109,7 +109,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.2031824449" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.71201125" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -122,7 +122,9 @@
<inputType id="com.qnx.qcc.inputType.compiler.344309900" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.1639475401" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
- <option id="com.qnx.qcc.option.assembler.includePath.1969545237" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath"/>
+ <option id="com.qnx.qcc.option.assembler.includePath.1969545237" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.assembler.1098956114" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.49261472" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -183,7 +185,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
- <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1093782069" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1574701092" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -194,7 +196,7 @@
<tool id="com.qnx.qcc.tool.assembler.304436564" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.1546737309" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.assembler.includePath.1410439663" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<inputType id="com.qnx.qcc.inputType.assembler.2048629128" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
@@ -258,7 +260,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
- <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1597285652" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1742621739" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -269,7 +271,7 @@
<tool id="com.qnx.qcc.tool.assembler.900972416" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.1206995404" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.assembler.includePath.1768922614" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<inputType id="com.qnx.qcc.inputType.assembler.297352375" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
@@ -331,7 +333,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
- <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1527890505" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1277881698" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -342,7 +344,7 @@
<tool id="com.qnx.qcc.tool.assembler.1725671937" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.711600570" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.assembler.includePath.407644422" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<inputType id="com.qnx.qcc.inputType.assembler.1649580024" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
@@ -404,7 +406,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
- <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1404810514" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.358214472" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -415,7 +417,7 @@
<tool id="com.qnx.qcc.tool.assembler.386940315" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.120286786" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.assembler.includePath.1696807245" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<inputType id="com.qnx.qcc.inputType.assembler.1507102313" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
@@ -478,7 +480,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
- <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1004034277" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1338334214" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -489,7 +491,7 @@
<tool id="com.qnx.qcc.tool.assembler.794517685" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.811886138" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.assembler.includePath.420832221" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option>
<inputType id="com.qnx.qcc.inputType.assembler.350162319" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
View
@@ -3,3 +3,4 @@
*.so
*.so.*
*.pinfo
+*.gcno

0 comments on commit 48e34ed

Please sign in to comment.