miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ScummVM project files

Browse Source
This commit is contained in:
pelya
2010-10-26 10:53:02 +03:00
parent dff8e5261a
commit 03c577136f
19 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.sourceforge.jooleem"
android:versionCode="01404"
android:versionName="0.1.4.04 - added HW acceleration"
package="org.scummvm.sdl"
android:versionCode="12001"
android:versionName="1.2.0.01"
android:installLocation="preferExternal"
>
<application android:label="@string/app_name"

12
project/jni/Android.mk
View File

@@ -1,6 +1,6 @@
# The namespace in Java file, with dots replaced with underscores
SDL_JAVA_PACKAGE_PATH := net_sourceforge_jooleem
SDL_JAVA_PACKAGE_PATH := org_scummvm_sdl
# Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here
# SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := net_sourceforge_jooleem
# Typically /sdcard/alienblaster
# Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder
# Your application will just set current directory there
SDL_CURDIR_PATH := net.sourceforge.jooleem
SDL_CURDIR_PATH := org.scummvm.sdl
# Android Dev Phone G1 has trackball instead of cursor keys, and
# sends trackball movement events as rapid KeyDown/KeyUp events,
@@ -25,17 +25,17 @@ SDL_VIDEO_RENDER_RESIZE := 1
SDL_VIDEO_RENDER_RESIZE_KEEP_ASPECT := 0
COMPILED_LIBRARIES := sdl_mixer sdl_image sdl_ttf
COMPILED_LIBRARIES := mad tremor flac ogg jpeg png
APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2 -DUSE_OSD -DUSE_RGB_COLOR -DUNIX -DUSE_VORBIS -DUSE_TREMOR -DUSE_FLAC -DUSE_MAD -DUSE_PNG -DUSE_JPEG -DUSE_ZLIB -DENABLE_SCUMM -DENABLE_SCUMM_7_8 -DENABLE_HE -DENABLE_AGI -DENABLE_AGOS -DENABLE_AGOS2 -DENABLE_CINE -DENABLE_CRUISE -DENABLE_DRACI -DENABLE_DRASCULA -DENABLE_GOB -DENABLE_GROOVIE -DENABLE_GROOVIE2 -DENABLE_HUGO -DENABLE_KYRA -DENABLE_LOL -DENABLE_LASTEXPRESS -DENABLE_LURE -DENABLE_M4 -DENABLE_MADE -DENABLE_MOHAWK -DENABLE_PARALLACTION -DENABLE_QUEEN -DENABLE_SAGA -DENABLE_IHNM -DENABLE_SAGA2 -DENABLE_SCI -DENABLE_SCI32 -DENABLE_SKY -DENABLE_SWORD1 -DENABLE_SWORD2 -DENABLE_SWORD25 -DENABLE_TESTBED -DENABLE_TEENAGENT -DENABLE_TINSEL -DENABLE_TOON -DENABLE_TOUCHE -DENABLE_TUCKER
APPLICATION_ADDITIONAL_LDFLAGS :=
APPLICATION_SUBDIRS_BUILD :=
APPLICATION_SUBDIRS_BUILD := scummvm scummvm/backends scummvm/backends/platform/sdl scummvm/backends/keymapper/* scummvm/backends/events/* scummvm/backends/plugins/sdl scummvm/backends/saves/posix scummvm/backends/saves/default scummvm/backends/saves scummvm/backends/timer/default scummvm/backends/fs/posix scummvm/backends/fs scummvm/backends/vkeybd/* scummvm/backends/midi/* scummvm/base/* scummvm/common/* scummvm/engines/* scummvm/graphics/* scummvm/gui/* scummvm/sound/*
APPLICATION_CUSTOM_BUILD_SCRIPT :=
SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN
SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=SPACE -DSDL_ANDROID_KEYCODE_1=RETURN -DSDL_ANDROID_KEYCODE_2=LCTRL -DSDL_ANDROID_KEYCODE_3=LALT -DSDL_ANDROID_KEYCODE_4=SPACE
SDL_VERSION := 1.2

2
project/jni/Application.mk
View File

@@ -2,7 +2,7 @@ APP_PROJECT_PATH := $(call my-dir)/..
# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces
APP_MODULES := application sdl-1.2 sdl_main stlport jpeg png ogg flac vorbis freetype sdl_mixer sdl_image sdl_ttf
APP_MODULES := application sdl-1.2 sdl_main stlport jpeg png ogg flac vorbis freetype mad tremor flac ogg jpeg png
# To filter out static libs from all libs in makefile
APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces ogg tremor vorbis flac

3
project/jni/application/Android.mk
View File

@@ -9,7 +9,7 @@ APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/$(APPDI
ifneq ($(APPLICATION_SUBDIRS_BUILD),)
APPLICATION_SUBDIRS_BUILD_NONRECURSIVE := $(addprefix $(APPDIR)/, $(filter-out %/*, $(APPLICATION_SUBDIRS_BUILD)))
APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(patsubst %/*, %, $(filter %/*,$(APPLICATION_SUBDIRS_BUILD)))
APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(foreach FINDDIR, $(APPLICATION_SUBDIRS_BUILD_RECURSIVE), $(shell find $(LOCAL_PATH)/$(APPDIR)/$(FINDDIR) -type d))
APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(foreach FINDDIR, $(APPLICATION_SUBDIRS_BUILD_RECURSIVE), $(shell find $(LOCAL_PATH)/$(APPDIR)/$(FINDDIR) -path '*/.svn' -prune -o -type d -print))
APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(patsubst $(LOCAL_PATH)/%, %, $(APPLICATION_SUBDIRS_BUILD_RECURSIVE) )
APP_SUBDIRS := $(APPLICATION_SUBDIRS_BUILD_NONRECURSIVE) $(APPLICATION_SUBDIRS_BUILD_RECURSIVE)
endif
@@ -42,6 +42,7 @@ LOCAL_CFLAGS += \
-I$(LOCAL_PATH)/../flac/include \
-I$(LOCAL_PATH)/../ogg/include \
-I$(LOCAL_PATH)/../vorbis/include \
-I$(LOCAL_PATH)/../mad/include \
-I$(LOCAL_PATH)/..
LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)

