diff --git a/hotdoc.json b/hotdoc.json index c4e2beef9d..d21a6f4388 100644 --- a/hotdoc.json +++ b/hotdoc.json @@ -1,11 +1,15 @@ { "add_anchors": true, - "command": "conf", + "extra_assets": [ + "attachments", + "images" + ], "index": "index.md", "output": "built_doc", + "pkg_config_packages": [ + "gstreamer-1.0" + ], "project_name": "gstdotcom", - "sitemap": "sitemap.txt", - "extra_assets": ["attachments", "images"], - "pkg_config_packages": ["gstreamer-1.0"], + "sitemap": "sitemap.txt", "syntax_highlighting_activate": true -} +} \ No newline at end of file diff --git a/sdk-installing-for-android-development.md b/sdk-installing-for-android-development.md index 33d6894014..4ee783a28a 100644 --- a/sdk-installing-for-android-development.md +++ b/sdk-installing-for-android-development.md @@ -18,7 +18,7 @@ needs to have installed: you have at least one Android SDK platform installed with API version 9 or higher. -Optionally, you can use the [Android Studio] (https://developer.android.com/studio/index.html). As stated in +Optionally, you can use the [Android Studio](https://developer.android.com/studio/index.html). As stated in the Android documentation, *developing in Android Studio is highly recommended and is the fastest way to get started*. @@ -45,10 +45,17 @@ Environment Variables in the System Properties dialog (on Windows). Point `GSTREAMER_ROOT_ANDROID` to the folder where you unzipped the binaries. > ![information] If you plan to use Android Studio and do not want to define this +> environment variable globally, you can set it inside the build.gradle. + +> ![information] If you plan to use Eclipse, and do not want to define this > environment variable globally, you can set it inside Eclipse. Go to > Window → Preferences → C/C++ → Build → Build Variables and define > `GSTREAMER_ROOT_ANDROID` there. +> ![warning] The NDK support in the Gradle build system used by +> Android Studio is still in beta, so the recommended way to build +> using the GStreamer SDK is still to use "ndk-build". + ## Configure your development environment There are two routes to use GStreamer in an Android application: Either @@ -64,7 +71,7 @@ interact through [JNI][Java Native Interface]. ### Building the tutorials There are a few Android-specific tutorials in the -`$GSTREAMER_ROOT_ANDROID\share\gst-sdk\tutorials` folder. Each +`$GSTREAMER_ROOT_ANDROID/share/gst-sdk/tutorials` folder. Each tutorial is a folder containing source code (in Java and C) and the resource files required to build a complete Android application. @@ -75,6 +82,10 @@ Android projects with GStreamer support are built like conventional Android NDK projects, so the instructions at the [Android NDK] home can be followed: +#### Using Android Studio + +> ![warning] To be completed!! + #### Using Eclipse Make sure you have installed the ADT and NDK plugins listed in the diff --git a/sdk-installing-for-ios-development.md b/sdk-installing-for-ios-development.md index 7c7319308a..67b628cfd0 100644 --- a/sdk-installing-for-ios-development.md +++ b/sdk-installing-for-ios-development.md @@ -1,6 +1,6 @@ # Installing for iOS development -![](images/icons/emoticons/information.png) All versions starting form iOS 6 are supported +![](images/icons/emoticons/information.png) All versions starting from iOS 6 are supported ### Prerequisites