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

Merge pull request #738 from dumganhar/iss994_bbndk2.0 

fixed #994: add support for bbndk2.0 on blackberry platform.
This commit is contained in:
James Chen 2012-03-01 01:09:01 -08:00
parent 2acd80bb73 dfd5adb3bd
commit c74006c5fd
10 changed files with 70 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
HelloWorld/qnx/bar-descriptor.xml
View File

@ -51,51 +51,63 @@
<!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
<asset path="icon.png">icon.png</asset>
<asset path="${workspace_loc:/HelloWorld/Resources}">Resources</asset>
<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libbps.so" type="Qnx/Elf">lib/libbps.so.1</asset>
<asset path="${QNX_TARGET}\..\target-override\${CPUVARDIR}/usr/lib/libOpenAL.so" type="Qnx/Elf">lib/libOpenAL.so.1</asset>
<asset path="${QNX_TARGET}\..\target-override\${CPUVARDIR}/usr/lib/libalut.so" type="Qnx/Elf">lib/libalut.so.1</asset>
<!-- the variable 'worksparce_loc' is not supported in bbndk2.0, so we create an empty folder to make the relative path work. -->
<asset path="empty/../../../HelloWorld/Resources">Resources</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-->
<!-- used for bbndk1.0 -->
<!--<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libbps.so" type="Qnx/Elf">lib/libbps.so.1</asset>-->
<!--<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libOpenAL.so" type="Qnx/Elf">lib/libOpenAL.so.1</asset>-->
<!--<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libalut.so" type="Qnx/Elf">lib/libalut.so.1</asset>-->
<!-- used for bbndk2.0 -->
<asset path="${QNX_TARGET}/${CPUVARDIR}/usr/lib/libbps.so" type="Qnx/Elf">lib/libbps.so.1</asset>
<asset path="${QNX_TARGET}/${CPUVARDIR}/usr/lib/libOpenAL.so" type="Qnx/Elf">lib/libOpenAL.so.1</asset>
<asset path="${QNX_TARGET}/${CPUVARDIR}/usr/lib/libalut.so" type="Qnx/Elf">lib/libalut.so.1</asset>
<configuration id="com.qnx.qcc.configuration.exe.debug.446234419" name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Debug/HelloWorld" entry="true" type="Qnx/Elf">HelloWorld</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Debug/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Debug/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.release.1265921422" name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Release/HelloWorld" entry="true" type="Qnx/Elf">HelloWorld</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Release/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Release/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.1761000041" name="Device-Profile">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Profile/HelloWorld" entry="true" type="Qnx/Elf">HelloWorld</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Profile/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Profile/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.coverage.1771167181" name="Device-Coverage">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/HelloWorld" entry="true" type="Qnx/Elf">HelloWorld</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Coverage/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Coverage/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.debug.660208940" name="Simulator">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator/HelloWorld" entry="true" type="Qnx/Elf">HelloWorld</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Simulator/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Simulator/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.1237484173" name="Simulator-Profile">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Profile/HelloWorld" entry="true" type="Qnx/Elf">HelloWorld</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Simulator-Profile/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Simulator-Profile/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.coverage.181538713" name="Simulator-Coverage">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Coverage/HelloWorld" entry="true" type="Qnx/Elf">HelloWorld</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Simulator-Coverage/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Simulator-Coverage/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<!-- The icon for the application, which should be 86x86. -->

0
HelloWorld/qnx/empty/empty Normal file
View File

2
cocos2dx/platform/android/CCEGLView_android.h
View File