30
project/jni/application/scummvm/AndroidAppSettings.cfg Normal file
View File

@@ -0,0 +1,30 @@
# The application settings for Android libSDL port
AppSettingVersion=12
LibSdlVersion=1.2
AppName="ScummVM"
AppFullName=org.scummvm.sdl
ScreenOrientation=h
InhibitSuspend=n
AppDataDownloadUrl="Data files size is 3 Mb|https://sites.google.com/site/xpelyax/Home/scummvm-1.2.0-data-1.zip?attredirects=0&d=1^Lure of the Temptress (10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download"
SdlVideoResize=y
SdlVideoResizeKeepAspect=n
NeedDepthBuffer=n
AppUsesMouse=y
AppNeedsArrowKeys=y
AppUsesJoystick=n
AppHandlesJoystickSensitivity=n
AppUsesMultitouch=n
NonBlockingSwapBuffers=n
RedefinedKeys="SPACE RETURN LCTRL LALT SPACE"
AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
MultiABI=n
AppVersionCode=12001
AppVersionName="1.2.0.01"
CompiledLibraries="mad tremor flac ogg jpeg png"
CustomBuildScript=n
AppCflags='-finline-functions -O2 -DUSE_OSD -DUSE_RGB_COLOR -DUNIX -DUSE_VORBIS -DUSE_TREMOR -DUSE_FLAC -DUSE_MAD -DUSE_PNG -DUSE_JPEG -DUSE_ZLIB -DENABLE_SCUMM -DENABLE_SCUMM_7_8 -DENABLE_HE -DENABLE_AGI -DENABLE_AGOS -DENABLE_AGOS2 -DENABLE_CINE -DENABLE_CRUISE -DENABLE_DRACI -DENABLE_DRASCULA -DENABLE_GOB -DENABLE_GROOVIE -DENABLE_GROOVIE2 -DENABLE_HUGO -DENABLE_KYRA -DENABLE_LOL -DENABLE_LASTEXPRESS -DENABLE_LURE -DENABLE_M4 -DENABLE_MADE -DENABLE_MOHAWK -DENABLE_PARALLACTION -DENABLE_QUEEN -DENABLE_SAGA -DENABLE_IHNM -DENABLE_SAGA2 -DENABLE_SCI -DENABLE_SCI32 -DENABLE_SKY -DENABLE_SWORD1 -DENABLE_SWORD2 -DENABLE_SWORD25 -DENABLE_TESTBED -DENABLE_TEENAGENT -DENABLE_TINSEL -DENABLE_TOON -DENABLE_TOUCHE -DENABLE_TUCKER'
AppLdflags=''
AppSubdirsBuild='scummvm scummvm/backends scummvm/backends/platform/sdl scummvm/backends/keymapper/* scummvm/backends/events/* scummvm/backends/plugins/sdl scummvm/backends/saves/posix scummvm/backends/saves/default scummvm/backends/saves scummvm/backends/timer/default scummvm/backends/fs/posix scummvm/backends/fs scummvm/backends/vkeybd/* scummvm/backends/midi/* scummvm/base/* scummvm/common/* scummvm/engines/* scummvm/graphics/* scummvm/gui/* scummvm/sound/*'
AppUseCrystaXToolchain=n
ReadmeText='^You may press "Home" now - the data will be downloaded in background'

