diff --git a/project/javaSDL2/MainActivity.java b/project/javaSDL2/MainActivity.java index f5263b50f..97558ccdf 100644 --- a/project/javaSDL2/MainActivity.java +++ b/project/javaSDL2/MainActivity.java @@ -85,6 +85,12 @@ import android.util.Log; public class MainActivity extends SDLActivity { + + // Load the .so + static { + System.loadLibrary("sdl_native_helpers"); + } + @Override protected void onCreate(Bundle savedInstanceState) { @@ -153,10 +159,10 @@ public class MainActivity extends SDLActivity img.setImageResource(R.drawable.publisherlogo); } img.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); - _layout.addView(img); + _layout.addView(img);*/ //_videoLayout = new FrameLayout(this); - _videoLayout.addView(_layout);*/ + //_videoLayout.addView(_layout); /*_ad = new Advertisement(this); if( _ad.getView() != null ) @@ -1138,8 +1144,8 @@ public class MainActivity extends SDLActivity private TextView _tv = null; private Button _btn = null; - //private LinearLayout _layout = null; - //private LinearLayout _layout2 = null; + private LinearLayout _layout = null; + private LinearLayout _layout2 = null; private Advertisement _ad = null; private FrameLayout _videoLayout = null; diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 1bcbadd1e..5b13939a9 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 1bcbadd1eadd735235288463239c348f5b58f845 +Subproject commit 5b13939a9f047ad7878825a4dfb19b439d69fa6b