diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml index cadfa67a..587d1c6f 100644 --- a/Android/AndroidManifest.xml +++ b/Android/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Android/jni/apple2ix.mk b/Android/jni/apple2ix.mk index 60cf5e1f..0f8599e2 100644 --- a/Android/jni/apple2ix.mk +++ b/Android/jni/apple2ix.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -PACKAGE_IDENTIFIER := "org.deadc0de.apple2" +PACKAGE_IDENTIFIER := "org.deadc0de.apple2ix" PACKAGE_NAME := "apple2ix" COMMON_SOURCES_MK := $(LOCAL_PATH)/sources.mk include $(COMMON_SOURCES_MK) diff --git a/Android/jni/build.sh b/Android/jni/build.sh index 65fe4e04..afd819ec 100755 --- a/Android/jni/build.sh +++ b/Android/jni/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -package_id="org.deadc0de.apple2" +package_id="org.deadc0de.apple2ix" apple2_src_path=apple2ix-src glue_srcs="$apple2_src_path/disk.c $apple2_src_path/misc.c $apple2_src_path/display.c $apple2_src_path/vm.c $apple2_src_path/cpu-supp.c" do_load=0 diff --git a/Android/jni/jnihooks.c b/Android/jni/jnihooks.c index 4a690753..5222c7cd 100644 --- a/Android/jni/jnihooks.c +++ b/Android/jni/jnihooks.c @@ -14,14 +14,14 @@ #include "video/renderer.h" #include "androidkeys.h" -void Java_org_deadc0de_apple2_Apple2Activity_nativeOnCreate(JNIEnv *env, jobject obj, jstring j_dataDir) { +void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnCreate(JNIEnv *env, jobject obj, jstring j_dataDir) { const char *dataDir = (*env)->GetStringUTFChars(env, j_dataDir, 0); data_dir = strdup(dataDir); (*env)->ReleaseStringUTFChars(env, j_dataDir, dataDir); LOG("nativeOnCreate(%s)...", data_dir); } -void Java_org_deadc0de_apple2_Apple2Activity_nativeGraphicsInitialized(JNIEnv *env, jobject obj, jint width, jint height) { +void Java_org_deadc0de_apple2ix_Apple2Activity_nativeGraphicsInitialized(JNIEnv *env, jobject obj, jint width, jint height) { LOG("%s", "native graphicsInitialized..."); video_driver_reshape(width, height); #if !TESTING @@ -54,15 +54,15 @@ void Java_org_deadc0de_apple2_Apple2Activity_nativeGraphicsInitialized(JNIEnv *e #endif } -void Java_org_deadc0de_apple2_Apple2Activity_nativeOnResume(JNIEnv *env, jobject obj) { +void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnResume(JNIEnv *env, jobject obj) { LOG("%s", "native onResume..."); } -void Java_org_deadc0de_apple2_Apple2Activity_nativeOnPause(JNIEnv *env, jobject obj) { +void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnPause(JNIEnv *env, jobject obj) { LOG("%s", "native onPause..."); } -void Java_org_deadc0de_apple2_Apple2Activity_nativeRender(JNIEnv *env, jobject obj) { +void Java_org_deadc0de_apple2ix_Apple2Activity_nativeRender(JNIEnv *env, jobject obj) { c_keys_handle_input(-1, 0, 0); #if FPS_LOG @@ -87,13 +87,13 @@ void Java_org_deadc0de_apple2_Apple2Activity_nativeRender(JNIEnv *env, jobject o video_driver_render(); } -void Java_org_deadc0de_apple2_Apple2Activity_nativeOnKeyDown(JNIEnv *env, jobject obj, jint keyCode, jint metaState) { +void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnKeyDown(JNIEnv *env, jobject obj, jint keyCode, jint metaState) { #if !TESTING android_keycode_to_emulator(keyCode, metaState, true); #endif } -void Java_org_deadc0de_apple2_Apple2Activity_nativeOnKeyUp(JNIEnv *env, jobject obj, jint keyCode, jint metaState) { +void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnKeyUp(JNIEnv *env, jobject obj, jint keyCode, jint metaState) { #if !TESTING android_keycode_to_emulator(keyCode, metaState, false); #endif diff --git a/Android/jni/testcpu.mk b/Android/jni/testcpu.mk index b700e291..557323ca 100644 --- a/Android/jni/testcpu.mk +++ b/Android/jni/testcpu.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -PACKAGE_IDENTIFIER := "org.deadc0de.apple2" +PACKAGE_IDENTIFIER := "org.deadc0de.apple2ix" PACKAGE_NAME := "apple2ix" COMMON_SOURCES_MK := $(LOCAL_PATH)/sources.mk include $(COMMON_SOURCES_MK) diff --git a/Android/jni/testdisk.mk b/Android/jni/testdisk.mk index ca5f4fec..77b5125d 100644 --- a/Android/jni/testdisk.mk +++ b/Android/jni/testdisk.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -PACKAGE_IDENTIFIER := "org.deadc0de.apple2" +PACKAGE_IDENTIFIER := "org.deadc0de.apple2ix" PACKAGE_NAME := "apple2ix" COMMON_SOURCES_MK := $(LOCAL_PATH)/sources.mk include $(COMMON_SOURCES_MK) diff --git a/Android/jni/testdisplay.mk b/Android/jni/testdisplay.mk index f23e67ff..4c47b552 100644 --- a/Android/jni/testdisplay.mk +++ b/Android/jni/testdisplay.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -PACKAGE_IDENTIFIER := "org.deadc0de.apple2" +PACKAGE_IDENTIFIER := "org.deadc0de.apple2ix" PACKAGE_NAME := "apple2ix" COMMON_SOURCES_MK := $(LOCAL_PATH)/sources.mk include $(COMMON_SOURCES_MK) diff --git a/Android/jni/testvm.mk b/Android/jni/testvm.mk index 6169e16b..8f5d1807 100644 --- a/Android/jni/testvm.mk +++ b/Android/jni/testvm.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -PACKAGE_IDENTIFIER := "org.deadc0de.apple2" +PACKAGE_IDENTIFIER := "org.deadc0de.apple2ix" PACKAGE_NAME := "apple2ix" COMMON_SOURCES_MK := $(LOCAL_PATH)/sources.mk include $(COMMON_SOURCES_MK) diff --git a/Android/src/org/deadc0de/apple2/Apple2Activity.java b/Android/src/org/deadc0de/apple2/Apple2Activity.java index e578e5a3..6e9cf793 100644 --- a/Android/src/org/deadc0de/apple2/Apple2Activity.java +++ b/Android/src/org/deadc0de/apple2/Apple2Activity.java @@ -9,7 +9,7 @@ * */ -package org.deadc0de.apple2; +package org.deadc0de.apple2ix; import android.app.Activity; import android.content.Context; diff --git a/Android/src/org/deadc0de/apple2/Apple2View.java b/Android/src/org/deadc0de/apple2/Apple2View.java index 47f63f96..a2f8751e 100644 --- a/Android/src/org/deadc0de/apple2/Apple2View.java +++ b/Android/src/org/deadc0de/apple2/Apple2View.java @@ -13,7 +13,7 @@ * Sourced from AOSP "GL2JNI" sample code. */ -package org.deadc0de.apple2; +package org.deadc0de.apple2ix; import android.content.Context; import android.graphics.PixelFormat;