Skip to content
Browse files

Merge pull request #4 from qnestor/master

Updated Java import and SDL reference to fix build process
  • Loading branch information...
2 parents 6a16baf + d5ff9d0 commit cf140848d35889b37784f55cac7defaa5c0098f9 @bradallred bradallred committed Aug 6, 2013
Showing with 5 additions and 5 deletions.
  1. +1 −1 android/GEMRB_Android.mk
  2. +2 −2 android/GemRB.java
  3. +2 −2 android/prep_env.sh
View
2 android/GEMRB_Android.mk
@@ -236,7 +236,7 @@ LOCAL_SRC_FILES := main/gemrb/plugins/SAVImporter/SAVImporter.cpp \
main/gemrb/core/Palette.cpp \
main/gemrb/core/System/swab.c \
main/gemrb/GemRB.cpp \
- ../SDL/src/main/android/SDL_android_main.cpp \
+ ../SDL/src/main/android/SDL_android_main.c \
# main/gemrb/plugins/SDLAudio/SDLAudio.cpp \
LOCAL_SHARED_LIBRARIES := SDL2 openal ogg vorbis python
View
4 android/GemRB.java
@@ -22,7 +22,7 @@
import android.widget.EditText;
import android.content.DialogInterface;
import android.content.res.Configuration;
-import android.content.Environment;
+import android.os.Environment;
public class GemRB extends SDLActivity {
@@ -49,7 +49,7 @@ protected void onCreate(Bundle savedInstanceState) {
Log.d("GemRB Activity", "Checking GemRB.cfg content.");
File finalConfFile = new File(gemrbHomeFolder.getAbsolutePath().concat(gemrbHomeFolder.separator).concat("GemRB.cfg"));
- File userSuppliedConfig = new File(Environment.getExternalStorageDirectory().concat(gemrbHomeFolder.separator).concat("GemRB.cfg"));
+ File userSuppliedConfig = new File(Environment.getExternalStorageDirectory().getAbsolutePath().concat(gemrbHomeFolder.separator).concat("GemRB.cfg"));
if(!finalConfFile.exists()) {
Log.d("GemRB Activity", "GemRB.cfg doesn't exist in the expected location, creating it from the packaged template.");
View
4 android/prep_env.sh
@@ -153,8 +153,8 @@ function move_and_edit_projectfiles {
sed -i -e 's,sdlFormat = 0x8,sdlFormat = 0x1,g' "$ENVROOT/build/gemrb/src/org/libsdl/app/SDLActivity.java" &&
- sed -i -e 's,SDL_app,GemRB,' "$ENVROOT/build/gemrb/jni/SDL/src/main/android/SDL_android_main.cpp" &&
- sed -i -e 's,//exit,exit,' "$ENVROOT/build/gemrb/jni/SDL/src/main/android/SDL_android_main.cpp" &&
+ sed -i -e 's,SDL_app,GemRB,' "$ENVROOT/build/gemrb/jni/SDL/src/main/android/SDL_android_main.c" &&
+ sed -i -e 's,//exit,exit,' "$ENVROOT/build/gemrb/jni/SDL/src/main/android/SDL_android_main.c" &&
# change activity class and application name, as well as enable debuggable
sed -i -e s,org.libsdl.app,net.sourceforge.gemrb, "$ENVROOT/build/gemrb/AndroidManifest.xml" &&

0 comments on commit cf14084

Please sign in to comment.
Something went wrong with that request. Please try again.