sdl2: start sdl2 integration (more exploration about how we can integrate it.)

tito · tito · commit 11b6f774492d · 2013-10-18T01:45:16.000+02:00
diff --git a/recipes/android/recipe.sh b/recipes/android/recipe.sh
@@ -2,7 +2,8 @@
 
 VERSION_android=
 URL_android=
-DEPS_android=(pygame)
+DEPS_android=
+DEPS_OPTIONAL_android=(sdl sdl2)
 MD5_android=
 BUILD_android=$BUILD_PATH/android/android
 RECIPE_android=$RECIPES_PATH/android
diff --git a/recipes/kivy/recipe.sh b/recipes/kivy/recipe.sh
@@ -2,7 +2,8 @@
 
 VERSION_kivy=${VERSION_kivy:-stable}
 URL_kivy=https://github.com/kivy/kivy/zipball/$VERSION_kivy/kivy-$VERSION_kivy.zip
-DEPS_kivy=(pygame pyjnius android)
+DEPS_kivy=(pyjnius android)
+DEPS_OPTIONAL_kivy=(pygame sdl2)
 MD5_kivy=
 BUILD_kivy=$BUILD_PATH/kivy/$(get_directory $URL_kivy)
 RECIPE_kivy=$RECIPES_PATH/kivy
@@ -23,6 +24,29 @@ function build_kivy() {
 	export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
 	export LDSHARED="$LIBLINK"
 
+	# sdl2 activated ?
+	if [ "X$BUILD_sdl2" != "X" ]; then
+		debug "Active flags for SDL2"
+		export USE_SDL2=1
+		export CFLAGS="$CFLAGS -I$BUILD_sdl2/include/"
+		export LDFLAGS="$LDFLAGS -L$BUILD_sdl2/"
+	fi
+	if [ "X$BUILD_sdl2_image" != "X" ]; then
+		debug "Active flags for SDL2_image"
+		export CFLAGS="$CFLAGS -I$BUILD_sdl2_image/"
+		export LDFLAGS="$LDFLAGS -L$BUILD_sdl2_image/"
+	fi
+	if [ "X$BUILD_sdl2_ttf" != "X" ]; then
+		debug "Active flags for SDL2_ttf"
+		export CFLAGS="$CFLAGS -I$BUILD_sdl2_ttf/"
+		export LDFLAGS="$LDFLAGS -L$BUILD_sdl2_ttf/"
+	fi
+	if [ "X$BUILD_sdl2_mixer" != "X" ]; then
+		debug "Active flags for SDL2_mixer"
+		export CFLAGS="$CFLAGS -I$BUILD_sdl2_mixer/"
+		export LDFLAGS="$LDFLAGS -L$BUILD_sdl2_mixer/"
+	fi
+
 	# fake try to be able to cythonize generated files
 	$BUILD_PATH/python-install/bin/python.host setup.py build_ext
 	try find . -iname '*.pyx' -exec cython {} \;
diff --git a/recipes/pyjnius/recipe.sh b/recipes/pyjnius/recipe.sh
@@ -2,7 +2,8 @@
 
 VERSION_pyjnius=${VERSION_pyjnius:-master}
 URL_pyjnius=https://github.com/kivy/pyjnius/zipball/$VERSION_pyjnius/pyjnius-$VERSION_pyjnius.zip
-DEPS_pyjnius=(python sdl)
+DEPS_pyjnius=(python)
+DEPS_OPTIONAL_pyjnius=(sdl sdl2)
 MD5_pyjnius=
 BUILD_pyjnius=$BUILD_PATH/pyjnius/$(get_directory $URL_pyjnius)
 RECIPE_pyjnius=$RECIPES_PATH/pyjnius
@@ -13,8 +14,7 @@ function prebuild_pyjnius() {
 
 function build_pyjnius() {
 	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/jnius" ]; then
-		#return
-		true
+		return
 	fi
 
 	cd $BUILD_pyjnius
diff --git a/recipes/sdl2/recipe.sh b/recipes/sdl2/recipe.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+VERSION_sdl2=2.0.0
+URL_sdl2=http://www.libsdl.org/release/SDL2-$VERSION_sdl2.tar.gz
+MD5_sdl2=
+DEPS_sdl2=()
+BUILD_sdl2=$BUILD_PATH/sdl2/SDL2-$VERSION_sdl2
+RECIPE_sdl2=$RECIPES_PATH/sdl2
+
+function prebuild_sdl2() {
+	true
+}
+
+function build_sdl2() {
+	cd $SRC_PATH/jni
+	ln -s $BUILD_sdl2 sdl2
+
+	push_arm
+	try ndk-build V=1 SDL2 application
+	pop_arm
+
+	try cp -a $SRC_PATH/obj/local/$ARCH/*.so $LIBS_PATH
+}
+
+function postbuild_sdl2() {
+	true
+}
diff --git a/recipes/sdl2_image/recipe.sh b/recipes/sdl2_image/recipe.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+VERSION_sdl2_image=2.0.0
+URL_sdl2_image=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-$VERSION_sdl2_image.tar.gz
+MD5_sdl2_image=
+DEPS_sdl2_image=(sdl2)
+BUILD_sdl2_image=$BUILD_PATH/sdl2_image/SDL2_image-$VERSION_sdl2_image
+RECIPE_sdl2_image=$RECIPES_PATH/sdl2_image
+
+function prebuild_sdl2_image() {
+	true
+}
+
+function build_sdl2_image() {
+	cd $SRC_PATH/jni
+	ln -s $BUILD_sdl2_image sdl2_image
+
+	push_arm
+	try ndk-build V=1 SDL2_image SUPPORT_WEBP=false
+	pop_arm
+
+	try cp -a $SRC_PATH/obj/local/$ARCH/*.so $LIBS_PATH
+}
+
+function postbuild_sdl2_image() {
+	true
+}
diff --git a/recipes/sdl2_mixer/recipe.sh b/recipes/sdl2_mixer/recipe.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+VERSION_sdl2_mixer=2.0.0
+URL_sdl2_mixer=http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-$VERSION_sdl2_mixer.tar.gz
+MD5_sdl2_mixer=
+DEPS_sdl2_mixer=(sdl2)
+BUILD_sdl2_mixer=$BUILD_PATH/sdl2_mixer/SDL2_mixer-$VERSION_sdl2_mixer
+RECIPE_sdl2_mixer=$RECIPES_PATH/sdl2_mixer
+
+function prebuild_sdl2_mixer() {
+	true
+}
+
+function build_sdl2_mixer() {
+	cd $SRC_PATH/jni
+	ln -s $BUILD_sdl2_mixer sdl2_mixer
+
+	push_arm
+	try ndk-build V=1 SDL2_mixer \
+		SUPPORT_MOD_MODPLUG=false \
+		SUPPORT_MOD_MIKMOD=false \
+		SUPPORT_MP3_SMPEG=false
+	pop_arm
+
+	try cp -a $SRC_PATH/obj/local/$ARCH/*.so $LIBS_PATH
+}
+
+function postbuild_sdl2_mixer() {
+	true
+}
diff --git a/recipes/sdl2_ttf/recipe.sh b/recipes/sdl2_ttf/recipe.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+VERSION_sdl2_ttf=2.0.12
+URL_sdl2_ttf=http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$VERSION_sdl2_ttf.tar.gz
+MD5_sdl2_ttf=
+DEPS_sdl2_ttf=(sdl2)
+BUILD_sdl2_ttf=$BUILD_PATH/sdl2_ttf/SDL2_ttf-$VERSION_sdl2_ttf
+RECIPE_sdl2_ttf=$RECIPES_PATH/SDL2_ttf
+
+function prebuild_sdl2_ttf() {
+	true
+}
+
+function build_sdl2_ttf() {
+	cd $SRC_PATH/jni
+	ln -s $BUILD_sdl2_ttf sdl2_ttf
+
+	push_arm
+	try ndk-build V=1 SDL2_ttf
+	pop_arm
+
+	try cp -a $SRC_PATH/obj/local/$ARCH/*.so $LIBS_PATH
+}
+
+function postbuild_sdl2_ttf() {
+	true
+}
diff --git a/src/jni/application/Android.mk b/src/jni/application/Android.mk
@@ -4,18 +4,11 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := application
 
-APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src/ -type d))
-
 LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/../sdl/include \
-				-I$(LOCAL_PATH)/../sdl_mixer \
-				-I$(LOCAL_PATH)/../sdl_image \
-				-I$(LOCAL_PATH)/../sdl_ttf \
-				-I$(LOCAL_PATH)/../sdl_net \
-				-I$(LOCAL_PATH)/../sdl_blitpool \
-				-I$(LOCAL_PATH)/../sdl_gfx \
-				-I$(LOCAL_PATH)/../png \
-				-I$(LOCAL_PATH)/../jpeg \
+				-I$(LOCAL_PATH)/../SDL2/include \
+				-I$(LOCAL_PATH)/../SDL2_mixer \
+				-I$(LOCAL_PATH)/../SDL2_image \
+				-I$(LOCAL_PATH)/../SDL2_ttf \
 				-I$(LOCAL_PATH)/../intl \
 				-I$(LOCAL_PATH)/.. \
 				-I$(LOCAL_PATH)/../../../build/python-install/include/python2.7
@@ -26,39 +19,10 @@ LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
 #Change C++ file extension as appropriate
 LOCAL_CPP_EXTENSION := .cpp
 
-LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
-# Uncomment to also add C sources
-LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
-
-LOCAL_SHARED_LIBRARIES := sdl $(COMPILED_LIBRARIES)
-
+LOCAL_SRC_FILES := ../sdl2/src/main/android/SDL_android_main.c src/start.c
+LOCAL_SHARED_LIBRARIES := SDL2
 LOCAL_STATIC_LIBRARIES := jpeg png
-
 LOCAL_LDLIBS := -lpython2.7 -lGLESv1_CM -ldl -llog -lz
-
-LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../build/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
-
-LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \
-	for f in $(LOCAL_PATH)/../../libs/$ARCH/*.so ; do \
-		if echo $$f | grep "libapplication[.]so" > /dev/null ; then \
-			continue ; \
-		fi ; \
-		if [ -e "$$f" ] ; then \
-			if nm -g $$f | cut -c 12- | egrep '.{128}' > /dev/null ; then \
-				echo $$f | grep -o 'lib[^/]*[.]so' ; \
-			fi ; \
-		fi ; \
-	done \
-) )
-
-ifneq "$(LIBS_WITH_LONG_SYMBOLS)" ""
-$(foreach F, $(LIBS_WITH_LONG_SYMBOLS), \
-$(info Library $(F): abusing symbol names are: \
-$(shell nm -g $(LOCAL_PATH)/../../libs/$ARCH/$(F) | cut -c 12- | egrep '.{128}' ) ) \
-$(info Library $(F) contains symbol names longer than 128 bytes, \
-YOUR CODE WILL DEADLOCK WITHOUT ANY WARNING when you'll access such function - \
-please make this library static to avoid problems. ) )
-$(error Detected libraries with too long symbol names. Remove all files under project/libs/$ARCH, make these libs static, and recompile)
-endif
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../build/python-install/lib
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -1,5 +1,11 @@
 package org.renpy.android;
 
+import org.libsdl.app.SDLActivity;
+
+public class PythonActivity extends SDLActivity {
+}
+
+/**
 import android.app.Activity;
 import android.content.Intent;
 import android.content.ActivityNotFoundException;
@@ -49,9 +55,6 @@
 public class PythonActivity extends Activity implements Runnable {
     private static String TAG = "Python";
 
-    // The audio thread for streaming audio...
-    private static AudioThread mAudioThread = null;
-
     // The SDLSurfaceView we contain.
     public static SDLSurfaceView mView = null;
     public static PythonActivity mActivity = null;
@@ -150,10 +153,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(mView);
     }
 
-    /**
-     * Show an error using a toast. (Only makes sense from non-UI
-     * threads.)
-     */
     public void toastError(final String msg) {
 
         final Activity thisActivity = this;
@@ -183,10 +182,6 @@ public void recursiveDelete(File f) {
     }
 
 
-    /**
-     * This determines if unpacking one the zip files included in
-     * the .apk is necessary. If it is, the zip file is unpacked.
-     */
     public void unpackData(final String resource, File target) {
 
         // The version of data in memory and on disk.
@@ -245,13 +240,13 @@ public void run() {
         unpackData("private", getFilesDir());
         unpackData("public", externalStorage);
 
-        System.loadLibrary("sdl");
-        System.loadLibrary("sdl_image");
-        System.loadLibrary("sdl_ttf");
-        System.loadLibrary("sdl_mixer");
+        System.loadLibrary("SDL2");
+        System.loadLibrary("SDL2_image");
+        System.loadLibrary("SDL2_ttf");
+        System.loadLibrary("SDL2_mixer");
         System.loadLibrary("python2.7");
         System.loadLibrary("application");
-        System.loadLibrary("sdl_main");
+		//System.loadLibrary("sdl_main");
 
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
@@ -269,11 +264,6 @@ public void run() {
         } catch(UnsatisfiedLinkError e) {
         }
 
-        if ( mAudioThread == null ) {
-            Log.i("python", "Starting audio thread");
-            mAudioThread = new AudioThread(this);
-        }
-
         runOnUiThread(new Runnable () {
             public void run() {
                 mView.start();
@@ -501,13 +491,6 @@ public void onRestoreTransactionsResponse(RestoreTransactions request,
         }
     }
 
-    /**
-     * If the database has not been initialized, we send a
-     * RESTORE_TRANSACTIONS request to Android Market to get the list of purchased items
-     * for this user. This happens if the application has just been installed
-     * or the user wiped data. We do not want to do this on every startup, rather, we want to do
-     * only when the database needs to be initialized.
-     */
     private void restoreDatabase() {
         SharedPreferences prefs = getPreferences(MODE_PRIVATE);
         boolean initialized = prefs.getBoolean(DB_INITIALIZED, false);
@@ -516,8 +499,6 @@ private void restoreDatabase() {
         }
     }
 
-    /** An array of product list entries for the products that can be purchased. */
-
     private enum Managed { MANAGED, UNMANAGED, SUBSCRIPTION }
 
 
@@ -622,4 +603,4 @@ static String billingGetPendingMessage() {
     }
 
 }
-
+**/
diff --git a/src/tools/biglink b/src/tools/biglink
@@ -29,6 +29,7 @@ for fn in sofiles:
     args.append(afn)
     with open(libsfn) as fd:
         data = fd.read()
+        print(libsfn, data)
         args.extend(data.split(" "))
 
 unique_args = [ ]
@@ -37,6 +38,8 @@ while args:
     if a in ('-L', ):
         continue
     if a not in unique_args:
+        if a == '-lsdl':
+            continue
         unique_args.insert(0, a)
 
 
