Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2947 from pyrasis/tizen_2.1 

[Tizen] Fix compile error
This commit is contained in:
James Chen 2013-06-20 04:58:21 -07:00
parent 358cbde2a1 2f8b24d05c
commit 2ceec2f65d
24 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CocosDenshion/proj.tizen/.cproject
View File

@ -204,6 +204,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//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">

5
CocosDenshion/proj.tizen/.project
View File

@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@ -31,7 +30,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/cocosdenshion/Debug-Tizen-Device}</value>
<value>${workspace_loc:/cocosdenshion/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

1
cocos2dx/platform/tizen/CCAccelerometer.cpp
View File

@ -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;

2
cocos2dx/platform/tizen/CCApplication.cpp
View File

@ -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);

6
cocos2dx/platform/tizen/CCEGLView.cpp
View File

@ -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);

4
cocos2dx/platform/tizen/CCFileUtilsTizen.cpp
View File

@ -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);

12
cocos2dx/platform/tizen/CCOspApplication.cpp
View File

@ -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

18
cocos2dx/platform/tizen/CCOspForm.cpp
View File

@ -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();
}

7
cocos2dx/proj.tizen/.project
View File

@ -7,8 +7,11 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?children?</key>
<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
</dictionary>
<dictionary>
<key>?name?</key>
<value></value>
@ -43,7 +46,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

2
extensions/LocalStorage/LocalStorage.cpp
View File

@ -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 <stdio.h>
#include <stdlib.h>

38
extensions/proj.tizen/.project
View File

@ -7,8 +7,11 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?children?</key>
<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
</dictionary>
<dictionary>
<key>?name?</key>
<value></value>
@ -43,7 +46,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
@ -87,6 +90,11 @@
<nature>org.tizen.nativecpp.apichecker.core.tizenCppNature</nature>
</natures>
<linkedResources>
<link>
<name>src/AssetsManager</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/AssetsManager</locationURI>
</link>
<link>
<name>src/CCArmature</name>
<type>2</type>
@ -102,11 +110,26 @@
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Components</locationURI>
</link>
<link>
<name>src/ExtensionMacros.h</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/ExtensionMacros.h</locationURI>
</link>
<link>
<name>src/GUI</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/GUI</locationURI>
</link>
<link>
<name>src/LocalStorage</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/LocalStorage</locationURI>
</link>
<link>
<name>src/cocos-ext.h</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/cocos-ext.h</locationURI>
</link>
<link>
<name>src/network</name>
<type>2</type>
@ -123,15 +146,4 @@
<locationURI>PARENT-1-PROJECT_LOC/spine</locationURI>
</link>
</linkedResources>
<filteredResources>
<filter>
<id>1370769426773</id>
<name>src/network</name>
<type>6</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-WebSocket*</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

15
external/Box2D/proj.tizen/.project vendored
View File

@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@ -31,7 +30,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/box2d/Debug-Tizen-Device}</value>
<value>${workspace_loc:/box2d/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
@ -88,27 +87,27 @@
</natures>
<linkedResources>
<link>
<name>src/Box2D/Box2D.h</name>
<name>src/Box2D.h</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/Box2D.h</locationURI>
</link>
<link>
<name>src/Box2D/Collision</name>
<name>src/Collision</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Collision</locationURI>
</link>
<link>
<name>src/Box2D/Common</name>
<name>src/Common</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Common</locationURI>
</link>
<link>
<name>src/Box2D/Dynamics</name>
<name>src/Dynamics</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Dynamics</locationURI>
</link>
<link>
<name>src/Box2D/Rope</name>
<name>src/Rope</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Rope</locationURI>
</link>

0
external/Box2D/proj.tizen/src/Box2D/placeholder.txt → external/Box2D/proj.tizen/src/.gitkeep vendored
View File

5
external/chipmunk/proj.tizen/.project vendored
View File

@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@ -31,7 +30,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/chipmunk/Debug-Tizen-Device}</value>
<value>${workspace_loc:/chipmunk/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

5
samples/Cpp/HelloCpp/proj.tizen/.project
View File

@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@ -31,7 +30,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/proj.tizen/Debug-Tizen-Device}</value>
<value>${workspace_loc:/proj.tizen/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

2
samples/Cpp/HelloCpp/proj.tizen/src/HelloCppEntry.cpp
View File

@ -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);

