Skip to content

Commit a4610df

Browse files
fingolfinfingolfin
committed
Merge branch 'branch-1-3-0' into master
I manually resolved all conflicts, and inspected every single change. Many were due to the version string mismatch and thus easily resolved. The MSVC project files add in the 1-3-0 branch were not merged, neither where the changes to gui/themes/translations.dat. Conflicts: NEWS backends/base-backend.cpp backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp backends/module.mk backends/platform/ds/arm9/makefile backends/platform/psp/README.PSP backends/platform/samsungtv/main.cpp backends/platform/samsungtv/samsungtv.cpp backends/saves/posix/posix-saves.cpp base/commandLine.cpp base/internal_version.h base/main.cpp common/array.h configure devtools/create_project/create_project.cpp dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml dists/iphone/Info.plist dists/irix/scummvm.spec dists/macosx/Info.plist dists/redhat/scummvm-tools.spec dists/redhat/scummvm.spec dists/scummvm.rc dists/slackware/scummvm.SlackBuild dists/wii/meta.xml engines/sci/parser/vocabulary.cpp engines/tinsel/handle.cpp gui/themes/translations.dat
2 parents a4d105c + afe1a77 commit a4610df

File tree

19 files changed

+188
-82
lines changed

19 files changed

+188
-82
lines changed

‎audio/softsynth/opl/mame.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,8 +754,10 @@ static int OPLOpenTable(void) {
754754
}
755755

756756
static void OPLCloseTable(void) {
757+
#ifndef __DS__
757758
free(TL_TABLE);
758759
free(SIN_TABLE);
760+
#endif
759761
free(AMS_TABLE);
760762
free(VIB_TABLE);
761763
free(ENV_CURVE);

‎backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@
2020
*
2121
*/
2222

23+
#include "common/scummsys.h"
24+
25+
#if defined(SAMSUNGTV)
26+
2327
#include "backends/platform/samsungtv/samsungtv.h"
2428
#include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
2529
#include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
2630

27-
#if defined(SAMSUNGTV)
28-
2931
SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource)
3032
: SdlGraphicsManager(sdlEventSource) {
3133
}

‎backends/platform/android/jni.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,10 +602,12 @@ void JNI::setPause(JNIEnv *env, jobject self, jboolean value) {
602602

603603
g_engine->pauseEngine(value);
604604

605+
#if 0
605606
if (value &&
606607
g_engine->hasFeature(Engine::kSupportsSavingDuringRuntime) &&
607608
g_engine->canSaveGameStateCurrently())
608609
g_engine->saveGameState(0, "Android parachute");
610+
#endif
609611
}
610612

611613
pause = value;

‎backends/platform/dc/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ CXX = sh-elf-g++ -ml -m4-single-only
1111
LD = $(CXX)
1212
CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
1313
DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR
14+
# For release builds:
15+
#DEFINES := -DNOSERIAL
1416
LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
1517
INCLUDES= -I./ -I$(srcdir) -I$(ronindir)/include/ -I$(srcdir)/engines
1618
LIBS = -L$(ronindir)/lib -lmad -lronin -lz -lm
19+
# For release builds:
20+
#LIBS = -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
1721
EXECUTABLE = scummvm.elf
1822
DEPDIR = .deps
1923
CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP

‎backends/platform/ds/arm9/makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ else
7575
ifdef DS_BUILD_K
7676

7777
else
78-
# USE_MAD = 1
78+
USE_MAD = 1
7979
endif
8080
endif
8181
endif
@@ -246,6 +246,8 @@ ifdef USE_MAD
246246
endif
247247

248248
DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE_FOR_DEBUGGER -DDISABLE_MASS_ADD -DDISABLE_NES_APU
249+
# for release builds:
250+
#DEFINES += -DNDEBUG
249251

250252
LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
251253

@@ -259,7 +261,7 @@ BACKEND := ds
259261
INCLUDES= -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/engines \
260262
-I$(portdir)/data -I$(portdir)/../commoninclude \
261263
-I$(portdir)/source -I$(portdir)/source/mad \
262-
-I$(libndsdir)/include -include $(srcdir)/common/scummsys.h
264+
-I$(libndsdir)/include -include $(portdir)/source/portdefs.h
263265

264266

265267
LIBS = -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9

