[Scummvm-git-logs] scummvm master -> 5b0b23e7600d92b4b68c5e3784387c8c194d60b3

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fc1371ecfa Revert "TINSEL: Replace initializer list with constructor"
5b0b23e760 MACOSX: Fix bundle make target


Commit: fc1371ecfac761666f0df80b1a523adf3f2560c9
    https://github.com/scummvm/scummvm/commit/fc1371ecfac761666f0df80b1a523adf3f2560c9
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-10-04T18:51:50+01:00

Commit Message:
Revert "TINSEL: Replace initializer list with constructor"

This reverts commit 8105d91802ba860f2a68c5909ef10863a19c0e14.
There was a question mark on this commit because the ANIM
struct is used in the MOVER struct that is zero-initialized
using memset, and adding a constructor to it make it non-POD
type.

Also now the engine has been marked as using c++11, so the
original code will not break buildbot.

Changed paths:
    engines/tinsel/anim.h
    engines/tinsel/cursor.cpp
    engines/tinsel/cursor.h


diff --git a/engines/tinsel/anim.h b/engines/tinsel/anim.h
index 2261f6edf2..0c0d5e18ae 100644
--- a/engines/tinsel/anim.h
+++ b/engines/tinsel/anim.h
@@ -32,9 +32,6 @@ struct OBJECT;
 
 /** animation structure */
 struct ANIM {
-	ANIM() : aniRate(0), aniDelta(0), pObject(nullptr),
-		hScript(0), scriptIndex(0) {};
-
 	int aniRate;		///< animation speed
 	int aniDelta;		///< animation speed delta counter
 	OBJECT *pObject;	///< object to animate (assumed to be multi-part)
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp
index b90d763487..412576831a 100644
--- a/engines/tinsel/cursor.cpp
+++ b/engines/tinsel/cursor.cpp
@@ -55,6 +55,9 @@ Cursor::Cursor() {
 	_mainCursor = nullptr;
 	_auxCursor = nullptr;
 
+	_mainCursorAnim = {0, 0, 0, 0, 0};
+	_auxCursorAnim = {0, 0, 0, 0, 0};
+
 	_hiddenCursor = false;
 	_hiddenTrails = false;
 	_tempHiddenCursor = false;
diff --git a/engines/tinsel/cursor.h b/engines/tinsel/cursor.h
index 465a7c16ea..750058dfc5 100644
--- a/engines/tinsel/cursor.h
+++ b/engines/tinsel/cursor.h
@@ -110,9 +110,9 @@ private:
 	int _numTrails;
 	int _nextTrail;
 
-	// Auxillary cursor image's animation offsets
+    // Auxillary cursor image's animation offsets
 	short _auxCursorOffsetX;
-	short _auxCursorOffsetY;
+    short _auxCursorOffsetY;
 
 	struct {
 		ANIM trailAnim;   // Animation structure


Commit: 5b0b23e7600d92b4b68c5e3784387c8c194d60b3
    https://github.com/scummvm/scummvm/commit/5b0b23e7600d92b4b68c5e3784387c8c194d60b3
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-10-04T18:51:50+01:00

Commit Message:
MACOSX: Fix bundle make target

Changed paths:
    dists/macosx/Info.plist
    dists/macosx/Info.plist.in
    ports.mk


diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index c3f8e4faab..12bda21352 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -66,6 +66,11 @@
 	<string>Copyright 2001-2020 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>LSEnvironment</key>
+	<dict>
+		<key>SDL_RENDER_DRIVER</key>
+		<string>opengl</string>
+	</dict>
 	<key>SUFeedURL</key>
 	<string>https://www.scummvm.org/appcasts/macosx/release.xml</string>
 	<key>SUPublicEDKey</key>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index f9360a92ea..d7d32ca938 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -66,6 +66,10 @@
 	<string>Copyright 2001-2020 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<dict>
+		<key>SDL_RENDER_DRIVER</key>
+		<string>opengl</string>
+	</dict>
 	<key>SUFeedURL</key>
 	<string>https://www.scummvm.org/appcasts/macosx/release.xml</string>
 	<key>SUPublicEDKey</key>
diff --git a/ports.mk b/ports.mk
index b56279940a..3629fe1f3a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -424,8 +424,8 @@ endif
 # Special target to create a static linked binary for Mac OS X.
 # We use -force_cpusubtype_ALL to ensure the binary runs on every
 # PowerPC machine.
-scummvm-static: $(OBJS)
-	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(OBJS) \
+scummvm-static: $(OBJS) $(DETECT_OBJS)
+	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(OBJS) $(DETECT_OBJS) \
 		-framework CoreMIDI \
 		$(OSX_STATIC_LIBS) \
 		$(OSX_ZLIB)