diff options
author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /dists | |
parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'dists')
-rwxr-xr-x | dists/iphone/scummvm.xcodeproj/project.pbxproj | 8 | ||||
-rw-r--r-- | dists/nsis/scummvm.nsi | 5 | ||||
-rw-r--r-- | dists/nsis/scummvm.nsi.in | 5 | ||||
-rw-r--r-- | dists/samsungtv/README-SamsungTV | 17 |
4 files changed, 31 insertions, 4 deletions
diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj index 6e44f351d1..d1ab4101d7 100755 --- a/dists/iphone/scummvm.xcodeproj/project.pbxproj +++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj @@ -10937,7 +10937,7 @@ CONFIG_H, IPHONE_OFFICIAL, IPHONE, - UNIX, + POSIX, SCUMM_LITTLE_ENDIAN, SCUMM_NEED_ALIGNMENT, ENABLE_SCUMM, @@ -11010,7 +11010,7 @@ CONFIG_H, IPHONE_OFFICIAL, IPHONE, - UNIX, + POSIX, SCUMM_LITTLE_ENDIAN, SCUMM_NEED_ALIGNMENT, ENABLE_SCUMM, @@ -11095,7 +11095,7 @@ CONFIG_H, MACOSX, SDL_BACKEND, - UNIX, + POSIX, SCUMM_LITTLE_ENDIAN, SCUMM_NEED_ALIGNMENT, ENABLE_SCUMM, @@ -11181,7 +11181,7 @@ CONFIG_H, MACOSX, SDL_BACKEND, - UNIX, + POSIX, SCUMM_LITTLE_ENDIAN, SCUMM_NEED_ALIGNMENT, ENABLE_SCUMM, diff --git a/dists/nsis/scummvm.nsi b/dists/nsis/scummvm.nsi index aeabcca039..50ccadaf74 100644 --- a/dists/nsis/scummvm.nsi +++ b/dists/nsis/scummvm.nsi @@ -19,6 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #!define _DEBUG +#!define _INCLUDE_DATA_FILES Name ScummVM @@ -231,6 +232,7 @@ Section "ScummVM" SecMain File /oname=README.txt "${text_dir}\README" File /oname=README-SDL.txt "${build_dir}\README-SDL" +!ifdef _INCLUDE_DATA_FILES # Engine data File "${engine_data}\drascula.dat" File "${engine_data}\hugo.dat" @@ -248,6 +250,7 @@ Section "ScummVM" SecMain File "${theme_data}\scummclassic.zip" File "${theme_data}\scummmodern.zip" File "${theme_data}\translations.dat" +!endif # Main exe and dlls File "${build_dir}\scummvm.exe" @@ -299,6 +302,7 @@ Section -un.Main SecUninstall Delete /REBOOTOK $INSTDIR\README.txt Delete /REBOOTOK $INSTDIR\README-SDL.txt +!ifdef _INCLUDE_DATA_FILES Delete /REBOOTOK $INSTDIR\drascula.dat Delete /REBOOTOK $INSTDIR\hugo.dat Delete /REBOOTOK $INSTDIR\kyra.dat @@ -314,6 +318,7 @@ Section -un.Main SecUninstall Delete /REBOOTOK $INSTDIR\scummclassic.zip Delete /REBOOTOK $INSTDIR\scummmodern.zip Delete /REBOOTOK $INSTDIR\translations.dat +!endif Delete /REBOOTOK $INSTDIR\scummvm.exe Delete /REBOOTOK $INSTDIR\SDL.dll diff --git a/dists/nsis/scummvm.nsi.in b/dists/nsis/scummvm.nsi.in index 766a20633f..c94e5943f7 100644 --- a/dists/nsis/scummvm.nsi.in +++ b/dists/nsis/scummvm.nsi.in @@ -19,6 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #!define _DEBUG +#!define _INCLUDE_DATA_FILES Name ScummVM @@ -231,6 +232,7 @@ Section "ScummVM" SecMain File /oname=README.txt "${text_dir}\README" File /oname=README-SDL.txt "${build_dir}\README-SDL" +!ifdef _INCLUDE_DATA_FILES # Engine data File "${engine_data}\drascula.dat" File "${engine_data}\hugo.dat" @@ -248,6 +250,7 @@ Section "ScummVM" SecMain File "${theme_data}\scummclassic.zip" File "${theme_data}\scummmodern.zip" File "${theme_data}\translations.dat" +!endif # Main exe and dlls File "${build_dir}\scummvm.exe" @@ -299,6 +302,7 @@ Section -un.Main SecUninstall Delete /REBOOTOK $INSTDIR\README.txt Delete /REBOOTOK $INSTDIR\README-SDL.txt +!ifdef _INCLUDE_DATA_FILES Delete /REBOOTOK $INSTDIR\drascula.dat Delete /REBOOTOK $INSTDIR\hugo.dat Delete /REBOOTOK $INSTDIR\kyra.dat @@ -314,6 +318,7 @@ Section -un.Main SecUninstall Delete /REBOOTOK $INSTDIR\scummclassic.zip Delete /REBOOTOK $INSTDIR\scummmodern.zip Delete /REBOOTOK $INSTDIR\translations.dat +!endif Delete /REBOOTOK $INSTDIR\scummvm.exe Delete /REBOOTOK $INSTDIR\SDL.dll diff --git a/dists/samsungtv/README-SamsungTV b/dists/samsungtv/README-SamsungTV new file mode 100644 index 0000000000..26ded6c7e6 --- /dev/null +++ b/dists/samsungtv/README-SamsungTV @@ -0,0 +1,17 @@ +Notes: + +- Should works on 2009 B series TVs (Full HD): LExxBE65x, LExxBE75x, PSxxB65x, UExxB7xxx, UExxB8xxx, PSxxB85x, LAxxB65x, LAxxB75x, UNxxB7xxx, UAxxB8xxx +- To allow use mouse and keyboard you need load extension first: "SamyGO Mouse And Keyboard" + Download from SamyGO project and run from Content Library: + http://sourceforge.net/projects/samygo/files/SamyGO%20Kernel%20Modules/SamyGO%20Mouse%20and%20Keyboard%20Modules%20v0.01.zip/download +- Buttons on remote controler: EXIT, SOURCE, P+, P-, TV, POWER, CONTENT - cause immediately exit from ScummVM +- Config file is in /mtd_rwarea/.scummvmrc +- Saves are stored in '/mtd_wiselink/scummvm savegames' directory +- Audio is delayed a upto one second, it's TV software issue :/ +- Do not use 3x scalers, they are not fit in TV display frame buffer and you get gfx glitches + +Remote Controler buttons: + +GREEN - emulate key F5 +YELLOW - emulate key F7 - virtual keyboard +BLUE and RETURN - emulate key ESC |