diff --git a/proj.android-studio/.gitignore b/proj.android-studio/.gitignore new file mode 100755 index 0000000..dc42d53 --- /dev/null +++ b/proj.android-studio/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/proj.android-studio/.idea/caches/build_file_checksums.ser b/proj.android-studio/.idea/caches/build_file_checksums.ser new file mode 100755 index 0000000..1eb6eff Binary files /dev/null and b/proj.android-studio/.idea/caches/build_file_checksums.ser differ diff --git a/proj.android-studio/.idea/codeStyles/Project.xml b/proj.android-studio/.idea/codeStyles/Project.xml new file mode 100755 index 0000000..2715a34 --- /dev/null +++ b/proj.android-studio/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/proj.android-studio/.idea/gradle.xml b/proj.android-studio/.idea/gradle.xml new file mode 100755 index 0000000..c546ff0 --- /dev/null +++ b/proj.android-studio/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/proj.android-studio/.idea/misc.xml b/proj.android-studio/.idea/misc.xml new file mode 100755 index 0000000..99202cc --- /dev/null +++ b/proj.android-studio/.idea/misc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/proj.android-studio/.idea/runConfigurations.xml b/proj.android-studio/.idea/runConfigurations.xml new file mode 100755 index 0000000..7f68460 --- /dev/null +++ b/proj.android-studio/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/proj.android-studio/app/.gitignore b/proj.android-studio/app/.gitignore new file mode 100755 index 0000000..3543521 --- /dev/null +++ b/proj.android-studio/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/proj.android-studio/app/CMakeLists.txt b/proj.android-studio/app/CMakeLists.txt new file mode 100755 index 0000000..fbdd729 --- /dev/null +++ b/proj.android-studio/app/CMakeLists.txt @@ -0,0 +1,44 @@ +# For more information about using CMake with Android Studio, read the +# documentation: https://d.android.com/studio/projects/add-native-code.html + +# Sets the minimum version of CMake required to build the native library. + +cmake_minimum_required(VERSION 3.4.1) + +# Creates and names a library, sets it as either STATIC +# or SHARED, and provides the relative paths to its source code. +# You can define multiple libraries, and CMake builds them for you. +# Gradle automatically packages shared libraries with your APK. + +add_library( # Sets the name of the library. + native-lib + + # Sets the library as a shared library. + SHARED + + # Provides a relative path to your source file(s). + src/main/cpp/native-lib.cpp ) + +# Searches for a specified prebuilt library and stores the path as a +# variable. Because CMake includes system libraries in the search path by +# default, you only need to specify the name of the public NDK library +# you want to add. CMake verifies that the library exists before +# completing its build. + +find_library( # Sets the name of the path variable. + log-lib + + # Specifies the name of the NDK library that + # you want CMake to locate. + log ) + +# Specifies libraries CMake should link to your target library. You +# can link multiple libraries, such as libraries you define in this +# build script, prebuilt third-party libraries, or system libraries. + +target_link_libraries( # Specifies the target library. + native-lib + + # Links the target library to the log library + # included in the NDK. + ${log-lib} ) \ No newline at end of file diff --git a/proj.android-studio/app/build.gradle b/proj.android-studio/app/build.gradle new file mode 100755 index 0000000..0be307d --- /dev/null +++ b/proj.android-studio/app/build.gradle @@ -0,0 +1,48 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + buildToolsVersion "28.0.0" + defaultConfig { + applicationId "com.fishrungames.crystalofrhylil" + minSdkVersion 15 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + externalNativeBuild { + cmake { + + abiFilters "armeabi-v7a", "x86" + + arguments "-DANDROID_STL=c++_shared" + + cppFlags "-std=c++17 -frtti -fexceptions -fsigned-char -Wno-c++11-narrowing" + } + } + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + externalNativeBuild { + cmake { + path "CMakeLists.txt" + } + } + sourceSets { + main { + assets.srcDirs = ['../../assets/'] + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'com.android.support:appcompat-v7:28+' + + implementation project(':SalmonEngineAndroid') +} diff --git a/proj.android-studio/app/proguard-rules.pro b/proj.android-studio/app/proguard-rules.pro new file mode 100755 index 0000000..6e7ffa9 --- /dev/null +++ b/proj.android-studio/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/proj.android-studio/app/src/androidTest/java/com/fishrungames/crystalofrhylil/ExampleInstrumentedTest.java b/proj.android-studio/app/src/androidTest/java/com/fishrungames/crystalofrhylil/ExampleInstrumentedTest.java new file mode 100755 index 0000000..9dac12b --- /dev/null +++ b/proj.android-studio/app/src/androidTest/java/com/fishrungames/crystalofrhylil/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.fishrungames.crystalofrhylil; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.fishrungames.crystalofrhylil", appContext.getPackageName()); + } +} diff --git a/proj.android-studio/app/src/main/AndroidManifest.xml b/proj.android-studio/app/src/main/AndroidManifest.xml new file mode 100755 index 0000000..b835e36 --- /dev/null +++ b/proj.android-studio/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/proj.android-studio/app/src/main/cpp/native-lib.cpp b/proj.android-studio/app/src/main/cpp/native-lib.cpp new file mode 100755 index 0000000..a10a379 --- /dev/null +++ b/proj.android-studio/app/src/main/cpp/native-lib.cpp @@ -0,0 +1,12 @@ +#include +#include + +extern "C" JNIEXPORT jstring + +JNICALL +Java_com_fishrungames_crystalofrhylil_MainActivity_stringFromJNI( + JNIEnv *env, + jobject /* this */) { + std::string hello = "Hello from C++"; + return env->NewStringUTF(hello.c_str()); +} diff --git a/proj.android-studio/app/src/main/java/com/fishrungames/crystalofrhylil/MainActivity.java b/proj.android-studio/app/src/main/java/com/fishrungames/crystalofrhylil/MainActivity.java new file mode 100755 index 0000000..c3ccdae --- /dev/null +++ b/proj.android-studio/app/src/main/java/com/fishrungames/crystalofrhylil/MainActivity.java @@ -0,0 +1,26 @@ +package com.fishrungames.crystalofrhylil; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.TextView; + +public class MainActivity extends Activity { + + // Used to load the 'native-lib' library on application startup. + static { + System.loadLibrary("native-lib"); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + + } + + /** + * A native method that is implemented by the 'native-lib' native library, + * which is packaged with this application. + */ + public native String stringFromJNI(); +} diff --git a/proj.android-studio/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/proj.android-studio/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100755 index 0000000..ddb26ad --- /dev/null +++ b/proj.android-studio/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/proj.android-studio/app/src/main/res/drawable/ic_launcher_background.xml b/proj.android-studio/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100755 index 0000000..3a37cf6 --- /dev/null +++ b/proj.android-studio/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proj.android-studio/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/proj.android-studio/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100755 index 0000000..a26f6fb --- /dev/null +++ b/proj.android-studio/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/proj.android-studio/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/proj.android-studio/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100755 index 0000000..a26f6fb --- /dev/null +++ b/proj.android-studio/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/proj.android-studio/app/src/main/res/mipmap-hdpi/ic_launcher.png b/proj.android-studio/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100755 index 0000000..a2f5908 Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/proj.android-studio/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100755 index 0000000..1b52399 Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-mdpi/ic_launcher.png b/proj.android-studio/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100755 index 0000000..ff10afd Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/proj.android-studio/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100755 index 0000000..115a4c7 Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/proj.android-studio/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100755 index 0000000..dcd3cd8 Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/proj.android-studio/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100755 index 0000000..459ca60 Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/proj.android-studio/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100755 index 0000000..8ca12fe Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/proj.android-studio/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100755 index 0000000..8e19b41 Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/proj.android-studio/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100755 index 0000000..b824ebd Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/proj.android-studio/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/proj.android-studio/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100755 index 0000000..4c19a13 Binary files /dev/null and b/proj.android-studio/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/proj.android-studio/app/src/main/res/values/colors.xml b/proj.android-studio/app/src/main/res/values/colors.xml new file mode 100755 index 0000000..2a12c47 --- /dev/null +++ b/proj.android-studio/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/proj.android-studio/app/src/main/res/values/strings.xml b/proj.android-studio/app/src/main/res/values/strings.xml new file mode 100755 index 0000000..3aba221 --- /dev/null +++ b/proj.android-studio/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + crystalofrhylil + diff --git a/proj.android-studio/app/src/main/res/values/styles.xml b/proj.android-studio/app/src/main/res/values/styles.xml new file mode 100755 index 0000000..efe449b --- /dev/null +++ b/proj.android-studio/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/proj.android-studio/app/src/test/java/com/fishrungames/crystalofrhylil/ExampleUnitTest.java b/proj.android-studio/app/src/test/java/com/fishrungames/crystalofrhylil/ExampleUnitTest.java new file mode 100755 index 0000000..6c96764 --- /dev/null +++ b/proj.android-studio/app/src/test/java/com/fishrungames/crystalofrhylil/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.fishrungames.crystalofrhylil; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/proj.android-studio/build.gradle b/proj.android-studio/build.gradle new file mode 100755 index 0000000..7eb4161 --- /dev/null +++ b/proj.android-studio/build.gradle @@ -0,0 +1,27 @@ +// 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.1.2' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/proj.android-studio/gradle.properties b/proj.android-studio/gradle.properties new file mode 100755 index 0000000..d9ae40f --- /dev/null +++ b/proj.android-studio/gradle.properties @@ -0,0 +1,13 @@ +# 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/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/proj.android-studio/gradle/wrapper/gradle-wrapper.jar new file mode 100755 index 0000000..7a3265e Binary files /dev/null and b/proj.android-studio/gradle/wrapper/gradle-wrapper.jar differ diff --git a/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/proj.android-studio/gradle/wrapper/gradle-wrapper.properties new file mode 100755 index 0000000..bcf04f0 --- /dev/null +++ b/proj.android-studio/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Jul 19 17:06:55 YEKT 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/proj.android-studio/gradlew b/proj.android-studio/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/proj.android-studio/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# 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 +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +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" -a "$nonstop" = "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 + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/proj.android-studio/gradlew.bat b/proj.android-studio/gradlew.bat new file mode 100755 index 0000000..e95643d --- /dev/null +++ b/proj.android-studio/gradlew.bat @@ -0,0 +1,84 @@ +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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/proj.android-studio/settings.gradle b/proj.android-studio/settings.gradle new file mode 100755 index 0000000..dfc988f --- /dev/null +++ b/proj.android-studio/settings.gradle @@ -0,0 +1,7 @@ +include ':SalmonEngineAndroid' +project(':SalmonEngineAndroid').projectDir =new File(settingsDir, '../../tes-engine/SalmonEngineAndroid/app') + + +include ':app' + +