‎backends/platform/ds/arm9/source/dsmain.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ void initGame() {
575575
for (int r = 0; r < NUM_SUPPORTED_GAMES; r++) {
576576
if (!stricmp(gameName, gameList[r].gameId)) {
577577
s_currentGame = &gameList[r];
578-
// consolePrintf("Game list num: %d\n", s_currentGame);
578+
// consolePrintf("Game list num: %d\n", r);
579579
}
580580
}
581581
}
@@ -1668,8 +1668,7 @@ void addEventsToQueue() {
16681668

16691669

16701670
if (!keyboardEnable) {
1671-
1672-
if ((isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
1671+
if ((!isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
16731672
// Controls specific to the control method
16741673

16751674
if (s_currentGame->control == CONT_SKY) {

‎backends/platform/ps2/Makefile.gdb‎

Lines changed: 56 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,52 @@
11
# $Header: Exp $
22
include $(PS2SDK)/Defs.make
33

4-
PS2_EXTRA = /media/disk/nw8240/extras/scummvm/ports
4+
PS2_EXTRA = /works/devel/ps2/sdk-extra
55
PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
66
PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
77

88
ENABLED=STATIC_PLUGIN
99

1010
ENABLE_SCUMM = $(ENABLED)
1111
ENABLE_SCUMM_7_8 = $(ENABLED)
12-
#ENABLE_HE = $(ENABLED)
13-
#ENABLE_AGI = $(ENABLED)
14-
#ENABLE_AGOS = $(ENABLED)
15-
#ENABLE_CINE = $(ENABLED)
16-
#ENABLE_CRUISE = $(ENABLED)
17-
#ENABLE_DRASCULA = $(ENABLED)
18-
#ENABLE_GOB = $(ENABLED)
19-
#ENABLE_KYRA = $(ENABLED)
20-
#ENABLE_LURE = $(ENABLED)
21-
# ENABLE_M4 = $(ENABLED)
22-
#ENABLE_MADE = $(ENABLED)
23-
#ENABLE_PARALLACTION = $(ENABLED)
24-
#ENABLE_QUEEN = $(ENABLED)
25-
#ENABLE_SAGA = $(ENABLED)
26-
#ENABLE_SAGA2 = $(ENABLED)
27-
#ENABLE_IHNM = $(ENABLED)
28-
#ENABLE_SKY = $(ENABLED)
29-
#ENABLE_SWORD1 = $(ENABLED)
30-
#ENABLE_SWORD2 = $(ENABLED)
31-
# ENABLE_TINSEL = $(ENABLED)
32-
#ENABLE_TOUCHE = $(ENABLED)
12+
# ENABLE_HE = $(ENABLED)
13+
# ENABLE_AGI = $(ENABLED)
14+
# ENABLE_AGOS = $(ENABLED)
15+
# ENABLE_AGOS2 = $(ENABLED)
16+
# ENABLE_CINE = $(ENABLED)
17+
# ENABLE_CRUISE = $(ENABLED)
18+
# ENABLE_DRACI = $(ENABLED)
19+
# ENABLE_DRASCULA = $(ENABLED)
20+
# ENABLE_GOB = $(ENABLED)
21+
# ENABLE_GROOVIE = $(ENABLED)
22+
## ENABLE_GROOVIE2 = $(ENABLED)
23+
# ENABLE_HUGO = $(ENABLED)
24+
# ENABLE_IHNM = $(ENABLED)
25+
# ENABLE_KYRA = $(ENABLED)
26+
## ENABLE_LOL = $(ENABLED)
27+
# ENABLE_LURE = $(ENABLED)
28+
## ENABLE_M4 = $(ENABLED)
29+
# ENABLE_MADE = $(ENABLED)
30+
# ENABLE_MOHAWK = $(ENABLED)
31+
# ENABLE_PARALLACTION = $(ENABLED)
32+
# ENABLE_QUEEN = $(ENABLED)
33+
# ENABLE_SAGA = $(ENABLED)
34+
# ENABLE_SAGA2 = $(ENABLED)
35+
# ENABLE_SCI = $(ENABLED)
36+
## ENABLE_SCI32 = $(ENABLED)
37+
# ENABLE_SKY = $(ENABLED)
38+
# ENABLE_SWORD1 = $(ENABLED)
39+
# ENABLE_SWORD2 = $(ENABLED)
40+
# ENABLE_TEENAGENT = $(ENABLED)
41+
# ENABLE_TINSEL = $(ENABLED)
42+
# ENABLE_TOON = $(ENABLED)
43+
# ENABLE_TOUCHE = $(ENABLED)
44+
# ENABLE_TUCKER = $(ENABLED)
45+
3346

3447
HAVE_GCC3 = true
3548

36-
CC = ee-gcc
49+
CC = ee-gcc
3750
CXX = ee-g++
3851
AS = ee-gcc
3952
LD = ee-gcc
@@ -48,35 +61,35 @@ VPATH = $(srcdir)
4861
INCDIR = ../../../
4962
# DEPDIR = .deps
5063

51-
DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar
52-
64+
DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
65+
DEFINES += -DRELEASE_BUILD
5366

5467
INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
5568
INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
5669

70+
CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
71+
5772
TARGET = elf/scummvm.elf
5873

59-
OBJS := backends/platform/ps2/DmaPipe.o \
60-
backends/platform/ps2/Gs2dScreen.o \
61-
backends/platform/ps2/irxboot.o \
62-
backends/platform/ps2/ps2input.o \
63-
backends/platform/ps2/ps2pad.o \
64-
backends/platform/ps2/savefilemgr.o \
65-
backends/platform/ps2/fileio.o \
66-
backends/platform/ps2/asyncfio.o \
67-
backends/platform/ps2/icon.o \
68-
backends/platform/ps2/cd.o \
69-
backends/platform/ps2/eecodyvdfs.o \
70-
backends/platform/ps2/rpckbd.o \
71-
backends/platform/ps2/systemps2.o \
72-
backends/platform/ps2/ps2mutex.o \
73-
backends/platform/ps2/ps2time.o \
74-
backends/platform/ps2/ps2debug.o
74+
OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
75+
$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
76+
$(srcdir)/backends/platform/ps2/irxboot.o \
77+
$(srcdir)/backends/platform/ps2/ps2input.o \
78+
$(srcdir)/backends/platform/ps2/ps2pad.o \
79+
$(srcdir)/backends/platform/ps2/savefilemgr.o \
80+
$(srcdir)/backends/platform/ps2/fileio.o \
81+
$(srcdir)/backends/platform/ps2/asyncfio.o \
82+
$(srcdir)/backends/platform/ps2/icon.o \
83+
$(srcdir)/backends/platform/ps2/cd.o \
84+
$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
85+
$(srcdir)/backends/platform/ps2/rpckbd.o \
86+
$(srcdir)/backends/platform/ps2/systemps2.o \
87+
$(srcdir)/backends/platform/ps2/ps2mutex.o \
88+
$(srcdir)/backends/platform/ps2/ps2time.o \
89+
$(srcdir)/backends/platform/ps2/ps2debug.o
7590

7691
MODULE_DIRS += .
7792

78-
BACKEND := ps2
79-
8093
include $(srcdir)/Makefile.common
8194

8295
LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile

‎backends/platform/ps2/Makefile.ps2‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,41 @@ ENABLE_SCUMM_7_8 = $(ENABLED)
1212
ENABLE_HE = $(ENABLED)
1313
ENABLE_AGI = $(ENABLED)
1414
ENABLE_AGOS = $(ENABLED)
15+
ENABLE_AGOS2 = $(ENABLED)
1516
ENABLE_CINE = $(ENABLED)
1617
ENABLE_CRUISE = $(ENABLED)
18+
ENABLE_DRACI = $(ENABLED)
1719
ENABLE_DRASCULA = $(ENABLED)
1820
ENABLE_GOB = $(ENABLED)
21+
ENABLE_GROOVIE = $(ENABLED)
22+
# ENABLE_GROOVIE2 = $(ENABLED)
23+
ENABLE_HUGO = $(ENABLED)
24+
ENABLE_IHNM = $(ENABLED)
1925
ENABLE_KYRA = $(ENABLED)
26+
# ENABLE_LOL = $(ENABLED)
2027
ENABLE_LURE = $(ENABLED)
2128
# ENABLE_M4 = $(ENABLED)
2229
ENABLE_MADE = $(ENABLED)
30+
ENABLE_MOHAWK = $(ENABLED)
2331
ENABLE_PARALLACTION = $(ENABLED)
2432
ENABLE_QUEEN = $(ENABLED)
2533
ENABLE_SAGA = $(ENABLED)
26-
ENABLE_SAGA2 = $(ENABLED)
27-
ENABLE_IHNM = $(ENABLED)
34+
# ENABLE_SAGA2 = $(ENABLED)
35+
ENABLE_SCI = $(ENABLED)
36+
# ENABLE_SCI32 = $(ENABLED)
2837
ENABLE_SKY = $(ENABLED)
2938
ENABLE_SWORD1 = $(ENABLED)
3039
ENABLE_SWORD2 = $(ENABLED)
31-
# ENABLE_TINSEL = $(ENABLED)
40+
ENABLE_TEENAGENT = $(ENABLED)
41+
ENABLE_TINSEL = $(ENABLED)
42+
ENABLE_TOON = $(ENABLED)
3243
ENABLE_TOUCHE = $(ENABLED)
44+
ENABLE_TUCKER = $(ENABLED)
45+
3346

3447
HAVE_GCC3 = true
3548

36-
CC = ee-gcc
49+
CC = ee-gcc
3750
CXX = ee-g++
3851
AS = ee-gcc
3952
LD = ee-gcc
@@ -48,30 +61,32 @@ VPATH = $(srcdir)
4861
INCDIR = ../../../
4962
# DEPDIR = .deps
5063

51-
DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
52-
64+
DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
65+
DEFINES += -DRELEASE_BUILD
5366

5467
INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
5568
INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
5669

70+
CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
71+
5772
TARGET = elf/scummvm.elf
5873

59-
OBJS := backends/platform/ps2/DmaPipe.o \
60-
backends/platform/ps2/Gs2dScreen.o \
61-
backends/platform/ps2/irxboot.o \
62-
backends/platform/ps2/ps2input.o \
63-
backends/platform/ps2/ps2pad.o \
64-
backends/platform/ps2/savefilemgr.o \
65-
backends/platform/ps2/fileio.o \
66-
backends/platform/ps2/asyncfio.o \
67-
backends/platform/ps2/icon.o \
68-
backends/platform/ps2/cd.o \
69-
backends/platform/ps2/eecodyvdfs.o \
70-
backends/platform/ps2/rpckbd.o \
71-
backends/platform/ps2/systemps2.o \
72-
backends/platform/ps2/ps2mutex.o \
73-
backends/platform/ps2/ps2time.o \
74-
backends/platform/ps2/ps2debug.o
74+
OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
75+
$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
76+
$(srcdir)/backends/platform/ps2/irxboot.o \
77+
$(srcdir)/backends/platform/ps2/ps2input.o \
78+
$(srcdir)/backends/platform/ps2/ps2pad.o \
79+
$(srcdir)/backends/platform/ps2/savefilemgr.o \
80+
$(srcdir)/backends/platform/ps2/fileio.o \
81+
$(srcdir)/backends/platform/ps2/asyncfio.o \
82+
$(srcdir)/backends/platform/ps2/icon.o \
83+
$(srcdir)/backends/platform/ps2/cd.o \
84+
$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
85+
$(srcdir)/backends/platform/ps2/rpckbd.o \
86+
$(srcdir)/backends/platform/ps2/systemps2.o \
87+
$(srcdir)/backends/platform/ps2/ps2mutex.o \
88+
$(srcdir)/backends/platform/ps2/ps2time.o \
89+
$(srcdir)/backends/platform/ps2/ps2debug.o
7590

7691
MODULE_DIRS += .
7792

‎backends/platform/samsungtv/main.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222

2323
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
2424

25+
#include "common/scummsys.h"
26+
27+
#if defined(SAMSUNGTV)
28+
2529
#include "backends/platform/samsungtv/samsungtv.h"
2630
#include "backends/plugins/sdl/sdl-provider.h"
2731
#include "base/main.h"
2832

29-
#if defined(SAMSUNGTV)
30-
3133
#include <unistd.h>
3234

3335
extern "C" int Game_Main(char *path, char *) {

‎backends/platform/samsungtv/samsungtv.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@
2020
*
2121
*/
2222

23+
#include "common/scummsys.h"
24+
25+
#if defined(SAMSUNGTV)
26+
2327
#include "backends/platform/samsungtv/samsungtv.h"
2428
#include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
2529
#include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
26-
27-
#if defined(SAMSUNGTV)
30+
#include "common/textconsole.h"
2831

2932
OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV()
3033
:

0 commit comments

Comments
 (0)