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

Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine

This commit is contained in:
samuele3hu 2013-06-08 11:25:51 +08:00
parent 4be415cc04 35e11ae9ff
commit 34b4cb48ab
44 changed files with 842 additions and 1730 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -14,6 +14,7 @@ Developers:
carlomorgantinizynga
CCLabelTTF supports for shadow and stroke
Adding CCLabelTTF::createWithFontDefinition.
James Gregory (j4m3z0r, Zynga)
Maintainer of Emscripten port.
@ -447,6 +448,9 @@ Developers:
sunxiaoyu
Refactoring CCEditBox to add UITextField only when keyboard was opened, remove it when keyboard was closed.
edwardzhou (Edward Zhou)
Correcting the type detecting order for Lua CCBProxy::getNodeTypeName.
Retired Core Developers:
WenSheng Yang

12
cocos2dx/label_nodes/CCLabelTTF.cpp
View File

@ -96,6 +96,18 @@ CCLabelTTF* CCLabelTTF::create(const char *string, const char *fontName, float f
return NULL;
}
CCLabelTTF * CCLabelTTF::createWithFontDefinition(const char *string, ccFontDefinition &textDefinition)
{
CCLabelTTF *pRet = new CCLabelTTF();
if(pRet && pRet->initWithStringAndTextDefinition(string, textDefinition))
{
pRet->autorelease();
return pRet;
}
CC_SAFE_DELETE(pRet);
return NULL;
}
bool CCLabelTTF::init()
{
return this->initWithString("", "Helvetica", 12);

4
cocos2dx/label_nodes/CCLabelTTF.h
View File

@ -70,6 +70,10 @@ public:
const CCSize& dimensions, CCTextAlignment hAlignment,
CCVerticalTextAlignment vAlignment);
/** Create a lable with string and a font definition*/
static CCLabelTTF * createWithFontDefinition(const char *string, ccFontDefinition &textDefinition);
/** initializes the CCLabelTTF with a font name and font size */
bool initWithString(const char *string, const char *fontName, float fontSize);

6
cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java
View File

@ -65,7 +65,6 @@ public class Cocos2dxETCLoader {
texture = ETC1Util.createTexture(inputStream);
inputStream.close();
assetManager.close();
} catch (Exception e) {
Log.d("Cocos2dx", "Unable to create texture for " + filePath);
@ -73,6 +72,8 @@ public class Cocos2dxETCLoader {
}
if (texture != null) {
boolean ret = true;
try {
int width = texture.getWidth();
int height = texture.getHeight();
@ -88,9 +89,10 @@ public class Cocos2dxETCLoader {
} catch (Exception e)
{
Log.d("invoke native function error", e.toString());
ret = false;
}
return true;
return ret;
} else {
return false;
}

10
cocos2dx/proj.blackberry/.project
View File

@ -110,6 +110,16 @@
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/base_nodes</locationURI>
</link>
<link>
<name>ccFPSImages.c</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/ccFPSImages.c</locationURI>
</link>
<link>
<name>ccFPSImages.h</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/ccFPSImages.h</locationURI>
</link>
<link>
<name>cocoa</name>
<type>2</type>

3
extensions/network/WebSocket.cpp
View File

@ -28,6 +28,7 @@
****************************************************************************/
#include "WebSocket.h"
#include <pthread.h>
#include <queue>
#include <signal.h>
#include <errno.h>
@ -465,7 +466,6 @@ void WebSocket::onSubThreadEnded()
}
int WebSocket::onSocketCallback(struct libwebsocket_context *ctx,
struct libwebsocket *wsi,
enum libwebsocket_callback_reasons reason,
@ -658,4 +658,5 @@ void WebSocket::onUIThreadReceiveMessage(WsMessage* msg)
break;
}
}
NS_CC_EXT_END

3
extensions/network/WebSocket.h
View File

@ -31,7 +31,6 @@
#define __CC_WEBSOCKET_H__
#include "ExtensionMacros.h"
#include <pthread.h>
#include "cocos2d.h"
#include "libwebsockets.h"
#include <list>
@ -149,7 +148,7 @@ private:
struct libwebsocket_context* _wsContext;
Delegate* _delegate;
int _SSLConnection;
libwebsocket_protocols* _wsProtocols;
struct libwebsocket_protocols* _wsProtocols;
};
NS_CC_EXT_END

15
extensions/proj.blackberry/.cproject
View File

@ -83,9 +83,10 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="CCBReader"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GUI"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry excluding="WebSocket.cpp|WebSocket.h" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="physics_nodes"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="spine"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Components"/>
</sourceEntries>
</configuration>
</storageModule>
@ -162,6 +163,8 @@
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GUI"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="physics_nodes"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Components"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="spine"/>
</sourceEntries>
</configuration>
</storageModule>
@ -238,6 +241,8 @@
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GUI"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="physics_nodes"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Components"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="spine"/>
</sourceEntries>
</configuration>
</storageModule>
@ -314,6 +319,8 @@
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GUI"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="physics_nodes"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Components"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="spine"/>
</sourceEntries>
</configuration>
</storageModule>
@ -388,6 +395,8 @@
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GUI"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="physics_nodes"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Components"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="spine"/>
</sourceEntries>
</configuration>
</storageModule>
@ -463,6 +472,8 @@
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GUI"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="physics_nodes"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Components"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="spine"/>
</sourceEntries>
</configuration>
</storageModule>
@ -538,6 +549,8 @@
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="GUI"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="network"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="physics_nodes"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Components"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="spine"/>
</sourceEntries>
</configuration>
</storageModule>

13
extensions/proj.blackberry/.project
View File

@ -84,6 +84,11 @@
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/CCBReader</locationURI>
</link>
<link>
<name>Components</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Components</locationURI>
</link>
<link>
<name>GUI</name>
<type>2</type>
@ -107,12 +112,12 @@
</linkedResources>
<filteredResources>
<filter>
<id>1345434795222</id>
<name>GUI</name>
<type>10</type>
<id>1370598150734</id>
<name>network</name>
<type>6</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-true-false-CCEditBox</arguments>
<arguments>1.0-name-matches-false-false-WebSocket*</arguments>
</matcher>
</filter>
</filteredResources>

60
samples/Cpp/HelloCpp/proj.blackberry/.cproject
View File

@ -22,7 +22,7 @@
<builder buildPath="${workspace_loc:/HelloWorld/Device-Debug}" id="com.qnx.nto.476715223" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="com.qnx.nto"/>
<tool id="com.qnx.qcc.tool.compiler.1144576773" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compile.debug.477981148" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.950802078" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.950802078" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.947876049" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
@ -123,7 +123,7 @@
<builder buildPath="${workspace_loc:/HelloWorld/Device-Release}" id="com.qnx.nto.1079130834" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="com.qnx.nto"/>
<tool id="com.qnx.qcc.tool.compiler.489158604" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compiler.optlevel.1816856148" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.2" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.security.516815496" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.516815496" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1389762293" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
@ -210,7 +210,7 @@
<tool id="com.qnx.qcc.tool.compiler.1156975065" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compile.debug.516699842" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.profile2.827918638" name="Build for Profiling (Function Instrumentation) (-finstrument-functions)" superClass="com.qnx.qcc.option.compiler.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.90830663" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.90830663" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.2011249500" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
@ -298,7 +298,7 @@
<tool id="com.qnx.qcc.tool.compiler.1214860716" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compile.debug.1865580810" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.coverage.417773989" name="Build for Code Coverage (-Wc,-ftest-coverage -Wc,-fprofile-arcs)" superClass="com.qnx.qcc.option.compiler.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.2078595424" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.2078595424" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.2117581868" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
@ -471,7 +471,7 @@
<tool id="com.qnx.qcc.tool.compiler.1309978635" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compile.debug.347183646" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.profile2.53874439" name="Build for Profiling (Function Instrumentation) (-finstrument-functions)" superClass="com.qnx.qcc.option.compiler.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.728843003" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.728843003" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.307652248" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
@ -558,7 +558,7 @@
<tool id="com.qnx.qcc.tool.compiler.1856118712" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compile.debug.367463903" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.coverage.2144541749" name="Build for Code Coverage (-Wc,-ftest-coverage -Wc,-fprofile-arcs)" superClass="com.qnx.qcc.option.compiler.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.2041278353" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.security.2041278353" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1008023515" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
@ -630,33 +630,33 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="HelloWorld.null.1273913276" name="HelloWorld"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.debug.660208940">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.1237484173">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.release.1265921422">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.181538713">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.1761000041">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.debug.446234419">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.1771167181">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="com.qnx.tools.ide.qde.core.QNXProjectProperties"/>
<storageModule moduleId="refreshScope" versionNumber="1">
<resource resourceType="PROJECT" workspacePath="/HelloCpp"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.1771167181">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.1761000041">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.debug.660208940">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.release.1265921422">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.debug.446234419">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.181538713">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.1237484173">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
</storageModule>
</cproject>

