Commit 6058bd09 authored by j4cbo's avatar j4cbo

Merge pull request #119 from spanndemic/misc-typos

Misc typos
parents 0521e806 b9c28534
......@@ -21,7 +21,7 @@ We announced Djinni at CppCon 2014. Access the slides from https://bit.ly/djinni
### Types
Djinni generates code based on interface definitions in an IDL file. An IDL file can contain
three kinds of declaration: enums, records, and interfaces.
three kinds of declarations: enums, records, and interfaces.
* Enums become C++ enum classes, Java enums, or ObjC `NS_ENUM`s.
* Records are pure-data value objects.
......@@ -158,7 +158,7 @@ you'll need to add calls to your own `JNI_OnLoad` and `JNI_OnUnload` functions.
#### Objective-C / C++ Project
##### Includes & Build Target
Generated file for Objective-C / C++ is as follows (assuming prefix is `DB`):
Generated files for Objective-C / C++ are as follows (assuming prefix is `DB`):
| Type | C++ header | C++ source | Objective-C files | Objective-C++ files |
|-----------|------------------------|----------------------------|--------------------------|-----------------------------|
......@@ -235,7 +235,7 @@ will be translated as well.
### Constants
Constants can be defined within interfaces and records. In Java and C++ they are part of the
generated class; and in Objective-C, constant names are globals with name of the
generated class; and in Objective-C, constant names are globals with the name of the
interface/record prefixed. Example:
record_with_const = record +c +j +o {
......
{
"target_defaults": {
"default_configuration": "Debug",
# enable andoird short names (not full path) for linking libraries
# enable android short names (not full paths) for linking libraries
"android_unmangled_name": 1,
'cflags': [ '-gdwarf-2', '-Werror', '-Wall', '-Wextra', '-Wno-missing-field-initializers' ],
'cflags_cc': [ '-std=c++11', '-frtti', '-fexceptions', '-Wno-literal-suffix' ],
......
......@@ -6,7 +6,7 @@ view, and when the button "Sort" is hit, sorts the lines in that view.
Interface Stucture
------------------
Two interfaces are defined: SortItems and TextboxListener. SortItems is implemented in C++; its
method sort() takes a list of strings (wrapped in a record), sort it, and passes the sorted list to
method sort() takes a list of strings (wrapped in a record), sorts it, and passes the sorted list to
TextboxListener.update() . TextboxListener is implemented in Java / Objective-C, and will update the
text area on the UI when update() is called. You can check the source tree for implemetation
details.
......@@ -46,7 +46,7 @@ iOS Version
-----------
The iOS project is in objc/ . Note that the interface layout is only tested under 4-inch iPhone.
The main handwritten logic is at TXSViewController.mm. Please open TextSort.**xcworkspace** (not the
xcodeproj file) This program can be built using default setting in Xcode. Or more simply:
xcodeproj file) This program can be built using the default settings in Xcode. Or more simply:
```
cd djinni_root_rit/example;
xcodebuild -workspace objc/TextSort.xcworkspace -scheme TextSort -configuration 'Debug' -sdk iphoneos
......@@ -71,7 +71,7 @@ then gradle can not find your NDK installation. First make sure that you've
installed the NDK. On Mac OS X, you can install easily via
[homebrew](http://brew.sh/): `brew install android-ndk`
After that, you have to tell gradle where the location of the NDK location.
After that, you have to tell gradle the location of the NDK.
This can happen by either setting the `ANDROID_NDK_HOME` environment variable
to the path where the NDK was installed, or by creating a `local.properties`
file in the project directory.
......
......@@ -34,7 +34,7 @@ if [ $# -eq 0 ]; then
elif [ $# -eq 1 ]; then
command="$1"; shift
if [ "$command" != "clean" ]; then
echo "Unexpected arguemnt: \"$command\"." 1>&2
echo "Unexpected argument: \"$command\"." 1>&2
exit 1
fi
for dir in "$temp_out" "$cpp_out" "$jni_out" "$java_out"; do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment