Added BasiliskII subproject, added on-screen keyboard sources to Gimp, added safety checks to Guichan-TTF.

This commit is contained in:
pelya
2015-01-03 21:59:53 +02:00
parent 65c90eda88
commit 508749b9b7
28 changed files with 13 additions and 1 deletions
+3
View File
@@ -62,3 +62,6 @@
[submodule "project/jni/application/uae4all2"]
path = project/jni/application/uae4all2
url = git@github.com:lubomyr/uae4all2.git
[submodule "project/jni/application/basiliskii/basiliskii"]
path = project/jni/application/basiliskii/basiliskii
url = git@github.com:pelya/BasiliskII-android.git
@@ -6,4 +6,5 @@ cd $SECURE_STORAGE_DIR
rm -f $UNSECURE_STORAGE_DIR/data-1.tar.gz
cd $SECURE_STORAGE_DIR/img
echo "Installation path: $SECURE_STORAGE_DIR/img"
ls -l $SECURE_STORAGE_DIR/img
./postinstall.sh
Binary file not shown.

After

Width:  |  Height:  |  Size: 830 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 677 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 728 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 639 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 711 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 970 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 556 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 632 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 595 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

@@ -83,6 +83,11 @@ namespace gcn
int SDLTrueTypeFont::getWidth(const std::string& text) const
{
int w, h;
if (text.size() == 0)
{
__android_log_print(ANDROID_LOG_INFO, "GUICHAN", "SDLTrueTypeFont::getWidth(): empty text string");
return 0;
}
TTF_SizeText(mFont, text.c_str(), &w, &h);
return w;
@@ -95,8 +100,9 @@ namespace gcn
void SDLTrueTypeFont::drawString(gcn::Graphics* graphics, const std::string& text, const int x, const int y)
{
if (text == "")
if (text.size() == 0 || getWidth(text) == 0)
{
__android_log_print(ANDROID_LOG_INFO, "GUICHAN", "SDLTrueTypeFont::drawString(): empty text string: '%s'", text.c_str());
return;
}
@@ -104,6 +110,7 @@ namespace gcn
if (sdlGraphics == NULL)
{
__android_log_print(ANDROID_LOG_INFO, "GUICHAN", "SDLTrueTypeFont::drawString(): Graphics object not an SDL graphics object!");
throw GCN_EXCEPTION("SDLTrueTypeFont::drawString. Graphics object not an SDL graphics object!");
return;
}