diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2018-03-10 17:35:00 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2018-03-10 17:35:00 +0000 |
| commit | 70e629b05d549a690b72c06916720c530b406da0 (patch) | |
| tree | 0de5eb8b9a7cf6e7cb3213128ab92d0e3cf1e36b | |
| parent | 329f43eaf7965e32c42cc79646e200dd5a1810ad (diff) | |
Android: finally taught AndroidStudio where the SVN root directory is
located. No more SVN from the command line.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12732 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | README.Android.txt | 4 | ||||
| -rw-r--r-- | ide/AndroidStudio3/settings.gradle | 3 | ||||
| -rw-r--r-- | src/drivers/Android/Fl_Android_Graphics_Driver.cxx | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/README.Android.txt b/README.Android.txt index ccba2c480..e31811766 100644 --- a/README.Android.txt +++ b/README.Android.txt @@ -23,8 +23,8 @@ AndroidStudio for the first time, use the IDE to download and build the FLTK will be installed. Once Native Plasm runs on your emulator or physical device, you are ready to install FLTK. -- if your host machine runs MSWindows, unzip the file - "ide/AndroidStudio3/gradlew.zip" first +- if your host machine runs MSWindows, rename the file + "ide/AndroidStudio3/gradlew.rename_to_bat" to "gradlew.bat" first - open the "ide/AndroidStudio3/" directory as a project in AndroidStudio diff --git a/ide/AndroidStudio3/settings.gradle b/ide/AndroidStudio3/settings.gradle index e7b4def49..c428c84b6 100644 --- a/ide/AndroidStudio3/settings.gradle +++ b/ide/AndroidStudio3/settings.gradle @@ -1 +1,4 @@ include ':app' + +include ':FLTK' +project(':FLTK').projectDir = new File('../../') diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx index b71f1adbb..3147c761e 100644 --- a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx +++ b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx @@ -55,7 +55,6 @@ static uint16_t make565(Fl_Color crgba) void Fl_Android_Graphics_Driver::rectf_unscaled(float x, float y, float w, float h) { if (pWindowRegion) { - Fl_Android_Application::log_w("rectf %g %g %g %g", x, y, w, h); Fl_Rect_Region r(x, y, w, h); if (r.intersect_with(pWindowRegion)) { rectf_unclipped(r.x(), r.y(), r.w(), r.h()); |