12
samples/Cpp/SimpleGame/proj.blackberry/.cproject
View File

@ -136,7 +136,6 @@
</option>
<option id="com.qnx.qcc.option.compiler.pie.456946828" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.includePath.1777714844" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -177,7 +176,6 @@
<option id="com.qnx.qcc.option.linker.security.1061945690" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.pie.2077677263" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.1491934160" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx/Device-Debug}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/lib"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
@ -230,7 +228,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.2118671865" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -273,7 +270,6 @@
</option>
<option id="com.qnx.qcc.option.linker.security.29518400" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.150600101" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx/Device-Debug}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/lib"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
@ -326,7 +322,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1766273669" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -369,7 +364,6 @@
</option>
<option id="com.qnx.qcc.option.linker.security.1670627205" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.322375874" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx/Device-Debug}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/lib"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
@ -420,7 +414,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1838736665" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -462,7 +455,6 @@
</option>
<option id="com.qnx.qcc.option.linker.security.2014666509" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.927694704" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx/Device-Debug}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/lib"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
@ -515,7 +507,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1315014042" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -558,7 +549,6 @@
</option>
<option id="com.qnx.qcc.option.linker.security.931994389" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.681434121" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx/Device-Debug}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/lib"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
@ -610,7 +600,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1142643875" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -653,7 +642,6 @@
</option>
<option id="com.qnx.qcc.option.linker.security.2136296969" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.1115848281" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx/Device-Debug}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/lib"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>

180
samples/Cpp/SimpleGame/proj.blackberry/.project
View File

@ -1,90 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>SimpleGame</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/SimpleGame/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
</linkedResources>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>SimpleGame</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/SimpleGame/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
</linkedResources>
</projectDescription>

107
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/ComponentsTestScene.cpp
View File

@ -1,107 +0,0 @@
#include "ComponentsTestScene.h"
#include "GameOverScene.h"
#include "SimpleAudioEngine.h"
#include "PlayerController.h"
#include "SceneController.h"
#include "../ExtensionsTest.h"
using namespace cocos2d;
using namespace cocos2d::extension;
ComponentsTestLayer::~ComponentsTestLayer()
{
}
ComponentsTestLayer::ComponentsTestLayer()
{
}
CCScene* ComponentsTestLayer::scene()
{
CCScene * scene = NULL;
do
{
// 'scene' is an autorelease object
scene = CCScene::create();
CC_BREAK_IF(! scene);
// 'layer' is an autorelease object
ComponentsTestLayer *layer = ComponentsTestLayer::create();
CC_BREAK_IF(! layer);
// add layer as a child to scene
scene->addChild(layer);
} while (0);
// return the scene
return scene;
}
// on "init" you need to initialize your instance
bool ComponentsTestLayer::init()
{
bool bRet = false;
do
{
CC_BREAK_IF(! CCLayerColor::initWithColor( ccc4(255,255,255,255) ) );
CCNode *root = createGameScene();
CC_BREAK_IF(!root);
this->addChild(root, 0, 1);
root->getChildByTag(1)->addComponent(CCComAudio::create());
root->getChildByTag(1)->addComponent(PlayerController::create());
root->addComponent(CCComAudio::create());
root->addComponent(CCComAttribute::create());
root->addComponent(SceneController::create());
bRet = true;
} while (0);
return bRet;
}
cocos2d::CCNode* ComponentsTestLayer::createGameScene()
{
CCNode *root = NULL;
do
{
CCSize visibleSize = CCDirector::sharedDirector()->getVisibleSize();
CCPoint origin = CCDirector::sharedDirector()->getVisibleOrigin();
CCSprite *player = CCSprite::create("components/Player.png", CCRectMake(0, 0, 27, 40) );
player->setPosition( ccp(origin.x + player->getContentSize().width/2,
origin.y + visibleSize.height/2) );
root = cocos2d::CCNode::create();
root->addChild(player, 1, 1);
CCMenuItemFont *itemBack = CCMenuItemFont::create("Back", this, menu_selector(ComponentsTestLayer::toExtensionsMainLayer));
itemBack->setColor(ccc3(0, 0, 0));
itemBack->setPosition(ccp(VisibleRect::rightBottom().x - 50, VisibleRect::rightBottom().y + 25));
CCMenu *menuBack = CCMenu::create(itemBack, NULL);
menuBack->setPosition(CCPointZero);
addChild(menuBack);
}while (0);
return root;
}
void ComponentsTestLayer::toExtensionsMainLayer(cocos2d::CCObject *sender)
{
ExtensionsTestScene *pScene = new ExtensionsTestScene();
pScene->runThisTest();
pScene->release();
}
void runComponentsTestLayerTest()
{
CCScene *pScene = ComponentsTestLayer::scene();
CCDirector::sharedDirector()->replaceScene(pScene);
}

32
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/ComponentsTestScene.h
View File

@ -1,32 +0,0 @@
#ifndef __COMPONENTSTESTSCENE_H__
#define __COMPONENTSTESTSCENE_H__
#include "cocos2d.h"
#include "cocos-ext.h"
void runComponentsTestLayerTest();
class ComponentsTestLayer : public cocos2d::CCLayerColor
{
public:
ComponentsTestLayer();
~ComponentsTestLayer();
// Here's a difference. Method 'init' in cocos2d-x returns bool,
// instead of returning 'id' in cocos2d-iphone
virtual bool init();
// there's no 'id' in cpp, so we recommand to return the exactly class pointer
static cocos2d::CCScene* scene();
// implement the "static node()" method manually
CREATE_FUNC(ComponentsTestLayer);
// init scene
cocos2d::CCNode* createGameScene();
//back to Extensions Main Layer
void toExtensionsMainLayer(cocos2d::CCObject *sender);
};
#endif // __HELLOWORLD_SCENE_H__

107
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/EnemyController.cpp
View File

