Skip to content

Commit

Permalink
Doc tweaks (JetBrains#686)
Browse files Browse the repository at this point in the history
  • Loading branch information
olonho authored Jun 20, 2017
1 parent ed0c781 commit aa9592e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## v0.3 (Jun 2017) ##
* Preliminary support for x86-64 Windows hosts and targets
* Support for producing native activities on 32- and 64-bit Android targets
* Extended standard library (bitsets, regular expression)
* Extended standard library (bitsets, character classification, regular expression)
* Preliminary support for Kotlin/Native library format (.klib)
* Preliminary source-level debugging support (stepping only, no variable inspection)
* Compiler switch `-entry` to select entry point
Expand Down
1 change: 1 addition & 0 deletions DISTRO_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ without need to ship an additional execution runtime.
* `tensorflow` - simple client for TensorFlow Machine Intelligence library
* `tetris` - Tetris game implementation (using SDL2 for rendering)
* `win32` - trivial Win32 application
* `androidNativeActivity` - Android Native Activity rendering 3D graphics using GLES2

See `README.md` in each sample directory for more information and build instructions.

Expand Down
6 changes: 4 additions & 2 deletions FAQ.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
Q: How do I run my program?

A: Define top level function `fun main(args: Array<String>)`, please ensure it's not
in a package.
in a package. Also compiler switch `-entry` could be use to make any function taking
`Array<String>` and returning `Unit` be an entry point.

Q: How do I create shared library?

A: It is not possible at the moment. Currently Kotlin/Native could be used to produce either
_Kotlin/Native_ own library format, which can be statically linked with application
or an executable for target.
or an executable for target. For example, for Android targets compiler produces shared libraries
by default (as required for _Native Activity_).
4 changes: 2 additions & 2 deletions samples/androidNativeActivity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Please make sure that Android SDK version 25 is installed, using Android SDK man

To build use `ANDROID_HOME=<your path to android sdk> ../gradlew buildApk`.

Run `adb install build/outputs/apk/androidNativeActivity-arm-debug.apk` to deploy the apk on Android device or emulator
(note that only ARM-based devices are currently supported).
Run `adb install build/outputs/apk/androidNativeActivity-arm-debug.apk` to deploy the apk on the Android
device or emulator (note that only ARM-based devices are currently supported).

0 comments on commit aa9592e

Please sign in to comment.