mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-07 03:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127 from victorfisac/develop

Browse Source 
Fix Android template with 1.5 raylib features (audio streaming, gestures)
This commit is contained in:
Ray
2016-06-09 23:27:50 +02:00
parent e2cfc6b838 cbda329bfd
commit fb90477354
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/android_project/jni/Android.mk
View File

@@ -83,7 +83,7 @@ LOCAL_SRC_FILES := basic_game.c
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include
# Required flags for compilation: defines PLATFORM_ANDROID # Required flags for compilation: defines PLATFORM_ANDROID
LOCAL_CFLAGS := -Wall -std=c99 -g -DPLATFORM_ANDROID LOCAL_CFLAGS := -Wall -std=c99 -DPLATFORM_ANDROID
# Linker required libraries (not many...) # Linker required libraries (not many...)
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2 -lOpenSLES LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2 -lOpenSLES

10
templates/android_project/jni/basic_game.c
View File

@@ -43,7 +43,7 @@ void android_main(struct android_app *app)
int framesCounter = 0; // Used to count frames int framesCounter = 0; // Used to count frames
PlayMusicStream("ambient.ogg"); PlayMusicStream(0, "ambient.ogg");
SetTargetFPS(60); // Not required on Android, already locked to 60 fps SetTargetFPS(60); // Not required on Android, already locked to 60 fps
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ void android_main(struct android_app *app)
{ {
// Update // Update
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
UpdateMusicStream(); UpdateMusicStream(0);
switch(currentScreen) switch(currentScreen)
{ {
@@ -74,7 +74,7 @@ void android_main(struct android_app *app)
// TODO: Update TITLE screen variables here! // TODO: Update TITLE screen variables here!
// Press enter to change to GAMEPLAY screen // Press enter to change to GAMEPLAY screen
if (GetGestureType() == GESTURE_TAP) if (IsGestureDetected(GESTURE_TAP))
{ {
PlaySound(fx); PlaySound(fx);
currentScreen = GAMEPLAY; currentScreen = GAMEPLAY;
@@ -85,7 +85,7 @@ void android_main(struct android_app *app)
// TODO: Update GAMEPLAY screen variables here! // TODO: Update GAMEPLAY screen variables here!
// Press enter to change to ENDING screen // Press enter to change to ENDING screen
if (GetGestureType() == GESTURE_TAP) if (IsGestureDetected(GESTURE_TAP))
{ {
PlaySound(fx); PlaySound(fx);
currentScreen = ENDING; currentScreen = ENDING;
@@ -96,7 +96,7 @@ void android_main(struct android_app *app)
// TODO: Update ENDING screen variables here! // TODO: Update ENDING screen variables here!
// Press enter to return to TITLE screen // Press enter to return to TITLE screen
if (GetGestureType() == GESTURE_TAP) if (IsGestureDetected(GESTURE_TAP))
{ {
PlaySound(fx); PlaySound(fx);
currentScreen = TITLE; currentScreen = TITLE;