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 #include #include +#include #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 @@ + + @@ -173,6 +176,8 @@ + + - @@ -233,6 +238,7 @@ 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 @@ 1 PARENT-1-PROJECT_LOC/platform/CCImage.h - - src/platform/CCImageCommonWebp.cpp - 1 - PARENT-1-PROJECT_LOC/platform/CCImageCommonWebp.cpp - src/platform/CCImageCommon_cpp.h 1 @@ -352,6 +347,16 @@ 1 PARENT-1-PROJECT_LOC/platform/CCThread.h + + src/platform/etc + 2 + PARENT-1-PROJECT_LOC/platform/third_party/common/etc + + + src/platform/s3tc + 2 + PARENT-1-PROJECT_LOC/platform/third_party/common/s3tc + src/platform/tizen 2 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 @@ org.eclipse.cdt.make.core.buildLocation - ${workspace_loc:/proj.tizen/Debug-Tizen-Emulator} + ${workspace_loc:/${ProjName}/Debug-Tizen-Emulator} org.eclipse.cdt.make.core.cleanBuildTarget 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 @@ +