diff --git a/qtBuildSystem/Mu/Mu.pro b/qtBuildSystem/Mu/Mu.pro index 186a01e..d29c5ec 100644 --- a/qtBuildSystem/Mu/Mu.pro +++ b/qtBuildSystem/Mu/Mu.pro @@ -109,7 +109,18 @@ DISTFILES += \ images/right.png \ images/up.png \ images/todo.png \ - android-resources/AndroidManifest.xml + android/AndroidManifest.xml \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat \ + android/res/drawable-hdpi/icon.png \ + android/res/drawable-ldpi/icon.png \ + android/res/drawable-mdpi/icon.png RESOURCES += \ mainwindow.qrc + +ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/qtBuildSystem/Mu/Mu.pro.user b/qtBuildSystem/Mu/Mu.pro.user index 73c696d..d3c9c47 100644 --- a/qtBuildSystem/Mu/Mu.pro.user +++ b/qtBuildSystem/Mu/Mu.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -58,6 +58,324 @@ ProjectExplorer.Project.Target.0 + + Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) + Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) + {d2003381-5fc1-4ec6-a72e-166645e4f708} + 1 + 0 + 0 + + /Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/build-Mu-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-26 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/build-Mu-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-26 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/build-Mu-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-26 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deploy to Android device + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy to Android device + + Qt4ProjectManager.AndroidDeployConfiguration2 + + 1 + + ZY223CQT6S + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + Mu + 2 + Qt4ProjectManager.AndroidRunConfiguration:/Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/Mu/Mu.pro + Mu.pro + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 Desktop Qt 5.10.1 clang 64bit Desktop Qt 5.10.1 clang 64bit @@ -321,324 +639,6 @@ 1 - - ProjectExplorer.Project.Target.1 - - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) - {d2003381-5fc1-4ec6-a72e-166645e4f708} - 1 - 0 - 0 - - /Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/build-Mu-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-26 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/build-Mu-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-26 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/build-Mu-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-26 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Deploy to Android device - - Qt4ProjectManager.AndroidDeployQtStep - false - - 1 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Android device - - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - TA107021DY - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - Mu - 2 - Qt4ProjectManager.AndroidRunConfiguration:/Users/Hoppy/Desktop/projects/PalmEmuRedo/libretro-palmm515emu/qtBuildSystem/Mu/Mu.pro - Mu.pro - 3768 - false - true - false - false - true - - 1 - - ProjectExplorer.Project.TargetCount 2 diff --git a/qtBuildSystem/Mu/android-resources/AndroidManifest.xml b/qtBuildSystem/Mu/android/AndroidManifest.xml similarity index 94% rename from qtBuildSystem/Mu/android-resources/AndroidManifest.xml rename to qtBuildSystem/Mu/android/AndroidManifest.xml index 9defd1d..dd8d540 100644 --- a/qtBuildSystem/Mu/android-resources/AndroidManifest.xml +++ b/qtBuildSystem/Mu/android/AndroidManifest.xml @@ -17,15 +17,15 @@ - + - + - - - + + + @@ -70,15 +70,13 @@ - - - + - + - + diff --git a/qtBuildSystem/Mu/android/build.gradle b/qtBuildSystem/Mu/android/build.gradle new file mode 100644 index 0000000..3a3e0cd --- /dev/null +++ b/qtBuildSystem/Mu/android/build.gradle @@ -0,0 +1,57 @@ +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + } +} + +allprojects { + repositories { + jcenter() + } +} + +apply plugin: 'com.android.application' + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} + +android { + /******************************************************* + * The following variables: + * - androidBuildToolsVersion, + * - androidCompileSdkVersion + * - qt5AndroidDir - holds the path to qt android files + * needed to build any Qt application + * on Android. + * + * are defined in gradle.properties file. This file is + * updated by QtCreator and androiddeployqt tools. + * Changing them manually might break the compilation! + *******************************************************/ + + compileSdkVersion androidCompileSdkVersion.toInteger() + + buildToolsVersion androidBuildToolsVersion + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java'] + aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl'] + res.srcDirs = [qt5AndroidDir + '/res', 'res'] + resources.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + assets.srcDirs = ['assets'] + jniLibs.srcDirs = ['libs'] + } + } + + lintOptions { + abortOnError false + } +} diff --git a/qtBuildSystem/Mu/android/gradle.properties b/qtBuildSystem/Mu/android/gradle.properties new file mode 100644 index 0000000..916cde8 --- /dev/null +++ b/qtBuildSystem/Mu/android/gradle.properties @@ -0,0 +1,9 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +androidBuildToolsVersion=26.0.2 +androidCompileSdkVersion=26 +buildDir=.build +qt5AndroidDir=/Users/Hoppy/Qt/5.10.1/android_armv7/src/android/java diff --git a/qtBuildSystem/Mu/android/gradle.properties~ b/qtBuildSystem/Mu/android/gradle.properties~ new file mode 100644 index 0000000..916cde8 --- /dev/null +++ b/qtBuildSystem/Mu/android/gradle.properties~ @@ -0,0 +1,9 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +androidBuildToolsVersion=26.0.2 +androidCompileSdkVersion=26 +buildDir=.build +qt5AndroidDir=/Users/Hoppy/Qt/5.10.1/android_armv7/src/android/java diff --git a/qtBuildSystem/Mu/android/gradle/wrapper/gradle-wrapper.jar b/qtBuildSystem/Mu/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..2b338a9 Binary files /dev/null and b/qtBuildSystem/Mu/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/qtBuildSystem/Mu/android/gradle/wrapper/gradle-wrapper.properties b/qtBuildSystem/Mu/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..4244097 --- /dev/null +++ b/qtBuildSystem/Mu/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Feb 20 10:43:22 EST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip diff --git a/qtBuildSystem/Mu/android/gradlew b/qtBuildSystem/Mu/android/gradlew new file mode 100755 index 0000000..eeff5cc --- /dev/null +++ b/qtBuildSystem/Mu/android/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="-Xmx1024m -Dfile.encoding=UTF-8" + +# 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/qtBuildSystem/Mu/android/gradlew.bat b/qtBuildSystem/Mu/android/gradlew.bat new file mode 100644 index 0000000..65b35a4 --- /dev/null +++ b/qtBuildSystem/Mu/android/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=-Xmx1024m -Dfile.encoding=UTF-8 + +@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/qtBuildSystem/Mu/android/local.properties b/qtBuildSystem/Mu/android/local.properties new file mode 100644 index 0000000..e3f46c2 --- /dev/null +++ b/qtBuildSystem/Mu/android/local.properties @@ -0,0 +1,6 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +sdk.dir=/Volumes/compHDD/AndroidSDK/sdk diff --git a/qtBuildSystem/Mu/android/local.properties~ b/qtBuildSystem/Mu/android/local.properties~ new file mode 100644 index 0000000..e3f46c2 --- /dev/null +++ b/qtBuildSystem/Mu/android/local.properties~ @@ -0,0 +1,6 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +sdk.dir=/Volumes/compHDD/AndroidSDK/sdk diff --git a/qtBuildSystem/Mu/android-resources/res/drawable-hdpi/icon.png b/qtBuildSystem/Mu/android/res/drawable-hdpi/icon.png similarity index 100% rename from qtBuildSystem/Mu/android-resources/res/drawable-hdpi/icon.png rename to qtBuildSystem/Mu/android/res/drawable-hdpi/icon.png diff --git a/qtBuildSystem/Mu/android-resources/res/drawable-ldpi/icon.png b/qtBuildSystem/Mu/android/res/drawable-ldpi/icon.png similarity index 100% rename from qtBuildSystem/Mu/android-resources/res/drawable-ldpi/icon.png rename to qtBuildSystem/Mu/android/res/drawable-ldpi/icon.png diff --git a/qtBuildSystem/Mu/android-resources/res/drawable-mdpi/icon.png b/qtBuildSystem/Mu/android/res/drawable-mdpi/icon.png similarity index 100% rename from qtBuildSystem/Mu/android-resources/res/drawable-mdpi/icon.png rename to qtBuildSystem/Mu/android/res/drawable-mdpi/icon.png diff --git a/qtBuildSystem/Mu/android/res/values/libs.xml b/qtBuildSystem/Mu/android/res/values/libs.xml new file mode 100644 index 0000000..4009a77 --- /dev/null +++ b/qtBuildSystem/Mu/android/res/values/libs.xml @@ -0,0 +1,25 @@ + + + + https://download.qt.io/ministro/android/qt5/qt-5.9 + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/mainwindow.cpp b/qtBuildSystem/Mu/mainwindow.cpp index a599c03..7af7c63 100644 --- a/qtBuildSystem/Mu/mainwindow.cpp +++ b/qtBuildSystem/Mu/mainwindow.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include @@ -23,6 +25,7 @@ uint32_t screenWidth; uint32_t screenHeight; QSettings settings; +static bool extendedScreen; static QImage video; static QTimer* refreshDisplay; static HexViewer* emuStateBrowser; @@ -68,8 +71,12 @@ MainWindow::MainWindow(QWidget* parent) : emuOn = false; emuInited = false; + + /* screenWidth = 160; screenHeight = 160 + 60; + extendedScreen = false; + */ loadRom(); @@ -152,8 +159,8 @@ void MainWindow::updateDisplay(){ emulateFrame(); #endif - video = QImage((unsigned char*)palmFramebuffer, screenWidth, screenHeight, QImage::Format_RGB16);//16 bit - ui->display->setPixmap(QPixmap::fromImage(video).scaled(ui->display->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); + video = QImage(extendedScreen ? (uchar*)palmExtendedFramebuffer : (uchar*)palmFramebuffer, screenWidth, screenHeight, QImage::Format_RGB16); + ui->display->setPixmap(QPixmap::fromImage(video).scaled(QSize(ui->display->size().width() * 0.95, ui->display->size().height() * 0.95), Qt::KeepAspectRatio, Qt::SmoothTransformation)); ui->display->update(); emuMutex.unlock(); } @@ -200,34 +207,6 @@ void MainWindow::on_notes_released(){ palmInput.buttonNotes = false; } -//ui buttons -void MainWindow::on_mainLeft_clicked(){ - ui->controlPanel->setCurrentWidget(ui->controlPanel->widget(2)); -} - -void MainWindow::on_mainRight_clicked(){ - ui->controlPanel->setCurrentWidget(ui->controlPanel->widget(1)); -} - -void MainWindow::on_settingsLeft_clicked(){ - ui->controlPanel->setCurrentWidget(ui->controlPanel->widget(0)); -} - -void MainWindow::on_settingsRight_clicked(){ - ui->controlPanel->setCurrentWidget(ui->controlPanel->widget(2)); -} - -void MainWindow::on_joyLeft_clicked(){ - ui->controlPanel->setCurrentWidget(ui->controlPanel->widget(1)); -} - -void MainWindow::on_joyRight_clicked(){ - ui->controlPanel->setCurrentWidget(ui->controlPanel->widget(0)); -} - -void MainWindow::on_settings_clicked(){ - //setprocess(SETUP); -} //emu control void MainWindow::on_ctrlBtn_clicked(){ @@ -236,6 +215,17 @@ void MainWindow::on_ctrlBtn_clicked(){ //start emu uint32_t error = emulatorInit(romBuffer, NULL/*bootloader*/, FEATURE_ACCURATE); if(error == EMU_ERROR_NONE){ + if(palmExtendedFramebuffer != NULL){ + screenWidth = 320; + screenHeight = 320 + 120; + extendedScreen = true; + } + else{ + screenWidth = 160; + screenHeight = 160 + 60; + extendedScreen = false; + } + emuInited = true; emuOn = true; ui->ctrlBtn->setText("Pause"); diff --git a/qtBuildSystem/Mu/mainwindow.h b/qtBuildSystem/Mu/mainwindow.h index 4a5665d..16b7be1 100644 --- a/qtBuildSystem/Mu/mainwindow.h +++ b/qtBuildSystem/Mu/mainwindow.h @@ -42,15 +42,6 @@ private slots: void on_notes_pressed(); void on_notes_released(); - //ui buttons - void on_mainLeft_clicked(); - void on_mainRight_clicked(); - void on_settingsLeft_clicked(); - void on_settingsRight_clicked(); - void on_joyLeft_clicked(); - void on_joyRight_clicked(); - void on_settings_clicked(); - void on_ctrlBtn_clicked(); void on_hexViewer_clicked(); diff --git a/qtBuildSystem/Mu/mainwindow.ui b/qtBuildSystem/Mu/mainwindow.ui index f489ae7..d40c599 100644 --- a/qtBuildSystem/Mu/mainwindow.ui +++ b/qtBuildSystem/Mu/mainwindow.ui @@ -6,28 +6,16 @@ 0 0 - 574 - 678 + 438 + 393 - - - 0 - 0 - - Mu - - - 0 - 0 - - - + @@ -35,408 +23,266 @@ 0 - - - 320 - 320 - - - - - 0 - 0 - - - - CrossCursor - QFrame::WinPanel QFrame::Raised - - 1 - - - - - - false - Qt::AlignCenter - - + + true - + 0 0 - - - 0 - 0 - - - - 0 - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/up.png:/buttons/images/up.png - - - - - - - - 0 - 0 - - - - L - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/calender.png:/buttons/images/calender.png - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/right.png:/buttons/images/right.png - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/left.png:/buttons/images/left.png - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - :/buttons/images/toDo.png:/buttons/images/toDo.png - - - false - - - false - - - false - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/notes.png:/buttons/images/notes.png - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/down.png:/buttons/images/down.png - - - - - - - - 0 - 0 - - - - R - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/addressBook.png:/buttons/images/addressBook.png - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/power.png:/buttons/images/power.png - - - - - - - - 0 - 0 - - - - - - - - :/buttons/images/center.png:/buttons/images/center.png - - - - - - - false - - - - 0 - 0 - - - - ctrl_btn - - - - - - - true - - - - 0 - 0 - - - - HexViewer - - - - - - - - 0 - 0 - - - - Screenshot - - - - - - - - - - - - 0 - 0 - - - - Install App or Database - - - - - - - - 0 - 0 - - - - L - - - - - - - - 0 - 0 - - - - Settings - - - - - - - - 0 - 0 - - - - R - - - - - - - - - - - Center - - - - - - - R - - - - - - - L - - - - - + + + + + + 0 + 0 + + + + + + + + :/buttons/images/calender.png:/buttons/images/calender.png + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/down.png:/buttons/images/down.png + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/up.png:/buttons/images/up.png + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/addressBook.png:/buttons/images/addressBook.png + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/right.png:/buttons/images/right.png + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/center.png:/buttons/images/center.png + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + :/buttons/images/toDo.png:/buttons/images/toDo.png + + + false + + + false + + + false + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/power.png:/buttons/images/power.png + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/notes.png:/buttons/images/notes.png + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/left.png:/buttons/images/left.png + + + + + + + false + + + + 0 + 0 + + + + ctrl_btn + + + + + + + + 0 + 0 + + + + Screenshot + + + + + + + true + + + + 0 + 0 + + + + HexViewer + + + + diff --git a/qtBuildSystem/Mu/touchscreen.cpp b/qtBuildSystem/Mu/touchscreen.cpp index dd84f17..b0068ba 100644 --- a/qtBuildSystem/Mu/touchscreen.cpp +++ b/qtBuildSystem/Mu/touchscreen.cpp @@ -2,7 +2,7 @@ #include "mainwindow.h" #include "src/emulator.h" -float rangeSwap(float newRange, float oldRange, float value){ +static inline float rangeSwap(float newRange, float oldRange, float value){ return value / oldRange * newRange; } diff --git a/src/emulator.c b/src/emulator.c index 2a2ac70..8b3f113 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -218,7 +218,12 @@ uint32_t emulatorInit(uint8_t* palmRomDump, uint8_t* palmBootDump, uint32_t spec memcpy(palmReg + REG_SIZE - 1 - BOOTLOADER_SIZE, palmBootDump, BOOTLOADER_SIZE); else memset(palmReg + REG_SIZE - 1 - BOOTLOADER_SIZE, 0x00, BOOTLOADER_SIZE); + memset(palmFramebuffer, 0x00, 160 * 160 * sizeof(uint16_t)); memcpy(&palmFramebuffer[160 * 160], silkscreenData, SILKSCREEN_WIDTH * SILKSCREEN_HEIGHT * (SILKSCREEN_BPP / 8)); + if(palmExtendedFramebuffer != NULL){ + memset(palmExtendedFramebuffer, 0x00, 320 * 320 * sizeof(uint16_t)); + //add 320*320 silkscreen image later, 2xBRZ should be able to make 320*320 version of the 160*160 silkscreen + } resetAddressSpace(); sed1376Reset(); sdCardInit(); diff --git a/unimplementedFeatures.txt b/unimplementedFeatures.txt index a52b15f..8568712 100644 --- a/unimplementedFeatures.txt +++ b/unimplementedFeatures.txt @@ -1,3 +1,6 @@ +Emulator wrapper: +add 320*320 frame buffer silkscreen, 2xBRZ should be able to make 320*320 version of the 160*160 silkscreen + CPU: sysTrapPceNativeCall, ARM Emulator CPU32 table lookup opcodes