diff --git a/examples/android/.gitignore b/examples/android/.gitignore new file mode 100644 index 00000000..ba72b9d7 --- /dev/null +++ b/examples/android/.gitignore @@ -0,0 +1,7 @@ +local.properties +.idea +.gradle +build +android.iml +app/build +app/.externalNativeBuild diff --git a/examples/android/app/app.iml b/examples/android/app/app.iml new file mode 100644 index 00000000..232000a7 --- /dev/null +++ b/examples/android/app/app.iml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/android/app/build.gradle b/examples/android/app/build.gradle new file mode 100644 index 00000000..f1d3c4ae --- /dev/null +++ b/examples/android/app/build.gradle @@ -0,0 +1,39 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 27 + defaultConfig { + applicationId "org.sfmldev.android" + minSdkVersion 19 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + externalNativeBuild { + ndkBuild { + cppFlags "-std=c++14 -frtti -fexceptions" + } + + } + ndk { + abiFilters 'armeabi-v7a' + } + + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + externalNativeBuild { + ndkBuild { + path "src/main/cpp/Android.mk" + + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/examples/android/app/proguard-rules.pro b/examples/android/app/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/examples/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/examples/android/AndroidManifest.xml b/examples/android/app/src/main/AndroidManifest.xml similarity index 100% rename from examples/android/AndroidManifest.xml rename to examples/android/app/src/main/AndroidManifest.xml diff --git a/examples/android/assets/canary.wav b/examples/android/app/src/main/assets/canary.wav similarity index 100% rename from examples/android/assets/canary.wav rename to examples/android/app/src/main/assets/canary.wav diff --git a/examples/android/assets/image.png b/examples/android/app/src/main/assets/image.png similarity index 100% rename from examples/android/assets/image.png rename to examples/android/app/src/main/assets/image.png diff --git a/examples/android/assets/orchestral.ogg b/examples/android/app/src/main/assets/orchestral.ogg similarity index 100% rename from examples/android/assets/orchestral.ogg rename to examples/android/app/src/main/assets/orchestral.ogg diff --git a/examples/android/assets/sansation.ttf b/examples/android/app/src/main/assets/sansation.ttf similarity index 100% rename from examples/android/assets/sansation.ttf rename to examples/android/app/src/main/assets/sansation.ttf diff --git a/examples/android/jni/Android.mk b/examples/android/app/src/main/cpp/Android.mk similarity index 84% rename from examples/android/jni/Android.mk rename to examples/android/app/src/main/cpp/Android.mk index 8c42b78f..ae84f65f 100644 --- a/examples/android/jni/Android.mk +++ b/examples/android/app/src/main/cpp/Android.mk @@ -11,6 +11,8 @@ LOCAL_SHARED_LIBRARIES += sfml-window LOCAL_SHARED_LIBRARIES += sfml-graphics LOCAL_SHARED_LIBRARIES += sfml-audio LOCAL_SHARED_LIBRARIES += sfml-network +LOCAL_SHARED_LIBRARIES += sfml-activity +LOCAL_SHARED_LIBRARIES += openal LOCAL_WHOLE_STATIC_LIBRARIES := sfml-main include $(BUILD_SHARED_LIBRARY) diff --git a/examples/android/jni/Application.mk b/examples/android/app/src/main/cpp/Application.mk similarity index 82% rename from examples/android/jni/Application.mk rename to examples/android/app/src/main/cpp/Application.mk index 13ca3ea4..e1e4b821 100644 --- a/examples/android/jni/Application.mk +++ b/examples/android/app/src/main/cpp/Application.mk @@ -1,5 +1,5 @@ NDK_TOOLCHAIN_VERSION := 4.9 APP_PLATFORM := android-14 -APP_STL := c++_shared +APP_STL := stlport_shared APP_ABI := armeabi-v7a APP_MODULES := sfml-activity sfml-example diff --git a/examples/android/jni/main.cpp b/examples/android/app/src/main/cpp/main.cpp similarity index 100% rename from examples/android/jni/main.cpp rename to examples/android/app/src/main/cpp/main.cpp diff --git a/examples/android/res/drawable-hdpi/sfml_logo.png b/examples/android/app/src/main/res/drawable-hdpi/sfml_logo.png similarity index 100% rename from examples/android/res/drawable-hdpi/sfml_logo.png rename to examples/android/app/src/main/res/drawable-hdpi/sfml_logo.png diff --git a/examples/android/res/drawable-ldpi/sfml_logo.png b/examples/android/app/src/main/res/drawable-ldpi/sfml_logo.png similarity index 100% rename from examples/android/res/drawable-ldpi/sfml_logo.png rename to examples/android/app/src/main/res/drawable-ldpi/sfml_logo.png diff --git a/examples/android/res/drawable-mdpi/sfml_logo.png b/examples/android/app/src/main/res/drawable-mdpi/sfml_logo.png similarity index 100% rename from examples/android/res/drawable-mdpi/sfml_logo.png rename to examples/android/app/src/main/res/drawable-mdpi/sfml_logo.png diff --git a/examples/android/res/drawable-xhdpi/sfml_logo.png b/examples/android/app/src/main/res/drawable-xhdpi/sfml_logo.png similarity index 100% rename from examples/android/res/drawable-xhdpi/sfml_logo.png rename to examples/android/app/src/main/res/drawable-xhdpi/sfml_logo.png diff --git a/examples/android/res/drawable-xxhdpi/sfml_logo.png b/examples/android/app/src/main/res/drawable-xxhdpi/sfml_logo.png similarity index 100% rename from examples/android/res/drawable-xxhdpi/sfml_logo.png rename to examples/android/app/src/main/res/drawable-xxhdpi/sfml_logo.png diff --git a/examples/android/res/values/strings.xml b/examples/android/app/src/main/res/values/strings.xml similarity index 100% rename from examples/android/res/values/strings.xml rename to examples/android/app/src/main/res/values/strings.xml diff --git a/examples/android/build.gradle b/examples/android/build.gradle new file mode 100644 index 00000000..56292ed4 --- /dev/null +++ b/examples/android/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.0' + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/examples/android/gradle.properties b/examples/android/gradle.properties new file mode 100644 index 00000000..aac7c9b4 --- /dev/null +++ b/examples/android/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/examples/android/gradle/wrapper/gradle-wrapper.jar b/examples/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..13372aef Binary files /dev/null and b/examples/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/android/gradle/wrapper/gradle-wrapper.properties b/examples/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..74e4fed5 --- /dev/null +++ b/examples/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Oct 26 23:14:02 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/android/gradlew b/examples/android/gradlew new file mode 100755 index 00000000..9d82f789 --- /dev/null +++ b/examples/android/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/examples/android/gradlew.bat b/examples/android/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/examples/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/android/settings.gradle b/examples/android/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/examples/android/settings.gradle @@ -0,0 +1 @@ +include ':app'