@ -63,7 +63,7 @@ public:
float getScreenScaleFactor();
void setIMEKeyboardState(bool bOpen);
float getMainScreenScale() { return -1.0; }
float getMainScreenScale() { return -1.0f; }
// static function
/**

2
cocos2dx/platform/bada/CCEGLView_bada.h
View File

@ -72,7 +72,7 @@ public:
*/
static CCEGLView& sharedOpenGLView();
float getMainScreenScale() { return -1.0; }
float getMainScreenScale() { return -1.0f; }
/*
* param

2
cocos2dx/platform/linux/CCEGLView_linux.h
View File

@ -48,7 +48,7 @@ public:
void setViewPortInPoints(float x, float y, float w, float h);
void setScissorInPoints(float x, float y, float w, float h);
float getMainScreenScale() { return -1.0; }
float getMainScreenScale() { return 1.0f; }
void setIMEKeyboardState(bool bOpen);

2
cocos2dx/platform/marmalade/CCEGLView_marmalade.h
View File

@ -68,7 +68,7 @@ public:
CCRect getViewPort();
float getScreenScaleFactor();
float getMainScreenScale() { return -1.0; }
float getMainScreenScale() { return 1.0f; }
// static function
/**

2
cocos2dx/platform/qnx/CCEGLView_qnx.h
View File

@ -67,7 +67,7 @@ public:
float getScreenScaleFactor();
void setIMEKeyboardState(bool bOpen);
float getMainScreenScale() { return 1.0 };
float getMainScreenScale() { return 1.0f; }
bool HandleEvents();

2
cocos2dx/platform/win32/CCEGLView_win32.h
View File

@ -53,7 +53,7 @@ public:
bool canSetContentScaleFactor();
void setContentScaleFactor(float contentScaleFactor);
float getMainScreenScale() { return -1.0; }
float getMainScreenScale() { return 1.0f; }
virtual bool Create(LPCTSTR pTitle, int w, int h);
virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);

49
tests/test.qnx/bar-descriptor.xml
View File

@ -48,51 +48,64 @@
<!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
<asset path="icon.png">icon.png</asset>
<asset path="${workspace_loc:/TestCocos2dx/Resources}">Resources</asset>
<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libbps.so" type="Qnx/Elf">lib/libbps.so.1</asset>
<asset path="${QNX_TARGET}\..\target-override\${CPUVARDIR}/usr/lib/libOpenAL.so" type="Qnx/Elf">lib/libOpenAL.so.1</asset>
<asset path="${QNX_TARGET}\..\target-override\${CPUVARDIR}/usr/lib/libalut.so" type="Qnx/Elf">lib/libalut.so.1</asset>
<!-- the variable 'worksparce_loc' is not supported in bbndk2.0, so we create an empty folder to make the relative path work. -->
<asset path="empty/../../../tests/Resources">Resources</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-->
<!-- used for bbndk1.0 -->
<!--<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libbps.so" type="Qnx/Elf">lib/libbps.so.1</asset>-->
<!--<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libOpenAL.so" type="Qnx/Elf">lib/libOpenAL.so.1</asset>-->
<!--<asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libalut.so" type="Qnx/Elf">lib/libalut.so.1</asset>-->
<!-- used for bbndk2.0 -->
<asset path="${QNX_TARGET}/${CPUVARDIR}/usr/lib/libbps.so" type="Qnx/Elf">lib/libbps.so.1</asset>
<asset path="${QNX_TARGET}/${CPUVARDIR}/usr/lib/libOpenAL.so" type="Qnx/Elf">lib/libOpenAL.so.1</asset>
<asset path="${QNX_TARGET}/${CPUVARDIR}/usr/lib/libalut.so" type="Qnx/Elf">lib/libalut.so.1</asset>
<configuration id="com.qnx.qcc.configuration.exe.debug.2142540956" name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Debug/TestCocos2dx" entry="true" type="Qnx/Elf">TestCocos2dx</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Debug/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Debug/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.release.1185536621" name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Release/TestCocos2dx" entry="true" type="Qnx/Elf">TestCocos2dx</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Release/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Release/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.1563929245" name="Device-Profile">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Profile/TestCocos2dx" entry="true" type="Qnx/Elf">TestCocos2dx</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Profile/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Profile/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.coverage.2091050949" name="Device-Coverage">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/TestCocos2dx" entry="true" type="Qnx/Elf">TestCocos2dx</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Device-Coverage/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/armle-v7/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Device-Coverage/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.debug.538064218" name="Simulator">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator/TestCocos2dx" entry="true" type="Qnx/Elf">TestCocos2dx</asset>
<asset path="${workspace_loc:/CocosDenshion/Simulator/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Simulator/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.808507225" name="Simulator-Profile">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Profile/TestCocos2dx" entry="true" type="Qnx/Elf">TestCocos2dx</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Simulator-Profile/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Simulator-Profile/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.coverage.78763272" name="Simulator-Coverage">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Coverage/TestCocos2dx" entry="true" type="Qnx/Elf">TestCocos2dx</asset>
<asset path="${workspace_loc:/cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so}" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="${workspace_loc:/CocosDenshion/Simulator-Coverage/libCocosDenshion.so}" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
<asset path="empty/../../../cocos2dx/platform/third_party/qnx/libraries/x86/libgrskia.so" type="Qnx/Elf">lib/libgrskia.so</asset>
<asset path="empty/../../../CocosDenshion/proj.qnx/Simulator-Coverage/libCocosDenshion.so" type="Qnx/Elf">lib/libCocosDenshion.so</asset>
</configuration>
<!-- The icon for the application, which should be 86x86. -->

0
tests/test.qnx/empty/empty Normal file
View File