Skip to content

Commit

Permalink
update bada and qnx project settings
Browse files Browse the repository at this point in the history
  • Loading branch information
James Chen committed Feb 15, 2012
1 parent 8b9c01b commit b377861
Show file tree
Hide file tree
Showing 41 changed files with 602 additions and 494 deletions.
2 changes: 1 addition & 1 deletion Box2D/proj.bada/sdk1.0/.badaprj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<bada>
<type>0</type>
<sdk>C:\bada\1.0.0</sdk>
<sdk>E:\bada\1.0.0</sdk>
<model>Wave_LP2</model>
<properties/>
</bada>
2 changes: 1 addition & 1 deletion Box2D/proj.bada/sdk2.0/.badaprj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<bada>
<type>0</type>
<sdk>E:\bada\2.0.2</sdk>
<sdk>E:\bada\2.0.4</sdk>
<model>WaveWVGA</model>
<apiversioncheck>true</apiversioncheck>
<priviligecheck>false</priviligecheck>
Expand Down
2 changes: 1 addition & 1 deletion CocosDenshion/proj.bada/sdk1.0/.badaprj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<bada>
<type>0</type>
<sdk>C:\bada\1.0.0</sdk>
<sdk>E:\bada\1.0.0</sdk>
<model>Wave_LP2</model>
<properties/>
</bada>
2 changes: 1 addition & 1 deletion CocosDenshion/proj.bada/sdk2.0/.badaprj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<bada>
<type>0</type>
<sdk>E:\bada\2.0.2</sdk>
<sdk>E:\bada\2.0.4</sdk>
<model>WaveWVGA</model>
<apiversioncheck>true</apiversioncheck>
<priviligecheck>false</priviligecheck>
Expand Down
67 changes: 53 additions & 14 deletions CocosDenshion/proj.qnx/.cproject

Large diffs are not rendered by default.

186 changes: 93 additions & 93 deletions CocosDenshion/proj.qnx/.project
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>CocosDenshion</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:/CocosDenshion/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>include</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/include</locationURI>
</link>
<link>
<name>qnx</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/qnx</locationURI>
</link>
</linkedResources>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>CocosDenshion</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:/CocosDenshion/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>include</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/include</locationURI>
</link>
<link>
<name>qnx</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/qnx</locationURI>
</link>
</linkedResources>
</projectDescription>
Binary file modified CocosDenshion/third_party/qnx/libraries/armle-v7/libvorbis.a
Binary file not shown.
Binary file modified CocosDenshion/third_party/qnx/libraries/x86/libvorbis.a
Binary file not shown.
6 changes: 3 additions & 3 deletions HelloWorld/Classes/AppDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ bool AppDelegate::initInstance() {
CC_BREAK_IF(! pMainWnd
|| ! pMainWnd->Create("cocos2d: Hello World", 480, 320 ,480, 320));

CCFileUtils::setResourcePath("../Resource/");
CCFileUtils::setResourcePath("../Resources/");

#endif // CC_PLATFORM_LINUX

Expand All @@ -81,8 +81,8 @@ bool AppDelegate::initInstance() {

#if (CC_TARGET_PLATFORM == CC_PLATFORM_QNX)
CCEGLView * pMainWnd = new CCEGLView();
CC_BREAK_IF(! pMainWnd|| ! pMainWnd->Create(480, 320));
CCFileUtils::setResourcePath("./app/native/Resource");
CC_BREAK_IF(! pMainWnd|| ! pMainWnd->Create(1024, 600));
CCFileUtils::setResourcePath("app/native/Resources");
#endif // CC_PLATFORM_QNX
bRet = true;
} while (0);
Expand Down
2 changes: 1 addition & 1 deletion HelloWorld/bada/sdk1.0/.badaprj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<bada>
<type>0</type>
<sdk>C:\bada\1.0.0</sdk>
<sdk>E:\bada\1.0.0</sdk>
<model>Wave_LP2</model>
<properties/>
</bada>
2 changes: 1 addition & 1 deletion HelloWorld/bada/sdk2.0/.badaprj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<bada>
<type>0</type>
<sdk>E:\bada\2.0.2</sdk>
<sdk>E:\bada\2.0.4</sdk>
<model>WaveWVGA</model>
<apiversioncheck>true</apiversioncheck>
<priviligecheck>false</priviligecheck>
Expand Down
4 changes: 2 additions & 2 deletions HelloWorld/bada/sdk2.0/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Debug\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Debug\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (xcopy /y /s ..\..\Resource\*.* Res)">
<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Debug\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Debug\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (xcopy /y /s ..\..\Resources\*.* Res)">
<folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug.2127488964" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug.1117105675" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug"/>
Expand Down Expand Up @@ -709,7 +709,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.exe.release" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Release\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Release\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (xcopy /y /s ..\..\Resource\*.* Res)">
<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.exe.release" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Release\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Release\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (xcopy /y /s ..\..\Resources\*.* Res)">
<folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.target.exe.release.641425882" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.target.exe.release">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.release.1305983074" name="Release Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.release"/>
Expand Down
2 changes: 2 additions & 0 deletions HelloWorld/bada/sdk2.0/application.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Type2>test_type2.png</Type2>
<Type3>test_type3.png</Type3>
<Type4>test_type4.png</Type4>
<Type5/>
</MainMenu>
<Setting/>
<Ticker/>
Expand All @@ -20,6 +21,7 @@
<Type2>Splash_type2.png</Type2>
<Type3>Splash_type3.png</Type3>
<Type4>Splash_type4.png</Type4>
<Type5/>
</LaunchImage>
</Icons>
<AutoScaling>
Expand Down
Loading

0 comments on commit b377861

Please sign in to comment.