From 66593ae4bf9128277aba6e3ac9bf07e20ed44765 Mon Sep 17 00:00:00 2001
From: "Lee, Jae-Hong" <pyrasis@delphigames.com>
Date: Sat, 10 Aug 2013 23:11:31 +0900
Subject: [PATCH] [Tizen] Update project files - include stdint.h - set etc,
 s3tc header path - exclude CCImageCommonWebp.cpp, include etc, s3tc
 directories. - update project files.

---
 cocos2dx/platform/tizen/CCStdC.h         |  1 +
 cocos2dx/proj.tizen/.cproject            |  8 +++++++-
 cocos2dx/proj.tizen/.project             | 15 ++++++++++-----
 samples/Cpp/HelloCpp/proj.tizen/.project |  2 +-
 samples/Cpp/TestCpp/proj.tizen/.cproject |  1 +
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/cocos2dx/platform/tizen/CCStdC.h b/cocos2dx/platform/tizen/CCStdC.h
index a001a881f1..4f86f41b9b 100644
--- a/cocos2dx/platform/tizen/CCStdC.h
+++ b/cocos2dx/platform/tizen/CCStdC.h
@@ -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))
diff --git a/cocos2dx/proj.tizen/.cproject b/cocos2dx/proj.tizen/.cproject
index 7c09e2cf3d..15f6ac3fe2 100644
--- a/cocos2dx/proj.tizen/.cproject
+++ b/cocos2dx/proj.tizen/.cproject
@@ -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">
diff --git a/cocos2dx/proj.tizen/.project b/cocos2dx/proj.tizen/.project
index 4d4021e257..340034f8a1 100644
--- a/cocos2dx/proj.tizen/.project
+++ b/cocos2dx/proj.tizen/.project
@@ -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>
diff --git a/samples/Cpp/HelloCpp/proj.tizen/.project b/samples/Cpp/HelloCpp/proj.tizen/.project
index 5052bef2b4..52cd3d11ab 100644
--- a/samples/Cpp/HelloCpp/proj.tizen/.project
+++ b/samples/Cpp/HelloCpp/proj.tizen/.project
@@ -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>
diff --git a/samples/Cpp/TestCpp/proj.tizen/.cproject b/samples/Cpp/TestCpp/proj.tizen/.cproject
index 5c720b317b..812a6153f7 100644
--- a/samples/Cpp/TestCpp/proj.tizen/.cproject
+++ b/samples/Cpp/TestCpp/proj.tizen/.cproject
@@ -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>