Added SDL_image support

Author: pvallet

CMakeLists.txt

@@ -6,11 +6,15 @@ set(SOURCE_FILES src/main.cpp)
 set(SDL_LOCATION ${CMAKE_SOURCE_DIR}/external/SDL2)
 
 add_library( SDL2 SHARED IMPORTED )
+add_library( SDL2_image SHARED IMPORTED )
 set_target_properties(SDL2 PROPERTIES IMPORTED_LOCATION
 ${DISTRIBUTION_DIR}/${ANDROID_BUILD_DIR}/obj/local/${ANDROID_ABI}/libSDL2.so)
+set_target_properties(SDL2_image PROPERTIES IMPORTED_LOCATION
+${DISTRIBUTION_DIR}/${ANDROID_BUILD_DIR}/obj/local/${ANDROID_ABI}/libSDL2_image.so)
 
-include_directories(${SDL_LOCATION}/include)
+include_directories(${SDL_LOCATION}/SDL2/include)
+include_directories(${SDL_LOCATION}/SDL2_image)
 
-add_library( main SHARED ${SDL_LOCATION}/src/main/android/SDL_android_main.c ${SOURCE_FILES} )
+add_library( main SHARED ${SDL_LOCATION}/SDL2/src/main/android/SDL_android_main.c ${SOURCE_FILES} )
 
-target_link_libraries( main SDL2 )
+target_link_libraries( main SDL2 SDL2_image )

README.md

@@ -3,6 +3,7 @@
 ## Synopsis
 
 This project is an update of the hello world project here https://github.com/stephen47/android-sdl2-gradle-template, as I couldn't find a good way to integrate a CMake built C++ project to an android application.
+It features a sample hello world using SDL and SDL_image.
 
 ## Requirements
 - JDK and JRE 8
@@ -11,20 +12,24 @@ This project is an update of the hello world project here https://github.com/ste
 
 ## Downloading dependencies
 
-Download the latest source release from the SDL website:
+Download the latest source release from SDL and SDL_image websites:
 
 https://www.libsdl.org/download-2.0.php
+https://www.libsdl.org/projects/SDL_image/
 
-Unzip it, put the SDL2 folder in external and rename it to SDL2 so your project folder should look like this:
+Unzip it, put the SDL2-x.x.x and SDL2_image-x.x.x folders in `external/SDL2` and rename them to SDL2 and SDL2_image so your project folder looks like this:
 ```
 + android
 + external
 | + SDL2
+| | + Android.mk
+| | | SDL2
+| | | SDL2_image
 ```
 
 Then copy the java interface SDLActivity to the android project:
 ```
-cp external/SDL2/android-project/src/org/libsdl/app/SDLActivity.java android/app/src/main/java/org/libsdl/app/
+cp external/SDL2/SDL2/android-project/src/org/libsdl/app/SDLActivity.java android/app/src/main/java/org/libsdl/app/
 ```
 
 There, it's done!

android/app/src/main/assets/res

@@ -0,0 +1 @@
+../../../../../res/

android/app/src/main/java/pvallet/com/github/hello_sdl2/HelloSDL2Activity.java

@@ -1,6 +1,6 @@
 package pvallet.com.github.hello_sdl2;
 
-import org.libsdl.app.SDLActivity; 
+import org.libsdl.app.SDLActivity;
 
 public class HelloSDL2Activity extends SDLActivity
 {
@@ -17,6 +17,7 @@ public class HelloSDL2Activity extends SDLActivity
     protected String[] getLibraries() {
         return new String[]{
                 "SDL2",
+                "SDL2_image",
                 "main"
         };
     }

external/SDL2/Android.mk

@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)

res/hello.png

@@ -1,4 +1,5 @@
 #include <SDL.h>
+#include <SDL_image.h>
 #include <stdio.h>
 
 int main(int argc, char* argv[]) {
@@ -41,14 +42,18 @@ int main(int argc, char* argv[]) {
     SDL_Rect r;
     r.x = 50;
     r.y = 50;
-    r.w = 50;
-    r.h = 50;
+    r.w = 500;
+    r.h = 500;
 
     // Set render color to blue ( rect will be rendered in this color )
     SDL_SetRenderDrawColor( renderer, 0, 0, 255, 255 );
 
-    // Render rect
-    SDL_RenderFillRect( renderer, &r );
+    // Render image
+    SDL_Surface *loadedImage = IMG_Load("res/hello.png");
+    SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, loadedImage);
+    SDL_FreeSurface(loadedImage);
+
+    SDL_RenderCopy(renderer, texture, NULL, &r);
 
     // Render the rect to the screen
     SDL_RenderPresent(renderer);