diff options
author | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
---|---|---|
committer | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
commit | ede418b67a0f14e4f17a2b03f5362741badd5532 (patch) | |
tree | 07de039fac5c303f1b9fce372afe5fa19854f547 /dists | |
parent | 66d1f7a8de2ff5a21ad013f45924c406f4833e9a (diff) | |
parent | 3e859768770a0b385e21c4528cd546b33ed9a55d (diff) | |
download | scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.gz scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.bz2 scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.zip |
VOYEUR: Merge of upstream
Diffstat (limited to 'dists')
-rw-r--r-- | dists/android/AndroidManifest.xml | 1 | ||||
-rw-r--r-- | dists/android/AndroidManifest.xml.in | 1 | ||||
-rw-r--r-- | dists/android/res-ouya/values-television/margins.xml | 5 | ||||
-rw-r--r-- | dists/android/res/drawable-xhdpi/ouya_icon.png | bin | 0 -> 110822 bytes | |||
-rw-r--r-- | dists/android/res/layout/main.xml | 4 | ||||
-rw-r--r-- | dists/android/res/values/margins.xml | 5 | ||||
-rw-r--r-- | dists/engine-data/README | 5 | ||||
-rw-r--r-- | dists/engine-data/mort.dat | bin | 0 -> 76151 bytes | |||
-rw-r--r-- | dists/msvc10/create_msvc10.bat | 10 | ||||
-rw-r--r-- | dists/msvc11/create_msvc11.bat | 10 | ||||
-rw-r--r-- | dists/msvc12/create_msvc12.bat | 105 | ||||
-rw-r--r-- | dists/msvc12/readme.txt | 6 | ||||
-rw-r--r-- | dists/msvc8/create_msvc8.bat | 10 | ||||
-rw-r--r-- | dists/msvc9/create_msvc9.bat | 10 | ||||
-rw-r--r-- | dists/redhat/scummvm.spec | 2 | ||||
-rw-r--r-- | dists/redhat/scummvm.spec.in | 2 | ||||
-rw-r--r-- | dists/scummvm.rc | 9 | ||||
-rw-r--r-- | dists/scummvm.rc.in | 9 |
18 files changed, 194 insertions, 0 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index 320ed16a6e..16d1ee578b 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -36,6 +36,7 @@ <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> + <category android:name="tv.ouya.intent.category.GAME"/> </intent-filter> </activity> </application> diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 8f7887eaf5..bf45ffcc0e 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -36,6 +36,7 @@ <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> + <category android:name="tv.ouya.intent.category.GAME"/> </intent-filter> </activity> </application> diff --git a/dists/android/res-ouya/values-television/margins.xml b/dists/android/res-ouya/values-television/margins.xml new file mode 100644 index 0000000000..df586eea34 --- /dev/null +++ b/dists/android/res-ouya/values-television/margins.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="verticalMargin">45px</dimen> + <dimen name="horizontalMargin">80px</dimen> +</resources> diff --git a/dists/android/res/drawable-xhdpi/ouya_icon.png b/dists/android/res/drawable-xhdpi/ouya_icon.png Binary files differnew file mode 100644 index 0000000000..42f9a2a8ce --- /dev/null +++ b/dists/android/res/drawable-xhdpi/ouya_icon.png diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml index 8b0d515d62..31aa345cc7 100644 --- a/dists/android/res/layout/main.xml +++ b/dists/android/res/layout/main.xml @@ -9,4 +9,8 @@ android:keepScreenOn="true" android:focusable="true" android:focusableInTouchMode="true" + android:layout_marginTop="@dimen/verticalMargin" + android:layout_marginLeft="@dimen/horizontalMargin" + android:layout_marginBottom="@dimen/verticalMargin" + android:layout_marginRight="@dimen/horizontalMargin" /> diff --git a/dists/android/res/values/margins.xml b/dists/android/res/values/margins.xml new file mode 100644 index 0000000000..a865687b3a --- /dev/null +++ b/dists/android/res/values/margins.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="verticalMargin">0px</dimen> + <dimen name="horizontalMargin">0px</dimen> +</resources> diff --git a/dists/engine-data/README b/dists/engine-data/README index c9c4bd4817..9bbb006d17 100644 --- a/dists/engine-data/README +++ b/dists/engine-data/README @@ -16,6 +16,11 @@ scripts, from. lure.dat TODO +mort.dat: +File created partially by extracting font data from the French executable. It +also contains the French and German translation, as well as a custom-made +English translation. + queen.tbl: 'queen.tbl' contains a list of filenames, filesizes and offsets for the individual files saved in QUEEN.1. This data was originally included in the diff --git a/dists/engine-data/mort.dat b/dists/engine-data/mort.dat Binary files differnew file mode 100644 index 0000000000..0d6a44206d --- /dev/null +++ b/dists/engine-data/mort.dat diff --git a/dists/msvc10/create_msvc10.bat b/dists/msvc10/create_msvc10.bat index 5616c2cc8b..be0434fc50 100644 --- a/dists/msvc10/create_msvc10.bat +++ b/dists/msvc10/create_msvc10.bat @@ -10,6 +10,8 @@ if "%~1"=="/all" goto all if "%~1"=="/ALL" goto all if "%~1"=="/tools" goto tools if "%~1"=="/TOOLS" goto tools +if "%~1"=="/tests" goto tests +if "%~1"=="/TESTS" goto tests if "%~1"=="/clean" goto clean_check if "%~1"=="/CLEAN" goto clean_check if "%~1"=="/help" goto command_help @@ -70,6 +72,13 @@ echo. create_project ..\.. --tools --msvc --msvc-version 10 goto done +:tests +echo. +echo Creating tests project files +echo. +create_project ..\.. --tests --msvc --msvc-version 10 +goto done + :clean_check echo. set cleananswer=N @@ -88,6 +97,7 @@ del /Q *.props > NUL 2>&1 del /Q *.sln* > NUL 2>&1 del /Q scummvm* > NUL 2>&1 del /Q devtools* > NUL 2>&1 +del /Q test_runner.cpp > NUL 2>&1 goto done :done diff --git a/dists/msvc11/create_msvc11.bat b/dists/msvc11/create_msvc11.bat index b6a5413e3b..fc5471f46f 100644 --- a/dists/msvc11/create_msvc11.bat +++ b/dists/msvc11/create_msvc11.bat @@ -10,6 +10,8 @@ if "%~1"=="/all" goto all if "%~1"=="/ALL" goto all if "%~1"=="/tools" goto tools if "%~1"=="/TOOLS" goto tools +if "%~1"=="/tests" goto tests +if "%~1"=="/TESTS" goto tests if "%~1"=="/clean" goto clean_check if "%~1"=="/CLEAN" goto clean_check if "%~1"=="/help" goto command_help @@ -70,6 +72,13 @@ echo. create_project ..\.. --tools --msvc --msvc-version 11 goto done +:tests +echo. +echo Creating tests project files +echo. +create_project ..\.. --tests --msvc --msvc-version 11 +goto done + :clean_check echo. set cleananswer=N @@ -88,6 +97,7 @@ del /Q *.props > NUL 2>&1 del /Q *.sln* > NUL 2>&1 del /Q scummvm* > NUL 2>&1 del /Q devtools* > NUL 2>&1 +del /Q test_runner.cpp > NUL 2>&1 goto done :done diff --git a/dists/msvc12/create_msvc12.bat b/dists/msvc12/create_msvc12.bat new file mode 100644 index 0000000000..d99001edb1 --- /dev/null +++ b/dists/msvc12/create_msvc12.bat @@ -0,0 +1,105 @@ +@echo off + +echo. +echo Automatic creation of the MSVC12 project files +echo. + +if "%~1"=="/stable" goto stable +if "%~1"=="/STABLE" goto stable +if "%~1"=="/all" goto all +if "%~1"=="/ALL" goto all +if "%~1"=="/tools" goto tools +if "%~1"=="/TOOLS" goto tools +if "%~1"=="/tests" goto tests +if "%~1"=="/TESTS" goto tests +if "%~1"=="/clean" goto clean_check +if "%~1"=="/CLEAN" goto clean_check +if "%~1"=="/help" goto command_help +if "%~1"=="/HELP" goto command_help +if "%~1"=="/?" goto command_help + +if "%~1"=="" goto check_tool + +echo Invalid command parameter: %~1 +echo. + +:command_help +echo Valid command parameters are: +echo stable Generated stable engines project files +echo all Generate all engines project files +echo tools Generate project files for the devtools +echo clean Clean generated project files +echo help Show help message +goto done + +:check_tool +if not exist create_project.exe goto no_tool + +:question +echo. +set batchanswer=S +set /p batchanswer="Enable stable engines only, or all engines? (S/a)" +if "%batchanswer%"=="s" goto stable +if "%batchanswer%"=="S" goto stable +if "%batchanswer%"=="a" goto all +if "%batchanswer%"=="A" goto all +goto question + +:no_tool +echo create_project.exe not found in the current folder. +echo You need to build it first and copy it in this +echo folder +goto done + +:all +echo. +echo Creating project files with all engines enabled (stable and unstable) +echo. +create_project ..\.. --enable-all-engines --msvc --msvc-version 12 --build-events +goto done + +:stable +echo. +echo Creating normal project files, with only the stable engines enabled +echo. +create_project ..\.. --msvc --msvc-version 12 +goto done + +:tools +echo. +echo Creating tools project files +echo. +create_project ..\.. --tools --msvc --msvc-version 12 +goto done + +:tests +echo. +echo Creating tests project files +echo. +create_project ..\.. --tests --msvc --msvc-version 12 +goto done + +:clean_check +echo. +set cleananswer=N +set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)" +if "%cleananswer%"=="n" goto done +if "%cleananswer%"=="N" goto done +if "%cleananswer%"=="y" goto clean +if "%cleananswer%"=="Y" goto clean +goto clean_check + +:clean +echo. +echo Removing all project files +del /Q *.vcxproj* > NUL 2>&1 +del /Q *.props > NUL 2>&1 +del /Q *.sln* > NUL 2>&1 +del /Q scummvm* > NUL 2>&1 +del /Q devtools* > NUL 2>&1 +del /Q test_runner.cpp > NUL 2>&1 +goto done + +:done +echo. +pause diff --git a/dists/msvc12/readme.txt b/dists/msvc12/readme.txt new file mode 100644 index 0000000000..760f9ff601 --- /dev/null +++ b/dists/msvc12/readme.txt @@ -0,0 +1,6 @@ +The Visual Studio project files can now be created automatically from the GCC +files using the create_project tool inside the /devtools/create_project folder. + +To create the default project files, build create_project.exe, copy it inside +this folder and run the create_msvc12.bat file for a default build. You can run +create_project.exe with no parameters to check the possible command-line options diff --git a/dists/msvc8/create_msvc8.bat b/dists/msvc8/create_msvc8.bat index 2261c9bcec..1e0d339001 100644 --- a/dists/msvc8/create_msvc8.bat +++ b/dists/msvc8/create_msvc8.bat @@ -10,6 +10,8 @@ if "%~1"=="/all" goto all if "%~1"=="/ALL" goto all if "%~1"=="/tools" goto tools if "%~1"=="/TOOLS" goto tools +if "%~1"=="/tests" goto tests +if "%~1"=="/TESTS" goto tests if "%~1"=="/clean" goto clean_check if "%~1"=="/CLEAN" goto clean_check if "%~1"=="/help" goto command_help @@ -70,6 +72,13 @@ echo. create_project ..\.. --tools --msvc --msvc-version 8 goto done +:tests +echo. +echo Creating tests project files +echo. +create_project ..\.. --tests --msvc --msvc-version 8 +goto done + :clean_check echo. set cleananswer=N @@ -88,6 +97,7 @@ del /Q *.vsprops > NUL 2>&1 del /Q *.sln* > NUL 2>&1 del /Q scummvm* > NUL 2>&1 del /Q devtools* > NUL 2>&1 +del /Q test_runner.cpp goto done :done diff --git a/dists/msvc9/create_msvc9.bat b/dists/msvc9/create_msvc9.bat index 1622cd9037..34bcccdd7b 100644 --- a/dists/msvc9/create_msvc9.bat +++ b/dists/msvc9/create_msvc9.bat @@ -10,6 +10,8 @@ if "%~1"=="/all" goto all if "%~1"=="/ALL" goto all if "%~1"=="/tools" goto tools if "%~1"=="/TOOLS" goto tools +if "%~1"=="/tests" goto tests +if "%~1"=="/TESTS" goto tests if "%~1"=="/clean" goto clean_check if "%~1"=="/CLEAN" goto clean_check if "%~1"=="/help" goto command_help @@ -70,6 +72,13 @@ echo. create_project ..\.. --tools --msvc --msvc-version 9 goto done +:tests +echo. +echo Creating tests project files +echo. +create_project ..\.. --tests --msvc --msvc-version 9 +goto done + :clean_check echo. set cleananswer=N @@ -88,6 +97,7 @@ del /Q *.vsprops > NUL 2>&1 del /Q *.sln* > NUL 2>&1 del /Q scummvm* > NUL 2>&1 del /Q devtools* > NUL 2>&1 +del /Q test_runner.cpp goto done :done diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 823b74df5e..33622ffb9b 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -72,6 +72,7 @@ install -m644 -D dists/engine-data/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.c install -m644 -D dists/engine-data/drascula.dat %{buildroot}%{_datadir}/scummvm/drascula.dat install -m644 -D dists/engine-data/teenagent.dat %{buildroot}%{_datadir}/scummvm/teenagent.dat install -m644 -D dists/engine-data/hugo.dat %{buildroot}%{_datadir}/scummvm/hugo.dat +install -m644 -D dists/engine-data/tony.dat %{buildroot}%{_datadir}/scummvm/tony.dat install -m644 -D dists/engine-data/toon.dat %{buildroot}%{_datadir}/scummvm/toon.dat desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop @@ -111,6 +112,7 @@ fi %{_datadir}/scummvm/drascula.dat %{_datadir}/scummvm/teenagent.dat %{_datadir}/scummvm/hugo.dat +%{_datadir}/scummvm/tony.dat %{_datadir}/scummvm/toon.dat %{_mandir}/man6/scummvm.6* diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in index 9dbd8add5b..5db2807d0e 100644 --- a/dists/redhat/scummvm.spec.in +++ b/dists/redhat/scummvm.spec.in @@ -72,6 +72,7 @@ install -m644 -D dists/engine-data/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.c install -m644 -D dists/engine-data/drascula.dat %{buildroot}%{_datadir}/scummvm/drascula.dat install -m644 -D dists/engine-data/teenagent.dat %{buildroot}%{_datadir}/scummvm/teenagent.dat install -m644 -D dists/engine-data/hugo.dat %{buildroot}%{_datadir}/scummvm/hugo.dat +install -m644 -D dists/engine-data/tony.dat %{buildroot}%{_datadir}/scummvm/tony.dat install -m644 -D dists/engine-data/toon.dat %{buildroot}%{_datadir}/scummvm/toon.dat desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop @@ -111,6 +112,7 @@ fi %{_datadir}/scummvm/drascula.dat %{_datadir}/scummvm/teenagent.dat %{_datadir}/scummvm/hugo.dat +%{_datadir}/scummvm/tony.dat %{_datadir}/scummvm/toon.dat %{_mandir}/man6/scummvm.6* diff --git a/dists/scummvm.rc b/dists/scummvm.rc index c457e23b16..037db3ef62 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -32,6 +32,12 @@ kyra.dat FILE "dists/engine-data/kyra.dat" #if ENABLE_LURE == STATIC_PLUGIN lure.dat FILE "dists/engine-data/lure.dat" #endif +#if ENABLE_MORTEVIELLE == STATIC_PLUGIN +mort.dat FILE "dists/engine-data/mort.dat" +#endif +#if ENABLE_NEVERHOOD == STATIC_PLUGIN +neverhood.dat FILE "dists/engine-data/neverhood.dat" +#endif #if ENABLE_QUEEN == STATIC_PLUGIN queen.tbl FILE "dists/engine-data/queen.tbl" #endif @@ -41,6 +47,9 @@ sky.cpt FILE "dists/engine-data/sky.cpt" #if ENABLE_TEENAGENT == STATIC_PLUGIN teenagent.dat FILE "dists/engine-data/teenagent.dat" #endif +#if ENABLE_TONY == STATIC_PLUGIN +tony.dat FILE "dists/engine-data/tony.dat" +#endif #if ENABLE_TOON == STATIC_PLUGIN toon.dat FILE "dists/engine-data/toon.dat" #endif diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index f986cc52e8..c18c18ef63 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -32,6 +32,12 @@ kyra.dat FILE "dists/engine-data/kyra.dat" #if ENABLE_LURE == STATIC_PLUGIN lure.dat FILE "dists/engine-data/lure.dat" #endif +#if ENABLE_MORTEVIELLE == STATIC_PLUGIN +mort.dat FILE "dists/engine-data/mort.dat" +#endif +#if ENABLE_NEVERHOOD == STATIC_PLUGIN +neverhood.dat FILE "dists/engine-data/neverhood.dat" +#endif #if ENABLE_QUEEN == STATIC_PLUGIN queen.tbl FILE "dists/engine-data/queen.tbl" #endif @@ -41,6 +47,9 @@ sky.cpt FILE "dists/engine-data/sky.cpt" #if ENABLE_TEENAGENT == STATIC_PLUGIN teenagent.dat FILE "dists/engine-data/teenagent.dat" #endif +#if ENABLE_TONY == STATIC_PLUGIN +tony.dat FILE "dists/engine-data/tony.dat" +#endif #if ENABLE_TOON == STATIC_PLUGIN toon.dat FILE "dists/engine-data/toon.dat" #endif |