@ -1,107 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "EnemyController.h"
#include "SceneController.h"
using namespace cocos2d;
EnemyController::EnemyController(void)
{
m_strName = "EnemyController";
}
EnemyController::~EnemyController(void)
{
}
bool EnemyController::init()
{
return true;
}
void EnemyController::onEnter()
{
// Determine where to spawn the target along the Y axis
CCSize winSize = CCDirector::sharedDirector()->getVisibleSize();
float minY = getOwner()->getContentSize().height/2;
float maxY = winSize.height - getOwner()->getContentSize().height/2;
int rangeY = (int)(maxY - minY);
// srand( TimGetTicks() );
int actualY = ( rand() % rangeY ) + (int)minY;
// Create the target slightly off-screen along the right edge,
// and along a random position along the Y axis as calculated
m_pOwner->setPosition(
ccp(winSize.width + (getOwner()->getContentSize().width/2),
CCDirector::sharedDirector()->getVisibleOrigin().y + actualY) );
// Determine speed of the target
int minDuration = (int)2.0;
int maxDuration = (int)4.0;
int rangeDuration = maxDuration - minDuration;
// srand( TimGetTicks() );
int actualDuration = ( rand() % rangeDuration ) + minDuration;
// Create the actions
CCFiniteTimeAction* actionMove = CCMoveTo::create( (float)actualDuration,
ccp(0 - getOwner()->getContentSize().width/2, actualY) );
CCFiniteTimeAction* actionMoveDone = CCCallFuncN::create(getOwner()->getParent()->getComponent("SceneController"),
callfuncN_selector(SceneController::spriteMoveFinished));
m_pOwner->runAction( CCSequence::create(actionMove, actionMoveDone, NULL) );
}
void EnemyController::onExit()
{
}
void EnemyController::update(float delta)
{
}
EnemyController* EnemyController::create(void)
{
EnemyController * pRet = new EnemyController();
if (pRet && pRet->init())
{
pRet->autorelease();
}
else
{
CC_SAFE_DELETE(pRet);
}
return pRet;
}
void EnemyController::die()
{
CCComponent *com = m_pOwner->getParent()->getComponent("SceneController");
cocos2d::CCArray *_targets = ((SceneController*)com)->getTargets();
_targets->removeObject(m_pOwner);
m_pOwner->removeFromParentAndCleanup(true);
((SceneController*)com)->increaseKillCount();
}

50
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/EnemyController.h
View File

@ -1,50 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __CC_ENEMYCONTROLLER_H__
#define __CC_ENEMYCONTROLLER_H__
#include "cocos2d.h"
#include "cocos-ext.h"
class EnemyController : public cocos2d::extension::CCComController
{
protected:
EnemyController(void);
virtual ~EnemyController(void);
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
static EnemyController* create(void);
public:
void die();
};
#endif // __FUNDATION__CCCOMPONENT_H__

103
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/GameOverScene.cpp
View File

@ -1,103 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2010 Ray Wenderlich
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "GameOverScene.h"
#include "ComponentsTestScene.h"
#include "../ExtensionsTest.h"
using namespace cocos2d;
bool GameOverScene::init()
{
if( CCScene::init() )
{
this->_layer = GameOverLayer::create();
this->_layer->retain();
this->addChild(_layer);
return true;
}
else
{
return false;
}
}
GameOverScene::~GameOverScene()
{
if (_layer)
{
_layer->release();
_layer = NULL;
}
}
bool GameOverLayer::init()
{
if ( CCLayerColor::initWithColor( ccc4(255,255,255,255) ) )
{
CCSize winSize = CCDirector::sharedDirector()->getWinSize();
this->_label = CCLabelTTF::create("","Artial", 32);
_label->retain();
_label->setColor( ccc3(0, 0, 0) );
_label->setPosition( ccp(winSize.width/2, winSize.height/2) );
this->addChild(_label);
this->runAction( CCSequence::create(
CCDelayTime::create(3),
CCCallFunc::create(this,
callfunc_selector(GameOverLayer::gameOverDone)),
NULL));
CCMenuItemFont *itemBack = CCMenuItemFont::create("Back", this, menu_selector(ComponentsTestLayer::toExtensionsMainLayer));
itemBack->setColor(ccc3(0, 0, 0));
itemBack->setPosition(ccp(VisibleRect::rightBottom().x - 50, VisibleRect::rightBottom().y + 25));
CCMenu *menuBack = CCMenu::create(itemBack, NULL);
menuBack->setPosition(CCPointZero);
addChild(menuBack);
return true;
}
else
{
return false;
}
}
void GameOverLayer::gameOverDone()
{
CCDirector::sharedDirector()->replaceScene( ComponentsTestLayer::scene() );
}
GameOverLayer::~GameOverLayer()
{
if (_label)
{
_label->release();
_label = NULL;
}
}

55
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/GameOverScene.h
View File

@ -1,55 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2011 cocos2d-x.org
Copyright (c) 2010 Ray Wenderlich
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef _GAME_OVER_SCENE_H_
#define _GAME_OVER_SCENE_H_
#include "cocos2d.h"
class GameOverLayer : public cocos2d::CCLayerColor
{
public:
GameOverLayer():_label(NULL) {};
virtual ~GameOverLayer();
bool init();
CREATE_FUNC(GameOverLayer);
void gameOverDone();
CC_SYNTHESIZE_READONLY(cocos2d::CCLabelTTF*, _label, Label);
};
class GameOverScene : public cocos2d::CCScene
{
public:
GameOverScene():_layer(NULL) {};
~GameOverScene();
bool init();
CREATE_FUNC(GameOverScene);
CC_SYNTHESIZE_READONLY(GameOverLayer*, _layer, Layer);
};
#endif // _GAME_OVER_SCENE_H_

92
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/PlayerController.cpp
View File

@ -1,92 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "PlayerController.h"
#include "ComponentsTestScene.h"
#include "SceneController.h"
#include "ProjectileController.h"
using namespace cocos2d;
using namespace cocos2d::extension;
PlayerController::PlayerController(void)
{
m_strName = "PlayerController";
}
PlayerController::~PlayerController(void)
{
}
bool PlayerController::init()
{
return true;
}
void PlayerController::onEnter()
{
setTouchEnabled(true);
}
void PlayerController::onExit()
{
setTouchEnabled(false);
}
void PlayerController::update(float delta)
{
}
void PlayerController::ccTouchesEnded(CCSet *pTouches, CCEvent *pEvent)
{
// Choose one of the touches to work with
CCTouch* touch = (CCTouch*)( pTouches->anyObject() );
CCPoint location = touch->getLocation();
CCSprite *projectile = CCSprite::create("components/Projectile.png", CCRectMake(0, 0, 20, 20));
m_pOwner->getParent()->addChild(projectile, 1, 4);
ProjectileController *com = ProjectileController::create();
projectile->addComponent(com);
com->move(location.x, location.y);
((CCComAudio*)(m_pOwner->getComponent("Audio")))->playEffect("pew-pew-lei.wav");
}
PlayerController* PlayerController::create(void)
{
PlayerController * pRet = new PlayerController();
if (pRet && pRet->init())
{
pRet->autorelease();
}
else
{
CC_SAFE_DELETE(pRet);
}
return pRet;
}

51
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/PlayerController.h
View File

@ -1,51 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __CC_PLAYERCONTROLLER_H__
#define __CC_PLAYERCONTROLLER_H__
#include "cocos2d.h"
#include "cocos-ext.h"
class PlayerController : public cocos2d::extension::CCComController
{
protected:
PlayerController(void);
virtual ~PlayerController(void);
public:
virtual void ccTouchesEnded(cocos2d::CCSet *pTouches, cocos2d::CCEvent *pEvent);
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
static PlayerController* create(void);
};
#endif // __FUNDATION__CCCOMPONENT_H__

163
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/ProjectileController.cpp
View File

