patrickmeehan/moai-dev — pull request #6 by timfuqua (2014-10-22 22:59:30+00:00)
Title: Checkin to get Slots Tycoon building. Still not running yet, but it's a ...

...lot of progress.

ant/libmoai/jni/Android.mk
* Adding libmoai-android to LOCAL_STATIC_LIBRARIES.

ant/libmoai/modules/moai-android.mk
* Renaming LOCAL_MODULE from "host-android" to "moai-android". Was causing moai-android to not be included in the shared object file.

src/host-modules/aku_modules.h
* Adding include of moai-core/host.h for different "AKU" function definitions.

src/moai-android/JniUtils.cpp
* Everything else in the constructor was commented out, so the assert was commented out as well, for now.

src/moai-android/LinearLayoutIMETrap.java
* Bad merge wrt back button pressed behavior. Commenting out for now.

src/moai-android/moai.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.
* Moving the AKUAppInitialize function to the top so that it's alphabetically in the right place.

src/moai-android/Moai.java
* Adding a missing import for Locale.
* Adding MoaiKeyboard and MoaiMoviePlayer to the list of external classes.
* Removing the MoaiMoviePlayer.onCreate call from the Moai.onCreate function, as it now is taken care of in the for loop.
* Adding the call to AkuAppInitialize() in the Moai.onCreate function.
* Re-adding the setScreenDpi function, as it was missed by a bad merge.

src/moai-android/MoaiActivity.java
* Fixing type in Moai.setWorkingDirectory(). "bundle/assets" was redundant as it's already included in the @WORKING_DIR@ var.
* @RUN_COMMAND@ removed and replaced with 2 Moai.runScript calls. The call to run ../init.lua wasn't working properly, but might not be needed anymore, so commenting out for now. Running bootstrap.lue needed.

src/moai-android/MOAIAppAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android/MOAIBillingAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android/MOAIDialogAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android/MOAIKeyboardAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android/MOAIMoviePlayerAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android/MOAINotificationsAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android/MoaiView.java
* Missing imports for Configuration, Resources and Display Metrics.
* Moving the AKU_UPDATE_FREQUENCY var to the top of the list of members, because its a const.
* Re-adding mAppContext. Was deleted via a bad merge.
* Re-adding the initializing of mAppContext in the MoaiView constructor.

src/moai-android-adcolony/MOAIAdColonyAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-chartboost/MOAIChartBoostAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-facebook/MOAIFacebookAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-google-play-services/MOAIGooglePlayServicesAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-tapjoy/MOAITapjoyAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-tstore/MOAITstoreGamecenterAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-tstore/MOAITstoreWallAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-twitter/MOAITwitterAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

src/moai-android-vungle/MOAIVungleAndroid.cpp
* Adding JNIEXPORT and JNICALL to all extern "C" function return types. Changing some return types to their "j" types as needed.

util/ant-host.lua
* Changing ANDROID_PLATFORM_TARGET from id 10 to "android-17". The id number is a moving target value based on the number of sdk platforms you currently have installed, so it doesn't point at a static platform. "android-17" does, which is 4.2.2.
* Removing duplicate entries of LUA_WORKING_DIR and LUA_MAIN.

util/ant-host/config.lua
* Adding ANDROID_PLATFORM_TARGET var