2
samples/Cpp/SimpleGame/proj.tizen/src/SimpleGameEntry.cpp
View File

@ -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);

2
samples/Cpp/TestCpp/proj.tizen/src/TestCppEntry.cpp
View File

@ -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);

2
samples/Lua/HelloLua/proj.tizen/.cproject
View File

@ -164,6 +164,7 @@
<listOptionValue builtIn="false" value="idn"/>
<listOptionValue builtIn="false" value="websockets"/>
<listOptionValue builtIn="false" value="chipmunk"/>
<listOptionValue builtIn="false" value="box2d"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2119600729" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@ -622,6 +623,7 @@
<listOptionValue builtIn="false" value="idn"/>
<listOptionValue builtIn="false" value="websockets"/>
<listOptionValue builtIn="false" value="chipmunk"/>
<listOptionValue builtIn="false" value="box2d"/>
</option>
<option id="gnu.cpp.link.option.paths.1598659573" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lib}&quot;"/>

2
samples/Lua/HelloLua/proj.tizen/src/HelloLuaEntry.cpp
View File

@ -35,7 +35,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);

7
samples/Lua/TestLua/proj.tizen/.cproject
View File

@ -41,6 +41,7 @@
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/CocosDenshion/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/cocos2dx_support&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/lua&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/tolua&quot;"/>
</option>
<option id="sbi.gnu.cpp.compiler.option.frameworks.cpp.399579441" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.cpp" valueType="userObjs">
<listOptionValue builtIn="false" value="osp"/>
@ -104,6 +105,7 @@
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/proj.tizen/Debug-Tizen-Emulator&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/extensions/proj.tizen/Debug-Tizen-Emulator&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/external/chipmunk/proj.tizen/Debug-Tizen-Emulator&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/external/box2d/proj.tizen/Debug-Tizen-Emulator&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/external/libwebsockets/tizen/lib/x86&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-emulator-2.1.native/lib&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-emulator-2.1.native/usr/lib&quot;"/>
@ -163,6 +165,7 @@
<listOptionValue builtIn="false" value="idn"/>
<listOptionValue builtIn="false" value="websockets"/>
<listOptionValue builtIn="false" value="chipmunk"/>
<listOptionValue builtIn="false" value="box2d"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2119600729" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@ -557,6 +560,7 @@
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/CocosDenshion/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/cocos2dx_support&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/lua&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/tolua&quot;"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.650430135" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_DEBUG"/>
@ -653,6 +657,7 @@
<listOptionValue builtIn="false" value="idn"/>
<listOptionValue builtIn="false" value="websockets"/>
<listOptionValue builtIn="false" value="chipmunk"/>
<listOptionValue builtIn="false" value="box2d"/>
</option>
<option id="gnu.cpp.link.option.paths.429431999" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lib}&quot;"/>
@ -661,6 +666,7 @@
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/scripting/lua/proj.tizen/Debug-Tizen-Device&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/extensions/proj.tizen/Debug-Tizen-Device&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/external/chipmunk/proj.tizen/Debug-Tizen-Device&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/external/box2d/proj.tizen/Debug-Tizen-Device&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/external/libwebsockets/tizen/lib/armv7l&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-device-2.1.native/lib&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/platform/third_party/tizen/rootstraps/tizen-device-2.1.native/usr/lib&quot;"/>
@ -702,4 +708,5 @@
<storageModule moduleId="refreshScope" versionNumber="1">
<resource resourceType="PROJECT" workspacePath="/proj.tizen"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>

3
samples/Lua/TestLua/proj.tizen/.project
View File

@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

2
samples/Lua/TestLua/proj.tizen/src/TestLuaEntry.cpp
View File

@ -35,7 +35,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);

5
scripting/lua/proj.tizen/.project
View File

@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@ -31,7 +30,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/lua/Debug-Tizen-Device}</value>
<value>${workspace_loc:/proj.tizen/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>