Permalink
Browse files

Gold SDK Update

New project (project named RPSLite instead of RockPaperScissors) for
Gold SDK update, bug fixes, and cleaned up code.
  • Loading branch information...
bcs925 committed Jan 9, 2013
1 parent 110f0df commit 586aa3b8ef9b6cd1afd87afff4ce30d093d1b31e
Showing with 554 additions and 537 deletions.
  1. +77 −109 RockPaperScissors/.cproject
  2. +13 −1 RockPaperScissors/.project
  3. +32 −24 RockPaperScissors/.settings/org.eclipse.cdt.core.prefs
  4. +4 −33 RockPaperScissors/Makefile
  5. +22 −0 RockPaperScissors/RPSLite.pro
  6. +0 −66 RockPaperScissors/RockPaperScissors.pro
  7. +0 −1 RockPaperScissors/arm/README.txt
  8. +172 −158 RockPaperScissors/assets/gameScreen.qml
  9. BIN RockPaperScissors/assets/images/RPSicon.png
  10. +94 −6 RockPaperScissors/assets/main.qml
  11. +1 −1 RockPaperScissors/assets/stagingpage.qml
  12. +1 −1 RockPaperScissors/assets/tempmain.qml
  13. +20 −31 RockPaperScissors/bar-descriptor.xml
  14. +26 −0 RockPaperScissors/config.pri
  15. +0 −4 RockPaperScissors/device-assets.xml
  16. +2 −0 RockPaperScissors/precompiled.h
  17. +6 −11 RockPaperScissors/readme.md
  18. +18 −14 RockPaperScissors/src/{app.cpp → RPSLite.cpp}
  19. +45 −0 RockPaperScissors/src/RPSLite.hpp
  20. +0 −39 RockPaperScissors/src/app.hpp
  21. +19 −14 RockPaperScissors/src/main.cpp
  22. +1 −1 RockPaperScissors/translations/Makefile
  23. +1 −0 RockPaperScissors/translations/RPSLite.pro
  24. 0 RockPaperScissors/translations/{RockPaperScissors.ts → RPSLite.ts}
  25. +0 −1 RockPaperScissors/translations/RockPaperScissors.pro
  26. +0 −1 RockPaperScissors/translations/RockPaperScissors.qm
  27. BIN RockPaperScissors/translations/RockPaperScissors_de.qm
  28. +0 −4 RockPaperScissors/translations/RockPaperScissors_de.ts
  29. BIN RockPaperScissors/translations/RockPaperScissors_en_GB.qm
  30. +0 −4 RockPaperScissors/translations/RockPaperScissors_en_GB.ts
  31. BIN RockPaperScissors/translations/RockPaperScissors_es.qm
  32. +0 −4 RockPaperScissors/translations/RockPaperScissors_es.ts
  33. BIN RockPaperScissors/translations/RockPaperScissors_fr.qm
  34. +0 −4 RockPaperScissors/translations/RockPaperScissors_fr.ts
  35. BIN RockPaperScissors/translations/RockPaperScissors_it.qm
  36. +0 −4 RockPaperScissors/translations/RockPaperScissors_it.ts
  37. +0 −1 RockPaperScissors/x86/README.txt
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>RockPaperScissors</name>
+ <name>RPSLite</name>
<comment></comment>
<projects>
</projects>
@@ -62,23 +62,35 @@
</dictionary>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.rim.tad.tools.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.rim.tad.tools.qml.core.qmlFileBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
<buildCommand>
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>com.rim.tad.tools.wst.jsdt.core.jsNature</nature>
<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>
+ <nature>com.rim.tad.tools.qml.core.qmlNature</nature>
</natures>
</projectDescription>
@@ -1,25 +1,33 @@
eclipse.preferences.version=1
-environment/project/com.qnx.qcc.toolChain.1429475263/CPULIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.1429475263/CPULIST/operation=append
-environment/project/com.qnx.qcc.toolChain.1429475263/CPULIST/value=x86
-environment/project/com.qnx.qcc.toolChain.1429475263/VARIANTLIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.1429475263/VARIANTLIST/operation=append
-environment/project/com.qnx.qcc.toolChain.1429475263/VARIANTLIST/value=g
-environment/project/com.qnx.qcc.toolChain.1429475263/append=true
-environment/project/com.qnx.qcc.toolChain.1429475263/appendContributed=true
-environment/project/com.qnx.qcc.toolChain.26921787/CPULIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.26921787/CPULIST/operation=append
-environment/project/com.qnx.qcc.toolChain.26921787/CPULIST/value=arm
-environment/project/com.qnx.qcc.toolChain.26921787/VARIANTLIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.26921787/VARIANTLIST/operation=append
-environment/project/com.qnx.qcc.toolChain.26921787/VARIANTLIST/value=g
-environment/project/com.qnx.qcc.toolChain.26921787/append=true
-environment/project/com.qnx.qcc.toolChain.26921787/appendContributed=true
-environment/project/com.qnx.qcc.toolChain.599479158/CPULIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.599479158/CPULIST/operation=append
-environment/project/com.qnx.qcc.toolChain.599479158/CPULIST/value=arm
-environment/project/com.qnx.qcc.toolChain.599479158/EXCLUDE_VARIANTLIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.599479158/EXCLUDE_VARIANTLIST/operation=append
-environment/project/com.qnx.qcc.toolChain.599479158/EXCLUDE_VARIANTLIST/value=r
-environment/project/com.qnx.qcc.toolChain.599479158/append=true
-environment/project/com.qnx.qcc.toolChain.599479158/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.1011248528/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1011248528/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1011248528/CPULIST/value=x86
+environment/project/com.qnx.qcc.toolChain.1011248528/VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1011248528/VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1011248528/VARIANTLIST/value=g
+environment/project/com.qnx.qcc.toolChain.1011248528/append=true
+environment/project/com.qnx.qcc.toolChain.1011248528/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.1046877586/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1046877586/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1046877586/CPULIST/value=arm
+environment/project/com.qnx.qcc.toolChain.1046877586/VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1046877586/VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1046877586/VARIANTLIST/value=g
+environment/project/com.qnx.qcc.toolChain.1046877586/append=true
+environment/project/com.qnx.qcc.toolChain.1046877586/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.1089434158/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1089434158/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1089434158/CPULIST/value=arm
+environment/project/com.qnx.qcc.toolChain.1089434158/EXCLUDE_VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1089434158/EXCLUDE_VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1089434158/EXCLUDE_VARIANTLIST/value=r
+environment/project/com.qnx.qcc.toolChain.1089434158/append=true
+environment/project/com.qnx.qcc.toolChain.1089434158/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.711086013/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.711086013/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.711086013/CPULIST/value=arm
+environment/project/com.qnx.qcc.toolChain.711086013/EXCLUDE_VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.711086013/EXCLUDE_VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.711086013/EXCLUDE_VARIANTLIST/value=p
+environment/project/com.qnx.qcc.toolChain.711086013/append=true
+environment/project/com.qnx.qcc.toolChain.711086013/appendContributed=true
View
@@ -1,35 +1,6 @@
-QMAKE_TARGET = RockPaperScissors
-QMAKE = $(QNX_HOST)/usr/bin/qmake
-TARGET = $(QMAKE_TARGET)
+QMAKE_TARGET = RPSLite
+PROJECT_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+I18N_DIR := $(PROJECT_DIR)/translations
+include mk/cs-base.mk
-all: Makefile $(QMAKE_TARGET)
-
-clean:
- $(MAKE) -C ./arm -f Makefile sureclean
- $(MAKE) -C ./x86 -f Makefile sureclean
-
-
-Makefile: FORCE
- $(QMAKE) -spec unsupported/blackberry-armv7le-g++ -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
- $(QMAKE) -spec unsupported/blackberry-x86-g++ -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
- $(MAKE) -C ./translations -f Makefile update release
-
-FORCE:
-
-$(QMAKE_TARGET): device simulator
-
-device:
- $(MAKE) -C ./arm -f Makefile all
-
-Device-Debug: Makefile
- $(MAKE) -C ./arm -f Makefile debug
-
-Device-Release: Makefile
- $(MAKE) -C ./arm -f Makefile release
-
-simulator:
- $(MAKE) -C ./x86 -f Makefile all
-
-Simulator-Debug: Makefile
- $(MAKE) -C ./x86 -f Makefile debug
@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2012, 2013 Brian Scheirer
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+APP_NAME = RPSLite
+
+CONFIG += qt warn_on cascades10
+LIBS += -lbbcascadesadvertisement
+
+include(config.pri)
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2012 Brian Scheirer
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-TEMPLATE = app
-TARGET = RockPaperScissors
-
-CONFIG += qt warn_on debug_and_release cascades
-
-INCLUDEPATH += ../src
-SOURCES += ../src/*.cpp
-HEADERS += ../src/*.hpp ../src/*.h
-
-lupdate_inclusion {
- SOURCES += ../assets/*.qml
-}
-
-device {
- CONFIG(release, debug|release) {
- DESTDIR = o.le-v7
- }
- CONFIG(debug, debug|release) {
- DESTDIR = o.le-v7-g
- }
-}
-
-simulator {
- CONFIG(release, debug|release) {
- DESTDIR = o
- }
- CONFIG(debug, debug|release) {
- DESTDIR = o-g
- }
-}
-
-OBJECTS_DIR = $${DESTDIR}/.obj
-MOC_DIR = $${DESTDIR}/.moc
-RCC_DIR = $${DESTDIR}/.rcc
-UI_DIR = $${DESTDIR}/.ui
-
-suredelete.target = sureclean
-suredelete.commands = $(DEL_FILE) $${MOC_DIR}/*; $(DEL_FILE) $${RCC_DIR}/*; $(DEL_FILE) $${UI_DIR}/*
-suredelete.depends = distclean
-
-QMAKE_EXTRA_TARGETS += suredelete
-
-TRANSLATIONS = \
- $${TARGET}_en_GB.ts \
- $${TARGET}_fr.ts \
- $${TARGET}_it.ts \
- $${TARGET}_de.ts \
- $${TARGET}_es.ts \
- $${TARGET}.ts
-
@@ -1 +0,0 @@
-Empty directory.
Oops, something went wrong.

0 comments on commit 586aa3b

Please sign in to comment.