BIN
project/jni/application/scummvm/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

8
project/jni/application/scummvm/readme.txt Normal file
View File

@@ -0,0 +1,8 @@
To compile ScummVM add the ScummVM SVN to directory "scummvm" (or make a symlink to it),
then from dir 'project/jni/application' execute commands
rm src
ln -s scummvm src
Then go to project root and launch 'build.sh' - that should be it.
You need to have Android SDK 2.2 and NDK r4b installed in your PATH.

1
project/jni/application/scummvm/scummvm Symbolic link
View File

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

2
project/jni/mad/Android.mk
View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := mad
LOCAL_CFLAGS := -I$(LOCAL_PATH) \
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \
-DFPM_64BIT -DOPT_SPEED \
-DSTDC_HEADERS -DHAVE_UNISTD_H \
-DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 \

0
project/jni/mad/mad.h → project/jni/mad/include/mad.h
View File

2
project/res/values/strings.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Jooleem</string>
<string name="app_name">ScummVM</string>
<string name="init">Initializing</string>

2
project/src/Accelerometer.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import android.app.Activity;
import android.content.Context;

2
project/src/Audio.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import android.app.Activity;

2
project/src/DataDownloader.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import android.app.Activity;
import android.content.Context;

2
project/src/GLSurfaceView_SDL.java
View File

@@ -18,7 +18,7 @@
fixed with a hammer and rasp to work with libSDL port */
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import java.io.Writer;
import java.util.ArrayList;

10
project/src/Globals.java
View File

@@ -1,14 +1,14 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import android.app.Activity;
import android.content.Context;
class Globals {
public static String ApplicationName = "Jooleem";
public static String ApplicationName = "ScummVM";
// Should be zip file
public static String DataDownloadUrl = "Data files are 10 Mb|http://sourceforge.net/projects/libsdl-android/files/Jooleem/jooleem_0.1.4_data.zip/download|http://sites.google.com/site/xpelyax/Home/jooleem_0.1.4_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/jooleem_0.1.4_data.zip";
public static String DataDownloadUrl = "Data files size is 3 Mb|https://sites.google.com/site/xpelyax/Home/scummvm-1.2.0-data-1.zip?attredirects=0%26d=1^Lure of the Temptress (10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download";
// Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D
public static boolean NeedDepthBuffer = false;
@@ -24,7 +24,7 @@ class Globals {
public static boolean AppUsesMouse = true;
public static boolean AppNeedsArrowKeys = false;
public static boolean AppNeedsArrowKeys = true;
public static boolean AppUsesJoystick = false;
@@ -56,5 +56,5 @@ class Globals {
}
class LoadLibrary {
public LoadLibrary() { System.loadLibrary("sdl-1.2"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_ttf"); };
public LoadLibrary() { System.loadLibrary("sdl-1.2"); System.loadLibrary("mad"); };
}

2
project/src/MainActivity.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import android.app.Activity;
import android.content.Context;

2
project/src/Settings.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import android.app.Activity;
import android.content.Context;

2
project/src/Video.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package net.sourceforge.jooleem;
package org.scummvm.sdl;
import javax.microedition.khronos.opengles.GL10;