Skip to content

Commit e4f9371

Browse files
committed
Merge pull request blackberry#34 from pelegri/master
Add Blamo, Brian's Solution to 'Make This!' Challenge
2 parents 2e104cb + d947940 commit e4f9371

File tree

17 files changed

+939
-3
lines changed

17 files changed

+939
-3
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.metadata/*
22
*.DS_Store
33
*.o
4-
HelloOggVorbis/arm/*
5-
HelloOggVorbis/x86/*
64
_site/*

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ First contribution was the sample showed during the BlackBerry 10 [Super Jam ses
77
([video](http://www.youtube.com/watch?feature=player_embedded&v=3nX_AploVC8)).
88

99

10-
When adding to this repo, please have a readme saying what version it works on.
10+
When adding to this repo, please have a readme saying what version it works on.
11+
12+
Challenges and Solutions to the _#StumpTheBlackBerryDev_ program are listed
13+
[here](http://blackberry.github.com/Cascades-Community-Samples).

stumpers/Blamo/.cproject

Lines changed: 209 additions & 0 deletions
Large diffs are not rendered by default.

stumpers/Blamo/.project

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Blamo</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
10+
<arguments>
11+
<dictionary>
12+
<key>?name?</key>
13+
<value></value>
14+
</dictionary>
15+
<dictionary>
16+
<key>org.eclipse.cdt.make.core.append_environment</key>
17+
<value>true</value>
18+
</dictionary>
19+
<dictionary>
20+
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
21+
<value>Device-Debug</value>
22+
</dictionary>
23+
<dictionary>
24+
<key>org.eclipse.cdt.make.core.buildArguments</key>
25+
<value></value>
26+
</dictionary>
27+
<dictionary>
28+
<key>org.eclipse.cdt.make.core.buildCommand</key>
29+
<value>make</value>
30+
</dictionary>
31+
<dictionary>
32+
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
33+
<value>clean</value>
34+
</dictionary>
35+
<dictionary>
36+
<key>org.eclipse.cdt.make.core.contents</key>
37+
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
38+
</dictionary>
39+
<dictionary>
40+
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
41+
<value>true</value>
42+
</dictionary>
43+
<dictionary>
44+
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
45+
<value>true</value>
46+
</dictionary>
47+
<dictionary>
48+
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
49+
<value>true</value>
50+
</dictionary>
51+
<dictionary>
52+
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
53+
<value>Device-Debug</value>
54+
</dictionary>
55+
<dictionary>
56+
<key>org.eclipse.cdt.make.core.stopOnError</key>
57+
<value>true</value>
58+
</dictionary>
59+
<dictionary>
60+
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
61+
<value>true</value>
62+
</dictionary>
63+
</arguments>
64+
</buildCommand>
65+
<buildCommand>
66+
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
67+
<triggers>full,incremental,</triggers>
68+
<arguments>
69+
</arguments>
70+
</buildCommand>
71+
<buildCommand>
72+
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
73+
<arguments>
74+
</arguments>
75+
</buildCommand>
76+
</buildSpec>
77+
<natures>
78+
<nature>org.eclipse.cdt.core.cnature</nature>
79+
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
80+
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
81+
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
82+
<nature>org.eclipse.cdt.core.ccnature</nature>
83+
</natures>
84+
</projectDescription>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
eclipse.preferences.version=1
2+
environment/project/com.qnx.qcc.toolChain.1535680645/CPULIST/delimiter=,
3+
environment/project/com.qnx.qcc.toolChain.1535680645/CPULIST/operation=append
4+
environment/project/com.qnx.qcc.toolChain.1535680645/CPULIST/value=arm
5+
environment/project/com.qnx.qcc.toolChain.1535680645/VARIANTLIST/delimiter=,
6+
environment/project/com.qnx.qcc.toolChain.1535680645/VARIANTLIST/operation=append
7+
environment/project/com.qnx.qcc.toolChain.1535680645/VARIANTLIST/value=g
8+
environment/project/com.qnx.qcc.toolChain.1535680645/append=true
9+
environment/project/com.qnx.qcc.toolChain.1535680645/appendContributed=true
10+
environment/project/com.qnx.qcc.toolChain.263622671/CPULIST/delimiter=,
11+
environment/project/com.qnx.qcc.toolChain.263622671/CPULIST/operation=append
12+
environment/project/com.qnx.qcc.toolChain.263622671/CPULIST/value=x86
13+
environment/project/com.qnx.qcc.toolChain.263622671/VARIANTLIST/delimiter=,
14+
environment/project/com.qnx.qcc.toolChain.263622671/VARIANTLIST/operation=append
15+
environment/project/com.qnx.qcc.toolChain.263622671/VARIANTLIST/value=g
16+
environment/project/com.qnx.qcc.toolChain.263622671/append=true
17+
environment/project/com.qnx.qcc.toolChain.263622671/appendContributed=true
18+
environment/project/com.qnx.qcc.toolChain.417554663/CPULIST/delimiter=,
19+
environment/project/com.qnx.qcc.toolChain.417554663/CPULIST/operation=append
20+
environment/project/com.qnx.qcc.toolChain.417554663/CPULIST/value=arm
21+
environment/project/com.qnx.qcc.toolChain.417554663/EXCLUDE_VARIANTLIST/delimiter=,
22+
environment/project/com.qnx.qcc.toolChain.417554663/EXCLUDE_VARIANTLIST/operation=append
23+
environment/project/com.qnx.qcc.toolChain.417554663/EXCLUDE_VARIANTLIST/value=r
24+
environment/project/com.qnx.qcc.toolChain.417554663/append=true
25+
environment/project/com.qnx.qcc.toolChain.417554663/appendContributed=true

stumpers/Blamo/Blamo.pro

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#
2+
# Copyright (c) 2012 Brian Scheirer
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
18+
TEMPLATE = app
19+
TARGET = Blamo
20+
21+
CONFIG += qt warn_on debug_and_release cascades
22+
23+
INCLUDEPATH += ../src
24+
SOURCES += ../src/*.cpp
25+
HEADERS += ../src/*.hpp ../src/*.h
26+
27+
lupdate_inclusion {
28+
SOURCES += ../assets/*.qml
29+
}
30+
31+
device {
32+
CONFIG(release, debug|release) {
33+
DESTDIR = o.le-v7
34+
}
35+
CONFIG(debug, debug|release) {
36+
DESTDIR = o.le-v7-g
37+
}
38+
}
39+
40+
simulator {
41+
CONFIG(release, debug|release) {
42+
DESTDIR = o
43+
}
44+
CONFIG(debug, debug|release) {
45+
DESTDIR = o-g
46+
}
47+
}
48+
49+
OBJECTS_DIR = $${DESTDIR}/.obj
50+
MOC_DIR = $${DESTDIR}/.moc
51+
RCC_DIR = $${DESTDIR}/.rcc
52+
UI_DIR = $${DESTDIR}/.ui
53+
54+
suredelete.target = sureclean
55+
suredelete.commands = $(DEL_FILE) $${MOC_DIR}/*; $(DEL_FILE) $${RCC_DIR}/*; $(DEL_FILE) $${UI_DIR}/*
56+
suredelete.depends = distclean
57+
58+
QMAKE_EXTRA_TARGETS += suredelete
59+
60+
TRANSLATIONS = \
61+
$${TARGET}_en_GB.ts \
62+
$${TARGET}_fr.ts \
63+
$${TARGET}_it.ts \
64+
$${TARGET}_de.ts \
65+
$${TARGET}_es.ts \
66+
$${TARGET}.ts
67+

stumpers/Blamo/Makefile

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#
2+
# Copyright (c) 2012 Brian Scheirer
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
18+
QMAKE_TARGET = Blamo
19+
QMAKE = $(QNX_HOST)/usr/bin/qmake
20+
TARGET = $(QMAKE_TARGET)
21+
22+
23+
all: Makefile $(QMAKE_TARGET)
24+
25+
clean:
26+
$(MAKE) -C ./arm -f Makefile sureclean
27+
$(MAKE) -C ./x86 -f Makefile sureclean
28+
29+
30+
Makefile: FORCE
31+
$(QMAKE) -spec unsupported/blackberry-armv7le-g++ -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
32+
$(QMAKE) -spec unsupported/blackberry-x86-g++ -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
33+
$(MAKE) -C ./translations -f Makefile update release
34+
35+
FORCE:
36+
37+
$(QMAKE_TARGET): device simulator
38+
39+
device:
40+
$(MAKE) -C ./arm -f Makefile all
41+
42+
Device-Debug: Makefile
43+
$(MAKE) -C ./arm -f Makefile debug
44+
45+
Device-Release: Makefile
46+
$(MAKE) -C ./arm -f Makefile release
47+
48+
simulator:
49+
$(MAKE) -C ./x86 -f Makefile all
50+
51+
Simulator-Debug: Makefile
52+
$(MAKE) -C ./x86 -f Makefile debug

0 commit comments

Comments
 (0)