Merge pull request #3408 from pyrasis/tizen_2.2

[Tizen] Update project files
This commit is contained in:
James Chen 2013-08-10 07:23:13 -07:00
commit 2ff3655fff
5 changed files with 20 additions and 7 deletions

View File

@ -32,6 +32,7 @@ THE SOFTWARE.
#include <sys/time.h>
#include <stdarg.h>
#include <float.h>
#include <stdint.h>
#ifndef MIN
#define MIN(x,y) (((x) > (y)) ? (y) : (x))

View File

@ -46,6 +46,8 @@
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-emulator-2.2.native/usr/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-emulator-2.2.native/usr/include/freetype2&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/prebuilt/libwebp/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/common/etc&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/common/s3tc&quot;"/>
</option>
<option id="sbi.gnu.cpp.compiler.option.frameworks.cpp.140749819" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.cpp" valueType="userObjs">
<listOptionValue builtIn="false" value="osp-static"/>
@ -107,6 +109,7 @@
</option>
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.181465864" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
<listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/null/lib&quot;"/>
</option>
</tool>
<tool command="i386-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.165476943" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
@ -173,6 +176,8 @@
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-device-2.2.native/usr/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-device-2.2.native/usr/include/freetype2&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/prebuilt/libwebp/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/common/etc&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/common/s3tc&quot;"/>
</option>
<option id="sbi.gnu.cpp.compiler.option.frameworks.cpp.1270990666" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.cpp" valueType="userObjs">
<listOptionValue builtIn="false" value="osp-static"/>
@ -191,7 +196,7 @@
<listOptionValue builtIn="false" value="_DEBUG"/>
<listOptionValue builtIn="false" value="TIZEN"/>
</option>
<option id="gnu.cpp.compiler.option.other.other.940909414" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++0x" valueType="string"/>
<option id="gnu.cpp.compiler.option.other.other.940909414" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++0x" valueType="string"/>
<inputType id="sbi.gnu.cpp.compiler.tizen.inputType.1890676098" superClass="sbi.gnu.cpp.compiler.tizen.inputType"/>
</tool>
<tool command="arm-linux-gnueabi-gcc.exe" id="org.tizen.nativecpp.tool.sbi.gnu.c.compiler.800077346" name="C Compiler" superClass="org.tizen.nativecpp.tool.sbi.gnu.c.compiler">
@ -233,6 +238,7 @@
</option>
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.557112687" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
<listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/null/lib&quot;"/>
</option>
</tool>
<tool command="arm-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1047247012" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">

View File

@ -312,11 +312,6 @@
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/CCImage.h</locationURI>
</link>
<link>
<name>src/platform/CCImageCommonWebp.cpp</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/CCImageCommonWebp.cpp</locationURI>
</link>
<link>
<name>src/platform/CCImageCommon_cpp.h</name>
<type>1</type>
@ -352,6 +347,16 @@
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/CCThread.h</locationURI>
</link>
<link>
<name>src/platform/etc</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/third_party/common/etc</locationURI>
</link>
<link>
<name>src/platform/s3tc</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/third_party/common/s3tc</locationURI>
</link>
<link>
<name>src/platform/tizen</name>
<type>2</type>

View File

@ -30,7 +30,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/proj.tizen/Debug-Tizen-Emulator}</value>
<value>${workspace_loc:/${ProjName}/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>

View File

@ -697,4 +697,5 @@
<storageModule moduleId="refreshScope" versionNumber="1">
<resource resourceType="PROJECT" workspacePath="/proj.tizen"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>