@ -1,163 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "ProjectileController.h"
#include "SceneController.h"
#include "EnemyController.h"
using namespace cocos2d;
ProjectileController::ProjectileController(void)
{
m_strName = "ProjectileController";
}
ProjectileController::~ProjectileController(void)
{
}
bool ProjectileController::init()
{
return true;
}
void ProjectileController::onEnter()
{
CCSize winSize = CCDirector::sharedDirector()->getVisibleSize();
CCPoint origin = CCDirector::sharedDirector()->getVisibleOrigin();
m_pOwner->setPosition( ccp(origin.x+20, origin.y+winSize.height/2) );
m_pOwner->setTag(3);
CCComponent *com = m_pOwner->getParent()->getComponent("SceneController");
((SceneController*)com)->getProjectiles()->addObject(m_pOwner);
}
void ProjectileController::onExit()
{
}
void ProjectileController::update(float delta)
{
CCComponent *com = m_pOwner->getParent()->getComponent("SceneController");
cocos2d::CCArray *_targets = ((SceneController*)com)->getTargets();
CCSprite *projectile = dynamic_cast<CCSprite*>(m_pOwner);
CCRect projectileRect = CCRectMake(
projectile->getPosition().x - (projectile->getContentSize().width/2),
projectile->getPosition().y - (projectile->getContentSize().height/2),
projectile->getContentSize().width,
projectile->getContentSize().height);
CCArray* targetsToDelete =new CCArray;
CCObject* jt = NULL;
CCARRAY_FOREACH(_targets, jt)
{
CCSprite *target = dynamic_cast<CCSprite*>(jt);
CCRect targetRect = CCRectMake(
target->getPosition().x - (target->getContentSize().width/2),
target->getPosition().y - (target->getContentSize().height/2),
target->getContentSize().width,
target->getContentSize().height);
// if (CCRect::CCRectIntersectsRect(projectileRect, targetRect))
if (projectileRect.intersectsRect(targetRect))
{
targetsToDelete->addObject(target);
}
}
CCARRAY_FOREACH(targetsToDelete, jt)
{
CCSprite *target = dynamic_cast<CCSprite*>(jt);
((EnemyController*)(target->getComponent("EnemyController")))->die();
}
bool isDied = targetsToDelete->count();
targetsToDelete->release();
if (isDied)
{
die();
}
}
ProjectileController* ProjectileController::create(void)
{
ProjectileController * pRet = new ProjectileController();
if (pRet && pRet->init())
{
pRet->autorelease();
}
else
{
CC_SAFE_DELETE(pRet);
}
return pRet;
}
void ProjectileController::move(float flocationX, float flocationY)
{
CCSize winSize = CCDirector::sharedDirector()->getVisibleSize();
CCPoint origin = CCDirector::sharedDirector()->getVisibleOrigin();
// Determinie offset of location to projectile
float offX = flocationX - m_pOwner->getPosition().x;
float offY = flocationY - m_pOwner->getPosition().y;
// Bail out if we are shooting down or backwards
if (offX <= 0) return;
// Ok to add now - we've double checked position
// Determine where we wish to shoot the projectile to
float realX = origin.x + winSize.width + (m_pOwner->getContentSize().width/2);
float ratio = offY / offX;
float realY = (realX * ratio) + m_pOwner->getPosition().y;
CCPoint realDest = ccp(realX, realY);
// Determine the length of how far we're shooting
float offRealX = realX - m_pOwner->getPosition().x;
float offRealY = realY - m_pOwner->getPosition().y;
float length = sqrtf((offRealX * offRealX) + (offRealY*offRealY));
float velocity = 480/1; // 480pixels/1sec
float realMoveDuration = length/velocity;
// Move projectile to actual endpoint
m_pOwner->runAction( CCSequence::create(
CCMoveTo::create(realMoveDuration, realDest),
CCCallFuncN::create(getOwner()->getParent()->getComponent("SceneController"),
callfuncN_selector(SceneController::spriteMoveFinished)),
NULL) );
}
void ProjectileController::die()
{
CCComponent *com = m_pOwner->getParent()->getComponent("SceneController");
cocos2d::CCArray *_projectiles = ((SceneController*)com)->getProjectiles();
_projectiles->removeObject(m_pOwner);
m_pOwner->removeFromParentAndCleanup(true);
}

51
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/ProjectileController.h
View File

@ -1,51 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __CC_PROJECTILECONTROLLER_H__
#define __CC_PROJECTILECONTROLLER_H__
#include "cocos2d.h"
#include "cocos-ext.h"
class ProjectileController : public cocos2d::extension::CCComController
{
protected:
ProjectileController(void);
virtual ~ProjectileController(void);
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
static ProjectileController* create(void);
public:
void move(float flocationX, float flocationY);
void die();
};
#endif // __FUNDATION__CCCOMPONENT_H__

147
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/SceneController.cpp
View File

@ -1,147 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "SceneController.h"
#include "ComponentsTestScene.h"
#include "PlayerController.h"
#include "GameOverScene.h"
#include "EnemyController.h"
using namespace cocos2d;
using namespace cocos2d::extension;
SceneController::SceneController(void)
: _fAddTargetTime(0.0f)
, _fElapsedTime(0.0f)
, _targets(NULL)
, _projectiles(NULL)
{
m_strName = "SceneController";
}
SceneController::~SceneController(void)
{
if (_targets)
{
_targets->release();
_targets = NULL;
}
if (_projectiles)
{
_projectiles->release();
_projectiles = NULL;
}
}
bool SceneController::init()
{
return true;
}
void SceneController::onEnter()
{
_fAddTargetTime = 1.0f;
_targets = new CCArray;
_projectiles = new CCArray;
((CCComAudio*)(m_pOwner->getComponent("Audio")))->playBackgroundMusic("background-music-aac.wav", true);
((CCComAttribute*)(m_pOwner->getComponent("ComAttribute")))->setInt("KillCount", 0);
}
void SceneController::onExit()
{
}
void SceneController::update(float delta)
{
// return;
_fElapsedTime += delta;
if (_fElapsedTime > _fAddTargetTime)
{
addTarget();
_fElapsedTime = 0.0f;
}
}
SceneController* SceneController::create(void)
{
SceneController * pRet = new SceneController();
if (pRet && pRet->init())
{
pRet->autorelease();
}
else
{
CC_SAFE_DELETE(pRet);
}
return pRet;
}
void SceneController::addTarget()
{
CCSprite *target = CCSprite::create("components/Target.png", CCRectMake(0,0,27,40));
m_pOwner->addChild(target, 1, 2);
target->addComponent(EnemyController::create());
target->setTag(2);
_targets->addObject(target);
}
void SceneController::spriteMoveFinished(CCNode* sender)
{
CCSprite *sprite = (CCSprite *)sender;
m_pOwner->removeChild(sprite, true);
if (sprite->getTag() == 2) // target
{
_targets->removeObject(sprite);
GameOverScene *gameOverScene = GameOverScene::create();
gameOverScene->getLayer()->getLabel()->setString("You Lose :[");
CCDirector::sharedDirector()->replaceScene(gameOverScene);
}
else if (sprite->getTag() == 3)
{
_projectiles->removeObject(sprite);
}
}
void SceneController::increaseKillCount()
{
int nProjectilesDestroyed = ((CCComAttribute*)(m_pOwner->getComponent("ComAttribute")))->getInt("KillCount");
CCComAttribute *p = (CCComAttribute*)(m_pOwner->getComponent("ComAttribute"));
p->setInt("KillCount", ++nProjectilesDestroyed);
if (nProjectilesDestroyed >= 5)
{
GameOverScene *gameOverScene = GameOverScene::create();
gameOverScene->getLayer()->getLabel()->setString("You Win!");
CCDirector::sharedDirector()->replaceScene(gameOverScene);
}
}

63
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/ComponentsTest/SceneController.h
View File

