Compilation fix for android

android/jni/src/Android.mk

@@ -6,40 +6,45 @@ LOCAL_MODULE := main
 
 SDL_PATH := ../SDL2
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include ../../../liboggvorbis/include
 
 LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
 	../../../battle.c \
-	../../../global.c \
-	../../../map.c \
-	../../../res.c \
-	../../../ui.c \
 	../../../ending.c \
-	../../../input.c \
-	../../../rngplay.c \
-	../../../uibattle.c \
 	../../../fight.c \
-	../../../palcommon.c \
-	../../../scene.c \
-	../../../uigame.c \
 	../../../font.c \
-	../../../itemmenu.c \
-	../../../palette.c \
-	../../../script.c \
-	../../../util.c \
 	../../../game.c \
+	../../../getopt.c \
+	../../../global.c \
+	../../../input.c \
+	../../../itemmenu.c \
 	../../../magicmenu.c \
+	../../../main.c \
+	../../../map.c \
+	../../../mp3play.c \
+	../../../oggplay.c \
+	../../../palcommon.c \
+	../../../palette.c \
 	../../../play.c \
+	../../../resampler.c \
+	../../../res.c \
+	../../../rixplay.cpp \
+	../../../rngplay.c \
+	../../../scene.c \
+	../../../script.c \
 	../../../sound.c \
-	../../../video.c \
-	../../../getopt.c \
-	../../../main.c \
-	../../../private.c \
 	../../../text.c \
+	../../../ui.c \
+	../../../uibattle.c \
+	../../../uigame.c \
+	../../../util.c \
+	../../../video.c \
 	../../../yj1.c \
-	../../../rixplay.cpp \
 	../../../adplug/binfile.cpp \
 	../../../adplug/binio.cpp \
+	../../../adplug/dbemuopl.cpp \
+	../../../adplug/dbopl.cpp \
+	../../../adplug/demuopl.cpp \
 	../../../adplug/dosbox_opl.cpp \
 	../../../adplug/emuopl.cpp \
 	../../../adplug/fmopl.c \
@@ -57,7 +62,31 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
 	../../../libmad/music_mad.c \
 	../../../libmad/stream.c \
 	../../../libmad/synth.c \
-	../../../libmad/timer.c
+	../../../libmad/timer.c \
+	../../../liboggvorbis/src/analysis.c \
+	../../../liboggvorbis/src/bitrate.c \
+    ../../../liboggvorbis/src/bitwise.c \
+	../../../liboggvorbis/src/block.c \
+	../../../liboggvorbis/src/codebook.c \
+    ../../../liboggvorbis/src/envelope.c \
+	../../../liboggvorbis/src/floor0.c \
+	../../../liboggvorbis/src/floor1.c \
+    ../../../liboggvorbis/src/framing.c \
+	../../../liboggvorbis/src/info.c \
+	../../../liboggvorbis/src/lookup.c \
+    ../../../liboggvorbis/src/lpc.c \
+	../../../liboggvorbis/src/lsp.c \
+	../../../liboggvorbis/src/mapping0.c \
+    ../../../liboggvorbis/src/mdct.c \
+	../../../liboggvorbis/src/psy.c \
+	../../../liboggvorbis/src/registry.c \
+    ../../../liboggvorbis/src/res0.c \
+	../../../liboggvorbis/src/sharedbook.c \
+	../../../liboggvorbis/src/smallft.c \
+    ../../../liboggvorbis/src/synthesis.c \
+	../../../liboggvorbis/src/vorbisenc.c \
+	../../../liboggvorbis/src/vorbisfile.c \
+    ../../../liboggvorbis/src/window.c
 
 LOCAL_SHARED_LIBRARIES := SDL2
 

font.c

@@ -123,7 +123,7 @@ PAL_InitFont(
 		
 		fclose(fp);
 
-		for (int i = 0; i < 0x80; i++)
+		for (i = 0; i < 0x80; i++)
 		{
 			memcpy(unicode_font[i], &iso_font[i * 15], 15);
 			unicode_font[i][15] = 0;