[Scummvm-git-logs] scummvm master -> 74d7fd00cc6ba18a9560b102888e9f56eca709d6
SupSuper
supsuper at gmail.com
Fri Oct 9 20:30:34 UTC 2020
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9ed8525c63 GRIM: Remove obsolete Windows headers
9340135b03 MYST3: Remove obsolete Windows headers
e2efeacc12 MSVC: Add OpenGL libraries
74d7fd00cc CI: Add GLEW libraries
Commit: 9ed8525c637822c98287b4b932b7fdc6c0050057
https://github.com/scummvm/scummvm/commit/9ed8525c637822c98287b4b932b7fdc6c0050057
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-09T21:24:52+01:00
Commit Message:
GRIM: Remove obsolete Windows headers
Changed paths:
engines/grim/gfx_opengl.cpp
engines/grim/gfx_opengl_shaders.cpp
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index 17ee7810be..d8d972c94d 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -20,12 +20,6 @@
*
*/
-#if defined(WIN32)
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-#endif
-
#include "common/endian.h"
#include "common/system.h"
#include "common/config-manager.h"
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index c44e4c40e1..5056853f9b 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -36,12 +36,6 @@
* all copies or substantial portions of the Software.
*/
-#if defined(WIN32)
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-#endif
-
#include "common/endian.h"
#include "common/file.h"
#include "common/str.h"
Commit: 9340135b03b24023a696324ef067e1de2d5f1e9c
https://github.com/scummvm/scummvm/commit/9340135b03b24023a696324ef067e1de2d5f1e9c
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-09T21:25:24+01:00
Commit Message:
MYST3: Remove obsolete Windows headers
Changed paths:
engines/myst3/gfx.cpp
engines/myst3/gfx_opengl.cpp
engines/myst3/gfx_opengl_shaders.cpp
engines/myst3/gfx_tinygl.cpp
diff --git a/engines/myst3/gfx.cpp b/engines/myst3/gfx.cpp
index da80bdb494..063fbd3f2d 100644
--- a/engines/myst3/gfx.cpp
+++ b/engines/myst3/gfx.cpp
@@ -20,12 +20,6 @@
*
*/
-#if defined(WIN32)
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-#endif
-
#include "engines/myst3/gfx.h"
#include "engines/util.h"
diff --git a/engines/myst3/gfx_opengl.cpp b/engines/myst3/gfx_opengl.cpp
index fe9d504cbf..6268843169 100644
--- a/engines/myst3/gfx_opengl.cpp
+++ b/engines/myst3/gfx_opengl.cpp
@@ -20,12 +20,6 @@
*
*/
-#if defined(WIN32)
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-#endif
-
#include "common/rect.h"
#include "common/textconsole.h"
diff --git a/engines/myst3/gfx_opengl_shaders.cpp b/engines/myst3/gfx_opengl_shaders.cpp
index 74b3c0e6fb..4a50de74fa 100644
--- a/engines/myst3/gfx_opengl_shaders.cpp
+++ b/engines/myst3/gfx_opengl_shaders.cpp
@@ -36,12 +36,6 @@
* all copies or substantial portions of the Software.
*/
-#if defined(WIN32)
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-#endif
-
#include "common/rect.h"
#include "common/textconsole.h"
diff --git a/engines/myst3/gfx_tinygl.cpp b/engines/myst3/gfx_tinygl.cpp
index a32198d468..315ef02a4d 100644
--- a/engines/myst3/gfx_tinygl.cpp
+++ b/engines/myst3/gfx_tinygl.cpp
@@ -20,12 +20,6 @@
*
*/
-#if defined(WIN32)
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-#endif
-
#include "common/config-manager.h"
#include "common/rect.h"
#include "common/textconsole.h"
Commit: e2efeacc128e8a4ce97bf58086ccf64cc8b00b74
https://github.com/scummvm/scummvm/commit/e2efeacc128e8a4ce97bf58086ccf64cc8b00b74
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-09T21:26:36+01:00
Commit Message:
MSVC: Add OpenGL libraries
Changed paths:
devtools/create_project/msvc.cpp
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 2d02d70560..3972b59a4a 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -75,9 +75,11 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
{ "sdlnet", "SDL_net.lib", 0, "iphlpapi.lib", 0 },
{ "sdl2net", "SDL2_net.lib", 0, "iphlpapi.lib", "SDL_net.lib" },
{ "discord", "discord-rpc.lib", 0, 0, 0 },
+ { "glew", "glew32.lib", "glew32d.lib", 0, 0 },
// Feature flags with library dependencies
{ "updates", "winsparkle.lib", 0, 0, 0 },
- { "tts", 0, 0, "sapi.lib", 0 }
+ { "tts", 0, 0, "sapi.lib", 0 },
+ { "opengl", 0, 0, "opengl32.lib", 0 }
};
// HACK for switching SDL_net to SDL2_net
Commit: 74d7fd00cc6ba18a9560b102888e9f56eca709d6
https://github.com/scummvm/scummvm/commit/74d7fd00cc6ba18a9560b102888e9f56eca709d6
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-09T21:29:43+01:00
Commit Message:
CI: Add GLEW libraries
Changed paths:
.github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97e0a80e04..cfe4ef0b9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,21 +15,21 @@ jobs:
arch: x86
# fribidi is disabled due to timeouts when installing the package
configFlags: --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi
- vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
+ vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
useNasm: 'true'
- platform: x64
arch: x64
triplet: x64-windows
# fribidi is disabled due to timeouts when installing the package
configFlags: --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi
- vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
+ vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
- platform: arm64
arch: arm64
triplet: arm64-windows
# fribidi is disabled due to https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64
# Note that fribidi is also disabled on arm64 in devtools/create_project/msvc.cpp
configFlags: --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi
- vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
+ vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
env:
CONFIGURATION: Release
PLATFORM: ${{ matrix.platform }}
@@ -103,7 +103,7 @@ jobs:
- platform: macosx
buildFlags: -scheme ScummVM-macOS
configFlags: --disable-nasm --enable-faad --enable-mpeg2
- brewPackages: a52dec faad2 flac fluid-synth freetype fribidi mad libmpeg2 libogg libpng libvorbis sdl2 sdl2_net theora
+ brewPackages: a52dec faad2 flac fluid-synth freetype fribidi glew mad libmpeg2 libogg libpng libvorbis sdl2 sdl2_net theora
- platform: ios7
buildFlags: -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO
configFlags: --disable-nasm --disable-opengl --disable-theora --disable-taskbar --disable-tts --disable-fribidi
More information about the Scummvm-git-logs
mailing list