@ -1,63 +0,0 @@
/****************************************************************************
Copyright (c) 2010-2013 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __CC_SceneController_H__
#define __CC_SceneController_H__
#include "cocos2d.h"
#include "cocos-ext.h"
class SceneController : public cocos2d::extension::CCComController
{
protected:
SceneController(void);
virtual ~SceneController(void);
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
static SceneController* create(void);
public:
cocos2d::CCArray* getTargets() {return _targets;};
cocos2d::CCArray* getProjectiles() {return _projectiles;};
void spriteMoveFinished(cocos2d::CCNode* sender);
void increaseKillCount();
void addTarget();
float _fAddTargetTime;
float _fElapsedTime;
protected:
cocos2d::CCArray *_targets;
cocos2d::CCArray *_projectiles;
};
#endif // __FUNDATION__CCCOMPONENT_H__

26
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
View File

@ -1497,7 +1497,7 @@ TTFFontShadowAndStroke::TTFFontShadowAndStroke()
addChild(layer, -10);
CCSize s = CCDirector::sharedDirector()->getWinSize();
ccColor3B tintColorRed = { 255, 0, 0 };
ccColor3B tintColorYellow = { 255, 255, 0 };
ccColor3B tintColorBlue = { 0, 0, 255 };
@ -1506,9 +1506,6 @@ TTFFontShadowAndStroke::TTFFontShadowAndStroke()
CCSize shadowOffset(12.0, 12.0);
// create the label shadow only
CCLabelTTF* fontShadow = new CCLabelTTF();
ccFontDefinition shadowTextDef;
shadowTextDef.m_fontSize = 20;
shadowTextDef.m_fontName = std::string("Marker Felt");
@ -1519,17 +1516,16 @@ TTFFontShadowAndStroke::TTFFontShadowAndStroke()
shadowTextDef.m_shadow.m_shadowBlur = 1.0;
shadowTextDef.m_fontFillColor = tintColorRed;
fontShadow->initWithStringAndTextDefinition("Shadow Only Red Text", shadowTextDef);
// shadow only label
CCLabelTTF* fontShadow = CCLabelTTF::createWithFontDefinition("Shadow Only Red Text", shadowTextDef);
// add label to the scene
this->addChild(fontShadow);
fontShadow->setPosition(ccp(s.width/2,s.height/4*2.5));
// create the label stroke only
CCLabelTTF* fontStroke = new CCLabelTTF();
// create the stroke only label
ccFontDefinition strokeTextDef;
strokeTextDef.m_fontSize = 20;
strokeTextDef.m_fontName = std::string("Marker Felt");
@ -1540,7 +1536,8 @@ TTFFontShadowAndStroke::TTFFontShadowAndStroke()
strokeTextDef.m_fontFillColor = tintColorYellow;
fontStroke->initWithStringAndTextDefinition("Stroke Only Yellow Text", strokeTextDef);
// stroke only label
CCLabelTTF* fontStroke = CCLabelTTF::createWithFontDefinition("Stroke Only Yellow Text", strokeTextDef);
// add label to the scene
this->addChild(fontStroke);
@ -1549,8 +1546,6 @@ TTFFontShadowAndStroke::TTFFontShadowAndStroke()
// create the label stroke and shadow
CCLabelTTF* fontStrokeAndShadow = new CCLabelTTF();
ccFontDefinition strokeShaodwTextDef;
strokeShaodwTextDef.m_fontSize = 20;
strokeShaodwTextDef.m_fontName = std::string("Marker Felt");
@ -1566,13 +1561,16 @@ TTFFontShadowAndStroke::TTFFontShadowAndStroke()
strokeShaodwTextDef.m_fontFillColor = tintColorBlue;
fontStrokeAndShadow->initWithStringAndTextDefinition("Stroke & Shadow Blue Text", strokeShaodwTextDef);
// shadow + stroke label
CCLabelTTF* fontStrokeAndShadow = CCLabelTTF::createWithFontDefinition("Stroke & Shadow Blue Text", strokeShaodwTextDef);
// add label to the scene
this->addChild(fontStrokeAndShadow);
fontStrokeAndShadow->setPosition(ccp(s.width/2,s.height/4*1.1));
}
std::string TTFFontShadowAndStroke::title()

17
samples/Cpp/TestCpp/proj.blackberry/.cproject
View File

@ -95,8 +95,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Classes"/>
<entry excluding="Classes" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@ -193,7 +192,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@ -292,7 +291,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@ -391,8 +390,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Classes"/>
<entry excluding="Classes" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@ -488,7 +486,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@ -586,7 +584,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@ -684,8 +682,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Classes"/>
<entry excluding="Classes" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>

11
samples/Cpp/TestCpp/proj.blackberry/.project
View File

@ -32,7 +32,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/TestCpp/Device-Debug}</value>
<value>${workspace_loc:/TestCpp/Device-Release}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
@ -101,5 +101,14 @@
<arguments>1.0-name-matches-true-false-EditBoxTest</arguments>
</matcher>
</filter>
<filter>
<id>1370598020962</id>
<name>Classes/ExtensionsTest/NetworkTest</name>
<type>6</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-WebSocketTest*</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

90
samples/Lua/HelloLua/proj.blackberry/.cproject
View File

@ -42,6 +42,7 @@
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/tolua"/>
<listOptionValue builtIn="false" value="../../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.1299872702" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<inputType id="com.qnx.qcc.inputType.compiler.1174705489" superClass="com.qnx.qcc.inputType.compiler"/>
@ -58,6 +59,8 @@
<option id="com.qnx.qcc.option.linker.langcpp.670245200" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1760958269" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
<listOptionValue builtIn="false" value="GLESv2"/>
@ -68,6 +71,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -83,12 +87,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../extensions/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1363839882" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1363839882" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<option id="com.qnx.qcc.option.linker.qccoptions.1444329036" name="QCC Options" superClass="com.qnx.qcc.option.linker.qccoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.697035559" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@ -141,7 +143,6 @@
</option>
<option id="com.qnx.qcc.option.compiler.pie.456946828" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.includePath.1777714844" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -155,6 +156,7 @@
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/tolua"/>
<listOptionValue builtIn="false" value="../../../../../extensions"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.1481914218" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
@ -164,6 +166,8 @@
<tool id="com.qnx.qcc.tool.linker.1460295121" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.langcpp.1928031496" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1701813567" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -175,6 +179,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -190,12 +195,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../extensions/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.2141259757" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.2141259757" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.linker.1321710093" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -239,7 +242,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.2118671865" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -253,6 +255,7 @@
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/tolua"/>
<listOptionValue builtIn="false" value="../../../../../extensions"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.949042507" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
@ -265,6 +268,8 @@
<option id="com.qnx.qcc.option.linker.profile2.1064338465" name="Build for Profiling (Function Instrumentation) (-lprofiling)" superClass="com.qnx.qcc.option.linker.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1232550377" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1289108024" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -276,6 +281,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -290,12 +296,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../extensions/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1370019185" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1370019185" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.linker.1078171597" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -339,7 +343,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1766273669" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -353,6 +356,7 @@
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/tolua"/>
<listOptionValue builtIn="false" value="../../../../../extensions"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.901688047" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
@ -365,6 +369,8 @@
<option id="com.qnx.qcc.option.linker.coverage.390406687" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1160718760" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1736864271" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -376,6 +382,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -390,12 +397,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../extensions/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.619637072" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.619637072" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.linker.1438498440" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -437,7 +442,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1838736665" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -451,6 +455,7 @@
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/tolua"/>
<listOptionValue builtIn="false" value="../../../../../extensions"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.1997773972" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
@ -462,6 +467,8 @@
<option id="com.qnx.qcc.option.linker.debug.1155728719" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.550638471" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1179286572" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -473,6 +480,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -487,13 +495,11 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../extensions/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}"/>
</option>
<option id="com.qnx.qcc.option.linker.objectFiles.1451516298" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
<option id="com.qnx.qcc.option.linker.ldoptions.526534847" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.526534847" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.linker.439307041" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -536,7 +542,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1315014042" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -550,6 +555,7 @@
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/tolua"/>
<listOptionValue builtIn="false" value="../../../../../extensions"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.1682829736" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
@ -562,6 +568,8 @@
<option id="com.qnx.qcc.option.linker.profile2.1569002848" name="Build for Profiling (Function Instrumentation) (-lprofiling)" superClass="com.qnx.qcc.option.linker.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1840561937" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1031790004" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -573,6 +581,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -587,12 +596,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../extensions/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.536840311" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.536840311" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.linker.2044213175" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -635,7 +642,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1142643875" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -649,6 +655,7 @@
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/tolua"/>
<listOptionValue builtIn="false" value="../../../../../extensions"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.616747785" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
@ -661,6 +668,8 @@
<option id="com.qnx.qcc.option.linker.coverage.1881413807" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.769428310" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1325336223" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -672,6 +681,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -686,12 +696,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../extensions/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.259366688" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.259366688" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.linker.780133405" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>

190
samples/Lua/HelloLua/proj.blackberry/.project
View File

@ -1,97 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>HelloLua</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
<project>CocosDenshion</project>
<project>lua</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/HelloLua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
<link>
<name>cocos2dx_support</name>
<type>2</type>
<locationURI>PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support</locationURI>
</link>
</linkedResources>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>HelloLua</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
<project>CocosDenshion</project>
<project>extensions</project>
<project>lua</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/HelloLua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
</linkedResources>
</projectDescription>

1
samples/Lua/TestLua/Classes/AppDelegate.cpp
View File

@ -51,6 +51,7 @@ bool AppDelegate::applicationDidFinishLaunching()
#if CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY
searchPaths.push_back("TestCppResources");
searchPaths.push_back("script");
#endif
CCFileUtils::sharedFileUtils()->setSearchPaths(searchPaths);

16
samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua
View File

@ -10,7 +10,6 @@ local ExtensionTestEnum =
TEST_CCCONTROLBUTTON = 1,
TEST_COCOSBUILDER = 2,
TEST_WEBSOCKET = 3,
--TRAGET_PLATFORM
TEST_EDITBOX = 4,
TEST_TABLEVIEW = 5,
TEST_MAX_COUNT = 6,
@ -1030,16 +1029,23 @@ local function ExtensionsMainLayer()
CCMenuItemFont:setFontName("Arial")
CCMenuItemFont:setFontSize(24)
local targetPlatform = CCApplication:sharedApplication():getTargetPlatform()
local bSupportWebSocket = true
if (kTargetIphone ~= targetPlatform) and (kTargetIpad ~= targetPlatform) and (kTargetAndroid ~= targetPlatform) and (kTargetWindows ~= targetPlatform) then
bSupportWebSocket = false
local bSupportWebSocket = false
if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or (kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) then
bSupportWebSocket = true
end
local bSupportEdit = false
if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or
(kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) or
(kTargetMacOS == targetPlatform) or (kTargetTizen == targetPlatform) then
bSupportEdit = true
end
for i = 1, ExtensionTestEnum.TEST_MAX_COUNT do
local item = CCMenuItemFont:create(testsName[i])
item:registerScriptTapHandler(menuCallback)
item:setPosition(s.width / 2, s.height - i * LINE_SPACE)
menu:addChild(item, kItemTagBasic + i)
if (i == ExtensionTestEnum.TEST_WEBSOCKET + 1) and false == bSupportWebSocket then
if ((i == ExtensionTestEnum.TEST_WEBSOCKET + 1) and (false == bSupportWebSocket))
or ((i == ExtensionTestEnum.TEST_EDITBOX + 1) and (false == bSupportEdit)) then
item:setEnabled(false)
end
end

83
samples/Lua/TestLua/proj.blackberry/.cproject
View File

@ -58,6 +58,8 @@
<option id="com.qnx.qcc.option.linker.langcpp.670245200" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1760958269" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
<listOptionValue builtIn="false" value="GLESv2"/>
@ -68,6 +70,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -83,12 +86,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1363839882" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1363839882" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<option id="com.qnx.qcc.option.linker.qccoptions.1444329036" name="QCC Options" superClass="com.qnx.qcc.option.linker.qccoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.697035559" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@ -156,7 +157,6 @@
</option>
<option id="com.qnx.qcc.option.compiler.pie.456946828" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.includePath.1777714844" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -179,6 +179,8 @@
<tool id="com.qnx.qcc.tool.linker.1460295121" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.langcpp.1928031496" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1701813567" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -190,6 +192,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -205,12 +208,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.2141259757" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.2141259757" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.1321710093" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -254,7 +255,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.2118671865" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -280,6 +280,8 @@
<option id="com.qnx.qcc.option.linker.profile2.1064338465" name="Build for Profiling (Function Instrumentation) (-lprofiling)" superClass="com.qnx.qcc.option.linker.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1232550377" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1289108024" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -291,6 +293,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -305,12 +308,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1370019185" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1370019185" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.1078171597" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -354,7 +355,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1766273669" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -380,6 +380,8 @@
<option id="com.qnx.qcc.option.linker.coverage.390406687" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1160718760" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1736864271" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -391,6 +393,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -405,12 +408,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.619637072" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.619637072" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.1438498440" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -452,7 +453,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1838736665" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -477,6 +477,8 @@
<option id="com.qnx.qcc.option.linker.debug.1155728719" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.550638471" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1179286572" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -488,6 +490,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -502,13 +505,11 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.objectFiles.1451516298" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
<option id="com.qnx.qcc.option.linker.ldoptions.526534847" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.526534847" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.439307041" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -551,7 +552,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1315014042" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -577,6 +577,8 @@
<option id="com.qnx.qcc.option.linker.profile2.1569002848" name="Build for Profiling (Function Instrumentation) (-lprofiling)" superClass="com.qnx.qcc.option.linker.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1840561937" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1031790004" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -588,6 +590,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -602,12 +605,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.536840311" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.536840311" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.2044213175" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -650,7 +651,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1142643875" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -676,6 +676,8 @@
<option id="com.qnx.qcc.option.linker.coverage.1881413807" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.769428310" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1325336223" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -687,6 +689,7 @@
<listOptionValue builtIn="false" value="jpeg"/>
<listOptionValue builtIn="false" value="png"/>
<listOptionValue builtIn="false" value="freetype"/>
<listOptionValue builtIn="false" value="webp"/>
<listOptionValue builtIn="false" value="screen"/>
<listOptionValue builtIn="false" value="alut"/>
<listOptionValue builtIn="false" value="OpenAL"/>
@ -701,12 +704,10 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.259366688" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}/libwebp.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.259366688" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.780133405" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>

189
samples/Lua/TestLua/proj.blackberry/.project
View File

@ -1,97 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>TestLua</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
<project>CocosDenshion</project>
<project>lua</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/TestLua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
<link>
<name>cocos2dx_support</name>
<type>2</type>
<locationURI>PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support</locationURI>
</link>
</linkedResources>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>TestLua</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
<project>CocosDenshion</project>
<project>lua</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/TestLua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
</linkedResources>
</projectDescription>

1
samples/Lua/TestLua/proj.blackberry/bar-descriptor.xml
View File

@ -55,6 +55,7 @@
<!-- the variable 'worksparce_loc' is not supported in bbndk2.0, so we create an empty folder to make the relative path work. -->
<asset path="../Resources">Resources</asset>
<asset path="../../../Cpp/TestCpp/Resources">Resources/TestCppResources</asset>
<asset path="../../../../scripting/lua/script">Resources/script</asset>
<!-- the path of the three shared libraries as follows in bbndk2.0 is different from bbndk1.0, so if the version of bbndk you use is 1.0, just uncomment the next three lines and comment the following three lines-->

13
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
View File

@ -62,7 +62,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@ -79,7 +79,7 @@
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;pthreadVCE2.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<Culture>0x0409</Culture>
@ -100,13 +100,13 @@
</Midl>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
xcopy "$(ProjectDir)..\..\..\..\scripting\Lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y</Command>
xcopy "$(ProjectDir)..\..\..\..\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y</Command>
<Message>copy files from TestCpp to TestLua</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@ -122,7 +122,7 @@ xcopy "$(ProjectDir)..\..\..\..\scripting\Lua\script" "$(ProjectDir)..\..\TestLu
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;pthreadVCE2.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<Culture>0x0409</Culture>
@ -142,7 +142,8 @@ xcopy "$(ProjectDir)..\..\..\..\scripting\Lua\script" "$(ProjectDir)..\..\TestLu
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y</Command>
<Command>xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
xcopy "$(ProjectDir)..\..\..\..\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y</Command>
<Message>copy files from TestCpp to TestLua</Message>
</PreBuildEvent>
</ItemDefinitionGroup>

2
scripting/javascript/bindings/generated

@ -1 +1 @@
Subproject commit 871631edc5df8489cb3e781deda7f7c77dd5b7c6
Subproject commit b95d4cd6f0d8533a7b310a5470473025799a8f30

52
scripting/lua/cocos2dx_support/CCBProxy.cpp
View File

@ -59,6 +59,14 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return NULL;
}
if (NULL != dynamic_cast<CCLabelTTF*>(pNode)) {
return "CCLabelTTF";
}
if (NULL != dynamic_cast<CCLabelBMFont*>(pNode)) {
return "CCLabelBMFont";
}
if (NULL != dynamic_cast<CCSprite*>(pNode)) {
return "CCSprite";
}
@ -67,42 +75,22 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return "CCControlButton";
}
if (NULL != dynamic_cast<CCLayer*>(pNode)) {
return "CCLayer";
if (NULL != dynamic_cast<CCLayerGradient*>(pNode)) {
return "CCLayerGradient";
}
if (NULL != dynamic_cast<CCLayerColor*>(pNode)) {
return "CCLayerColor";
}
if (NULL != dynamic_cast<CCLayerGradient*>(pNode)) {
return "CCLayerGradient";
}
if (NULL != dynamic_cast<CCScale9Sprite*>(pNode)) {
return "CCLayerGradient";
}
if (NULL != dynamic_cast<CCLabelTTF*>(pNode)) {
return "CCLabelTTF";
}
if (NULL != dynamic_cast<CCLabelBMFont*>(pNode)) {
return "CCLabelBMFont";
}
if (NULL != dynamic_cast<CCMenu*>(pNode)) {
return "CCMenu";
}
if (NULL != dynamic_cast<CCMenuItem*>(pNode)) {
return "CCMenuItem";
}
if (NULL != dynamic_cast<CCMenuItemLabel*>(pNode)) {
return "CCMenuItemLabel";
}
if (NULL != dynamic_cast<CCMenuItemAtlasFont*>(pNode)) {
return "CCMenuItemAtlasFont";
}
@ -111,8 +99,8 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return "CCMenuItemFont";
}
if (NULL != dynamic_cast<CCMenuItemSprite*>(pNode)) {
return "CCMenuItemSprite";
if (NULL != dynamic_cast<CCMenuItemLabel*>(pNode)) {
return "CCMenuItemLabel";
}
if (NULL != dynamic_cast<CCMenuItemImage*>(pNode)) {
@ -123,6 +111,18 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return "CCMenuItemToggle";
}
if (NULL != dynamic_cast<CCMenuItemSprite*>(pNode)) {
return "CCMenuItemSprite";
}
if (NULL != dynamic_cast<CCMenuItem*>(pNode)) {
return "CCMenuItem";
}
if (NULL != dynamic_cast<CCLayer*>(pNode)) {
return "CCLayer";
}
if (NULL != dynamic_cast<CCString*>(pNode)) {
return "CCString";
}
@ -140,14 +140,14 @@ void CCBProxy::setCallback(CCNode* pNode,int nHandle)
return;
}
if (strcmp(this->getNodeTypeName(pNode), "CCMenuItem") == 0)
if (NULL != dynamic_cast<CCMenuItem*>(pNode))
{
CCMenuItem *pMenuItem = dynamic_cast<CCMenuItem*>(pNode);
if (NULL != pMenuItem) {
pMenuItem->registerScriptTapHandler(nHandle);
}
}
else if (strcmp(this->getNodeTypeName(pNode), "CCControlButton") == 0)
else if (NULL != dynamic_cast<CCControlButton*>(pNode))
{
CCControlButton *pBtnItem = dynamic_cast<CCControlButton*>(pNode);
if (NULL != pBtnItem) {

1
scripting/lua/cocos2dx_support/Lua_web_socket.cpp
View File

@ -148,7 +148,6 @@ public:
int nHandler = luaWs->getScriptHandler(LuaWebSocket::kWebSocketScriptHandlerClose);
if (-1 != nHandler) {
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeEvent(nHandler,"");
CC_SAFE_DELETE(ws);
}
}
}

63
scripting/lua/proj.blackberry/.cproject
View File

@ -46,7 +46,15 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../lua"/>
<listOptionValue builtIn="false" value="../../tolua"/>
<listOptionValue builtIn="false" value="../../third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/blackberry"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.1372558930" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<option id="com.qnx.qcc.option.compiler.optlevel.1056360362" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
@ -87,6 +95,7 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tolua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocos2dx_support"/>
</sourceEntries>
</configuration>
</storageModule>
@ -124,7 +133,15 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../lua"/>
<listOptionValue builtIn="false" value="../../tolua"/>
<listOptionValue builtIn="false" value="../../third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/blackberry"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.1936049270" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<inputType id="com.qnx.qcc.inputType.compiler.82187465" superClass="com.qnx.qcc.inputType.compiler"/>
@ -154,6 +171,7 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tolua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocos2dx_support"/>
</sourceEntries>
</configuration>
</storageModule>
@ -192,7 +210,15 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../lua"/>
<listOptionValue builtIn="false" value="../../tolua"/>
<listOptionValue builtIn="false" value="../../third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/blackberry"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.584937839" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<option id="com.qnx.qcc.option.compiler.optlevel.914759768" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
@ -226,6 +252,7 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tolua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocos2dx_support"/>
</sourceEntries>
</configuration>
</storageModule>
@ -264,7 +291,15 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../lua"/>
<listOptionValue builtIn="false" value="../../tolua"/>
<listOptionValue builtIn="false" value="../../third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/blackberry"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.1106404059" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<option id="com.qnx.qcc.option.compiler.optlevel.212006056" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
@ -298,6 +333,7 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tolua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocos2dx_support"/>
</sourceEntries>
</configuration>
</storageModule>
@ -334,7 +370,15 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../lua"/>
<listOptionValue builtIn="false" value="../../tolua"/>
<listOptionValue builtIn="false" value="../../third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/blackberry"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.641179327" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<option id="com.qnx.qcc.option.compiler.optlevel.302138215" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
@ -367,6 +411,7 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tolua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocos2dx_support"/>
</sourceEntries>
</configuration>
</storageModule>
@ -406,7 +451,15 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../lua"/>
<listOptionValue builtIn="false" value="../../tolua"/>
<listOptionValue builtIn="false" value="../../third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/blackberry"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.151407782" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<option id="com.qnx.qcc.option.compiler.optlevel.1527970638" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
@ -440,6 +493,7 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tolua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocos2dx_support"/>
</sourceEntries>
</configuration>
</storageModule>
@ -477,7 +531,15 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../lua"/>
<listOptionValue builtIn="false" value="../../tolua"/>
<listOptionValue builtIn="false" value="../../third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/blackberry"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/include"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../extensions"/>
</option>
<option id="com.qnx.qcc.option.compiler.qccoptions.1555108705" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
<option id="com.qnx.qcc.option.compiler.optlevel.495924247" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
@ -511,6 +573,7 @@
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tolua"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocos2dx_support"/>
</sourceEntries>
</configuration>
</storageModule>

202
scripting/lua/proj.blackberry/.project
View File

@ -1,93 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>lua</name>
<comment></comment>
<projects>
</projects>
<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\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
</dictionary>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/lua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>lua</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/lua</locationURI>
</link>
<link>
<name>tolua</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/tolua</locationURI>
</link>
</linkedResources>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>lua</name>
<comment></comment>
<projects>
</projects>
<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\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
</dictionary>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/lua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>cocos2dx_support</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/cocos2dx_support</locationURI>
</link>
<link>
<name>lua</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/lua</locationURI>
</link>
<link>
<name>tolua</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/tolua</locationURI>
</link>
</linkedResources>
<filteredResources>
<filter>
<id>1370598666794</id>
<name>cocos2dx_support</name>
<type>10</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-platform</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

6
scripting/lua/proj.win32/liblua.vcxproj
View File

@ -63,7 +63,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;$(ProjectDir)..\..\..\extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\extensions\network;$(ProjectDir)..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -94,7 +94,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"</Command>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\extensions\network;$(ProjectDir)..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -129,6 +129,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"</Command>
<ClCompile Include="..\cocos2dx_support\Cocos2dxLuaLoader.cpp" />
<ClCompile Include="..\cocos2dx_support\LuaCocos2d.cpp" />
<ClCompile Include="..\cocos2dx_support\Lua_extensions_CCB.cpp" />
<ClCompile Include="..\cocos2dx_support\Lua_web_socket.cpp" />
<ClCompile Include="..\cocos2dx_support\tolua_fix.c" />
<ClCompile Include="..\tolua\tolua_event.c" />
<ClCompile Include="..\tolua\tolua_is.c" />
@ -145,6 +146,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"</Command>
<ClInclude Include="..\cocos2dx_support\Cocos2dxLuaLoader.h" />
<ClInclude Include="..\cocos2dx_support\LuaCocos2d.h" />
<ClInclude Include="..\cocos2dx_support\Lua_extensions_CCB.h" />
<ClInclude Include="..\cocos2dx_support\Lua_web_socket.h" />
<ClInclude Include="..\cocos2dx_support\tolua_fix.h" />
<ClInclude Include="..\luajit\include\lauxlib.h" />
<ClInclude Include="..\luajit\include\lua.h" />

6
scripting/lua/proj.win32/liblua.vcxproj.filters
View File

@ -57,6 +57,9 @@
<ClCompile Include="..\cocos2dx_support\CCBProxy.cpp">
<Filter>cocos2dx_support</Filter>
</ClCompile>
<ClCompile Include="..\cocos2dx_support\Lua_web_socket.cpp">
<Filter>cocos2dx_support</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\tolua\tolua++.h">
@ -104,5 +107,8 @@
<ClInclude Include="..\cocos2dx_support\CCBProxy.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
<ClInclude Include="..\cocos2dx_support\Lua_web_socket.h">
<Filter>cocos2dx_support</Filter>
</ClInclude>
</ItemGroup>
</Project>

70
template/multi-platform-lua/proj.blackberry/.cproject
View File

@ -28,7 +28,6 @@
<listOptionValue builtIn="false" value="COCOS2D_DEBUG=1"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.892081154" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -57,6 +56,8 @@
<option id="com.qnx.qcc.option.linker.debug.2017324338" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.670245200" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1760958269" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -84,11 +85,10 @@
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1363839882" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1363839882" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<option id="com.qnx.qcc.option.linker.qccoptions.1444329036" name="QCC Options" superClass="com.qnx.qcc.option.linker.qccoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.697035559" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@ -156,7 +156,6 @@
</option>
<option id="com.qnx.qcc.option.compiler.pie.456946828" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.includePath.1777714844" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -179,6 +178,8 @@
<tool id="com.qnx.qcc.tool.linker.1460295121" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.langcpp.1928031496" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1701813567" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -206,11 +207,10 @@
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.2141259757" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.2141259757" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.1321710093" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -254,7 +254,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.2118671865" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -280,6 +279,8 @@
<option id="com.qnx.qcc.option.linker.profile2.1064338465" name="Build for Profiling (Function Instrumentation) (-lprofiling)" superClass="com.qnx.qcc.option.linker.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1232550377" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1289108024" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -306,11 +307,10 @@
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1370019185" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.1370019185" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.1078171597" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -354,7 +354,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1766273669" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -380,6 +379,8 @@
<option id="com.qnx.qcc.option.linker.coverage.390406687" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1160718760" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1736864271" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -406,11 +407,10 @@
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.619637072" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.619637072" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.1438498440" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -453,7 +453,6 @@
<listOptionValue builtIn="false" value="COCOS2D_DEBUG=1"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1838736665" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -478,6 +477,8 @@
<option id="com.qnx.qcc.option.linker.debug.1155728719" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.550638471" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1179286572" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -504,12 +505,11 @@
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.objectFiles.1451516298" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
<option id="com.qnx.qcc.option.linker.ldoptions.526534847" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.526534847" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.439307041" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -552,7 +552,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1315014042" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -578,6 +577,8 @@
<option id="com.qnx.qcc.option.linker.profile2.1569002848" name="Build for Profiling (Function Instrumentation) (-lprofiling)" superClass="com.qnx.qcc.option.linker.profile2" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1840561937" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1031790004" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -604,11 +605,10 @@
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.536840311" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.536840311" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.2044213175" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -651,7 +651,6 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1142643875" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cocos2dx}&quot;"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="../../Classes"/>
@ -677,6 +676,8 @@
<option id="com.qnx.qcc.option.linker.coverage.1881413807" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.769428310" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1325336223" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="lua"/>
<listOptionValue builtIn="false" value="extensions"/>
<listOptionValue builtIn="false" value="cocos2dx"/>
<listOptionValue builtIn="false" value="CocosDenshion"/>
<listOptionValue builtIn="false" value="EGL"/>
@ -703,11 +704,10 @@
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/blackberry/libraries/${CPUVARDIR}"/>
<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.blackberry/${ConfigName}"/>
<listOptionValue builtIn="false" value="&quot;../../../../extensions/proj.blackberry/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../scripting/lua/proj.blackberry/${ConfigName}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.259366688" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions" valueType="stringList">
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.blackberry/${ConfigName}/libcocos2dx.a"/>
<listOptionValue builtIn="false" value="../../../../scripting/lua/proj.blackberry/${ConfigName}/liblua.a"/>
</option>
<option id="com.qnx.qcc.option.linker.ldoptions.259366688" name="Linker Options (-Wl,)" superClass="com.qnx.qcc.option.linker.ldoptions"/>
<inputType id="com.qnx.qcc.inputType.linker.780133405" superClass="com.qnx.qcc.inputType.linker">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>

190
template/multi-platform-lua/proj.blackberry/.project
View File

@ -1,97 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>HelloLua</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
<project>CocosDenshion</project>
<project>lua</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/HelloLua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
<link>
<name>cocos2dx_support</name>
<type>2</type>
<locationURI>PARENT-3-PROJECT_LOC/scripting/lua/cocos2dx_support</locationURI>
</link>
</linkedResources>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>HelloLua</name>
<comment></comment>
<projects>
<project>cocos2dx</project>
<project>CocosDenshion</project>
<project>extensions</project>
<project>lua</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/HelloLua/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
<linkedResources>
<link>
<name>Classes</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Classes</locationURI>
</link>
<link>
<name>Resources</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
</link>
</linkedResources>
</projectDescription>