diff --git a/CocosDenshion/proj.tizen/.cproject b/CocosDenshion/proj.tizen/.cproject
index d84e5908f4..1006d4b63a 100644
--- a/CocosDenshion/proj.tizen/.cproject
+++ b/CocosDenshion/proj.tizen/.cproject
@@ -204,6 +204,7 @@
diff --git a/CocosDenshion/proj.tizen/.project b/CocosDenshion/proj.tizen/.project
index 0431e803a0..3f44ed4404 100644
--- a/CocosDenshion/proj.tizen/.project
+++ b/CocosDenshion/proj.tizen/.project
@@ -7,7 +7,6 @@
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
?name?
@@ -31,7 +30,7 @@
org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/cocosdenshion/Debug-Tizen-Device}
+ ${workspace_loc:/cocosdenshion/Debug-Tizen-Emulator}
org.eclipse.cdt.make.core.cleanBuildTarget
@@ -43,7 +42,7 @@
org.eclipse.cdt.make.core.enableAutoBuild
- false
+ true
org.eclipse.cdt.make.core.enableCleanBuild
diff --git a/cocos2dx/platform/tizen/CCAccelerometer.cpp b/cocos2dx/platform/tizen/CCAccelerometer.cpp
index 57c97254f8..b447a61ad7 100644
--- a/cocos2dx/platform/tizen/CCAccelerometer.cpp
+++ b/cocos2dx/platform/tizen/CCAccelerometer.cpp
@@ -23,6 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
+#include "CCStdC.h"
#include "CCAccelerometer.h"
using namespace Tizen::Uix::Sensor;
diff --git a/cocos2dx/platform/tizen/CCApplication.cpp b/cocos2dx/platform/tizen/CCApplication.cpp
index ec51709384..a32c26a733 100644
--- a/cocos2dx/platform/tizen/CCApplication.cpp
+++ b/cocos2dx/platform/tizen/CCApplication.cpp
@@ -82,7 +82,7 @@ ccLanguageType Application::getCurrentLanguage()
{
result r = E_SUCCESS;
int index = 0;
- String localelanguageCode, languageCode;
+ Tizen::Base::String localelanguageCode, languageCode;
ccLanguageType ret = kLanguageEnglish;
r = SettingInfo::GetValue(L"http://tizen.org/setting/locale.language", localelanguageCode);
diff --git a/cocos2dx/platform/tizen/CCEGLView.cpp b/cocos2dx/platform/tizen/CCEGLView.cpp
index 506f29ae7c..543d93c9b5 100644
--- a/cocos2dx/platform/tizen/CCEGLView.cpp
+++ b/cocos2dx/platform/tizen/CCEGLView.cpp
@@ -54,7 +54,7 @@ bool EGLView::isOpenGLReady()
return (_screenSize.width != 0 && _screenSize.height != 0);
}
-Timer*
+Tizen::Base::Runtime::Timer*
EGLView::getTimer()
{
return __pTimer;
@@ -116,7 +116,7 @@ EGLView* EGLView::sharedOpenGLView()
}
void
-EGLView::OnTimerExpired(Timer& timer)
+EGLView::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
{
if (__pTimer == null)
{
@@ -134,7 +134,7 @@ EGLView::create()
TryCatch(initEGL(), , "[EGLView] EGLView::create() failed.");
- __pTimer = new (std::nothrow) Timer;
+ __pTimer = new (std::nothrow) Tizen::Base::Runtime::Timer;
TryCatch(__pTimer != null, , "[EGLView] Failed to allocate memory.");
r = __pTimer->Construct(*this);
diff --git a/cocos2dx/platform/tizen/CCFileUtilsTizen.cpp b/cocos2dx/platform/tizen/CCFileUtilsTizen.cpp
index d031f1b97d..1bc125374d 100644
--- a/cocos2dx/platform/tizen/CCFileUtilsTizen.cpp
+++ b/cocos2dx/platform/tizen/CCFileUtilsTizen.cpp
@@ -62,7 +62,7 @@ bool FileUtilsTizen::init()
return false;
}
- String resPath = pApp->GetAppResourcePath();
+ Tizen::Base::String resPath = pApp->GetAppResourcePath();
if (resPath.IsEmpty())
{
return false;
@@ -85,7 +85,7 @@ string FileUtilsTizen::getWritablePath()
string path("");
AsciiEncoding ascii;
- String dataPath = pApp->GetAppDataPath();
+ Tizen::Base::String dataPath = pApp->GetAppDataPath();
if (!dataPath.IsEmpty())
{
ByteBuffer* buffer = ascii.GetBytesN(dataPath);
diff --git a/cocos2dx/platform/tizen/CCOspApplication.cpp b/cocos2dx/platform/tizen/CCOspApplication.cpp
index a533837a41..c7faf94e1d 100644
--- a/cocos2dx/platform/tizen/CCOspApplication.cpp
+++ b/cocos2dx/platform/tizen/CCOspApplication.cpp
@@ -51,7 +51,7 @@ OspApplication::~OspApplication()
sm_pSharedOspApplication = NULL;
}
-Application*
+Tizen::App::Application*
OspApplication::CreateInstance(void)
{
// Create the instance through the constructor.
@@ -135,30 +135,30 @@ OspApplication::OnAppTerminating(AppRegistry& appRegistry, bool forcedTerminatio
void
OspApplication::OnForeground(void)
{
- Timer* timer = EGLView::sharedOpenGLView()->getTimer();
+ Tizen::Base::Runtime::Timer* timer = EGLView::sharedOpenGLView()->getTimer();
if (timer != null)
{
- timer->Start(Application::sharedApplication()->getAnimationInterval());
+ timer->Start(cocos2d::Application::sharedApplication()->getAnimationInterval());
}
if (Director::sharedDirector()->getOpenGLView())
{
- Application::sharedApplication()->applicationWillEnterForeground();
+ cocos2d::Application::sharedApplication()->applicationWillEnterForeground();
}
}
void
OspApplication::OnBackground(void)
{
- Timer* timer = EGLView::sharedOpenGLView()->getTimer();
+ Tizen::Base::Runtime::Timer* timer = EGLView::sharedOpenGLView()->getTimer();
if (timer != null)
{
timer->Cancel();
}
- Application::sharedApplication()->applicationDidEnterBackground();
+ cocos2d::Application::sharedApplication()->applicationDidEnterBackground();
}
void
diff --git a/cocos2dx/platform/tizen/CCOspForm.cpp b/cocos2dx/platform/tizen/CCOspForm.cpp
index 749487b142..b6186a3eb5 100644
--- a/cocos2dx/platform/tizen/CCOspForm.cpp
+++ b/cocos2dx/platform/tizen/CCOspForm.cpp
@@ -71,27 +71,27 @@ OspForm::OnTerminating(void)
}
void
-OspForm:: OnTouchDoublePressed(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+OspForm:: OnTouchDoublePressed(const Control& source, const Tizen::Graphics::Point& currentPosition, const TouchEventInfo& touchInfo)
{
}
void
-OspForm:: OnTouchFocusIn(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+OspForm:: OnTouchFocusIn(const Control& source, const Tizen::Graphics::Point& currentPosition, const TouchEventInfo& touchInfo)
{
}
void
-OspForm::OnTouchFocusOut(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+OspForm::OnTouchFocusOut(const Control& source, const Tizen::Graphics::Point& currentPosition, const TouchEventInfo& touchInfo)
{
}
void
-OspForm::OnTouchLongPressed(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+OspForm::OnTouchLongPressed(const Control& source, const Tizen::Graphics::Point& currentPosition, const TouchEventInfo& touchInfo)
{
}
void
-OspForm::OnTouchMoved(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+OspForm::OnTouchMoved(const Control& source, const Tizen::Graphics::Point& currentPosition, const TouchEventInfo& touchInfo)
{
int id = touchInfo.GetPointId();
float x = currentPosition.x;
@@ -100,7 +100,7 @@ OspForm::OnTouchMoved(const Control& source, const Point& currentPosition, const
}
void
-OspForm::OnTouchPressed(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+OspForm::OnTouchPressed(const Control& source, const Tizen::Graphics::Point& currentPosition, const TouchEventInfo& touchInfo)
{
int id = touchInfo.GetPointId();
float x = currentPosition.x;
@@ -109,7 +109,7 @@ OspForm::OnTouchPressed(const Control& source, const Point& currentPosition, con
}
void
-OspForm::OnTouchReleased(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+OspForm::OnTouchReleased(const Control& source, const Tizen::Graphics::Point& currentPosition, const TouchEventInfo& touchInfo)
{
int id = touchInfo.GetPointId();
float x = currentPosition.x;
@@ -119,7 +119,7 @@ OspForm::OnTouchReleased(const Control& source, const Point& currentPosition, co
void OspForm::OnTextValueChanged(const Tizen::Ui::Control& source)
{
- String text = __pKeypad->GetText();
+ Tizen::Base::String text = __pKeypad->GetText();
Utf8Encoding utf8;
ByteBuffer* buffer = utf8.GetBytesN(text);
const char* pText = "";
@@ -202,7 +202,7 @@ OspForm::ShowKeypad(const char* pMessage, KeypadStyle keypadStyle, KeypadInputMo
__pKeypad->SetTextPredictionEnabled(bTextPrediction);
__pKeypad->SetSingleLineEnabled(bSingleLineEnabled);
- __pKeypad->SetText(String(pMessage));
+ __pKeypad->SetText(Tizen::Base::String(pMessage));
__pKeypad->SetShowState(true);
__pKeypad->Show();
}
diff --git a/cocos2dx/proj.tizen/.project b/cocos2dx/proj.tizen/.project
index 3a0ff77fa5..f5bf1bdba2 100644
--- a/cocos2dx/proj.tizen/.project
+++ b/cocos2dx/proj.tizen/.project
@@ -7,8 +7,11 @@
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
+
+ ?children?
+ ?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||
+
?name?
@@ -43,7 +46,7 @@
org.eclipse.cdt.make.core.enableAutoBuild
- false
+ true
org.eclipse.cdt.make.core.enableCleanBuild
diff --git a/extensions/LocalStorage/LocalStorage.cpp b/extensions/LocalStorage/LocalStorage.cpp
index bc4a2f10d6..06e1bdc3ec 100644
--- a/extensions/LocalStorage/LocalStorage.cpp
+++ b/extensions/LocalStorage/LocalStorage.cpp
@@ -29,7 +29,7 @@
#include "cocos2d.h"
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID && CC_TARGET_PLATFORM != CC_PLATFORM_TIZEN)
#include
#include
diff --git a/extensions/proj.tizen/.project b/extensions/proj.tizen/.project
index 2324a03405..a84e979771 100644
--- a/extensions/proj.tizen/.project
+++ b/extensions/proj.tizen/.project
@@ -7,8 +7,11 @@
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
+
+ ?children?
+ ?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||
+
?name?
@@ -43,7 +46,7 @@
org.eclipse.cdt.make.core.enableAutoBuild
- false
+ true
org.eclipse.cdt.make.core.enableCleanBuild
@@ -87,6 +90,11 @@
org.tizen.nativecpp.apichecker.core.tizenCppNature
+
+ src/AssetsManager
+ 2
+ PARENT-1-PROJECT_LOC/AssetsManager
+
src/CCArmature
2
@@ -102,11 +110,26 @@
2
PARENT-1-PROJECT_LOC/Components
+
+ src/ExtensionMacros.h
+ 1
+ PARENT-1-PROJECT_LOC/ExtensionMacros.h
+
src/GUI
2
PARENT-1-PROJECT_LOC/GUI
+
+ src/LocalStorage
+ 2
+ PARENT-1-PROJECT_LOC/LocalStorage
+
+
+ src/cocos-ext.h
+ 1
+ PARENT-1-PROJECT_LOC/cocos-ext.h
+
src/network
2
@@ -123,15 +146,4 @@
PARENT-1-PROJECT_LOC/spine
-
-
- 1370769426773
- src/network
- 6
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-WebSocket*
-
-
-
diff --git a/external/Box2D/proj.tizen/.project b/external/Box2D/proj.tizen/.project
index 57ab16d995..a51514ea97 100644
--- a/external/Box2D/proj.tizen/.project
+++ b/external/Box2D/proj.tizen/.project
@@ -7,7 +7,6 @@
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
?name?
@@ -31,7 +30,7 @@
org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/box2d/Debug-Tizen-Device}
+ ${workspace_loc:/box2d/Debug-Tizen-Emulator}
org.eclipse.cdt.make.core.cleanBuildTarget
@@ -43,7 +42,7 @@
org.eclipse.cdt.make.core.enableAutoBuild
- false
+ true
org.eclipse.cdt.make.core.enableCleanBuild
@@ -88,27 +87,27 @@
- src/Box2D/Box2D.h
+ src/Box2D.h
1
PARENT-1-PROJECT_LOC/Box2D.h
- src/Box2D/Collision
+ src/Collision
2
PARENT-1-PROJECT_LOC/Collision
- src/Box2D/Common
+ src/Common
2
PARENT-1-PROJECT_LOC/Common
- src/Box2D/Dynamics
+ src/Dynamics
2
PARENT-1-PROJECT_LOC/Dynamics
- src/Box2D/Rope
+ src/Rope
2
PARENT-1-PROJECT_LOC/Rope
diff --git a/external/Box2D/proj.tizen/src/Box2D/placeholder.txt b/external/Box2D/proj.tizen/src/.gitkeep
similarity index 100%
rename from external/Box2D/proj.tizen/src/Box2D/placeholder.txt
rename to external/Box2D/proj.tizen/src/.gitkeep
diff --git a/external/chipmunk/proj.tizen/.project b/external/chipmunk/proj.tizen/.project
index 1f7cbcd8ee..0542d33de2 100644
--- a/external/chipmunk/proj.tizen/.project
+++ b/external/chipmunk/proj.tizen/.project
@@ -7,7 +7,6 @@
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
?name?
@@ -31,7 +30,7 @@
org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/chipmunk/Debug-Tizen-Device}
+ ${workspace_loc:/chipmunk/Debug-Tizen-Emulator}
org.eclipse.cdt.make.core.cleanBuildTarget
@@ -43,7 +42,7 @@
org.eclipse.cdt.make.core.enableAutoBuild
- false
+ true
org.eclipse.cdt.make.core.enableCleanBuild
diff --git a/samples/Cpp/HelloCpp/proj.tizen/.project b/samples/Cpp/HelloCpp/proj.tizen/.project
index 5fab07f837..65d8f547ac 100644
--- a/samples/Cpp/HelloCpp/proj.tizen/.project
+++ b/samples/Cpp/HelloCpp/proj.tizen/.project
@@ -7,7 +7,6 @@
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
?name?
@@ -31,7 +30,7 @@
org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/proj.tizen/Debug-Tizen-Device}
+ ${workspace_loc:/proj.tizen/Debug-Tizen-Emulator}
org.eclipse.cdt.make.core.cleanBuildTarget
@@ -43,7 +42,7 @@
org.eclipse.cdt.make.core.enableAutoBuild
- false
+ true
org.eclipse.cdt.make.core.enableCleanBuild
diff --git a/samples/Cpp/HelloCpp/proj.tizen/src/HelloCppEntry.cpp b/samples/Cpp/HelloCpp/proj.tizen/src/HelloCppEntry.cpp
index 4fa1bc214e..ef7c17e09a 100644
--- a/samples/Cpp/HelloCpp/proj.tizen/src/HelloCppEntry.cpp
+++ b/samples/Cpp/HelloCpp/proj.tizen/src/HelloCppEntry.cpp
@@ -53,7 +53,7 @@ OspMain(int argc, char* pArgv[])
for (int i = 0; i < argc; i++)
{
- args.Add(*(new (std::nothrow) String(pArgv[i])));
+ args.Add(*(new (std::nothrow) Tizen::Base::String(pArgv[i])));
}
OspApplication::SetApplicationInitializedCallback(ApplicationInitialized);
diff --git a/samples/Cpp/SimpleGame/proj.tizen/src/SimpleGameEntry.cpp b/samples/Cpp/SimpleGame/proj.tizen/src/SimpleGameEntry.cpp
index 670415eb0d..6a5dc5c71e 100644
--- a/samples/Cpp/SimpleGame/proj.tizen/src/SimpleGameEntry.cpp
+++ b/samples/Cpp/SimpleGame/proj.tizen/src/SimpleGameEntry.cpp
@@ -60,7 +60,7 @@ OspMain(int argc, char *pArgv[])
args.Construct();
for (int i = 0; i < argc; i++)
{
- args.Add(new (std::nothrow) String(pArgv[i]));
+ args.Add(new (std::nothrow) Tizen::Base::String(pArgv[i]));
}
OspApplication::SetApplicationInitializedCallback(ApplicationInitialized);
diff --git a/samples/Cpp/TestCpp/proj.tizen/src/TestCppEntry.cpp b/samples/Cpp/TestCpp/proj.tizen/src/TestCppEntry.cpp
index bd28407ea5..6b126b641d 100644
--- a/samples/Cpp/TestCpp/proj.tizen/src/TestCppEntry.cpp
+++ b/samples/Cpp/TestCpp/proj.tizen/src/TestCppEntry.cpp
@@ -60,7 +60,7 @@ OspMain(int argc, char *pArgv[])
args.Construct();
for (int i = 0; i < argc; i++)
{
- args.Add(new (std::nothrow) String(pArgv[i]));
+ args.Add(new (std::nothrow) Tizen::Base::String(pArgv[i]));
}
OspApplication::SetApplicationInitializedCallback(ApplicationInitialized);
diff --git a/samples/Lua/HelloLua/proj.tizen/.cproject b/samples/Lua/HelloLua/proj.tizen/.cproject
index f881dfde8e..4158453765 100644
--- a/samples/Lua/HelloLua/proj.tizen/.cproject
+++ b/samples/Lua/HelloLua/proj.tizen/.cproject
@@ -164,6 +164,7 @@
+
@@ -622,6 +623,7 @@
+
@@ -557,6 +560,7 @@
+