[Scummvm-git-logs] scummvm master -> 4706a8486eacb5a189e2e5d4e478c499f0f31039
csnover
csnover at users.noreply.github.com
Mon Sep 11 05:19:33 CEST 2017
This automated email contains information about 13 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2f32eeab9d CREATE_PROJECT: Fix typo in Xcode generator interface
0185c6cffd CREATE_PROJECT: Fix Xcode builder library includes
9db0c9c607 CREATE_PROJECT: Allow FluidSynth on macOS
3c5440add7 CREATE_PROJECT: Move browser_osx.mm hack to Xcode generator
dbcde0c414 CREATE_PROJECT: Ignore undefined-var-template warnings by default
d282e5c3f3 CREATE_PROJECT: Increment default iOS build target in Xcode generator
2191533d4f CREATE_PROJECT: Update Xcode generator to use most Xcode-recommended warnings
16b76d22a1 CREATE_PROJECT: Add LastUpgradeCheck to generated project file
b91a48f279 CREATE_PROJECT: Fix typo in unused macro
56810b5598 MACOS: Fix deprecation warnings in macOS 10.12
6e2f18c498 MACOS: Fix warnings about undeclared selectors
200c8c442b SCI: Remove dead code
4706a8486e GRAPHICS: Remove dead code in BDF loadCharacter code
Commit: 2f32eeab9def91ade9d279f4634c46b294960c14
https://github.com/scummvm/scummvm/commit/2f32eeab9def91ade9d279f4634c46b294960c14
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:12-05:00
Commit Message:
CREATE_PROJECT: Fix typo in Xcode generator interface
Changed paths:
devtools/create_project/xcode.cpp
devtools/create_project/xcode.h
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index d60934b..61f1c3e 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -314,7 +314,7 @@ void XcodeProvider::createOtherBuildFiles(const BuildSetup &setup) {
// This needs to be done at the end when all build files have been accounted for
setupSourcesBuildPhase();
- ouputMainProjectFile(setup);
+ outputMainProjectFile(setup);
}
// Store information about a project here, for use at the end
@@ -337,7 +337,7 @@ void XcodeProvider::createProjectFile(const std::string &, const std::string &,
//////////////////////////////////////////////////////////////////////////
// Main Project file
//////////////////////////////////////////////////////////////////////////
-void XcodeProvider::ouputMainProjectFile(const BuildSetup &setup) {
+void XcodeProvider::outputMainProjectFile(const BuildSetup &setup) {
std::ofstream project((setup.outputDir + '/' + PROJECT_NAME ".xcodeproj" + '/' + "project.pbxproj").c_str());
if (!project)
error("Could not open \"" + setup.outputDir + '/' + PROJECT_NAME ".xcodeproj" + '/' + "project.pbxproj\" for writing");
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index d495dd0..c3b44b2 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -308,7 +308,7 @@ private:
ObjectList _buildConfiguration;
ObjectList _configurationList;
- void ouputMainProjectFile(const BuildSetup &setup);
+ void outputMainProjectFile(const BuildSetup &setup);
// Setup objects
void setupCopyFilesBuildPhase();
Commit: 0185c6cffd851b6bde654b276b073723a5f33daf
https://github.com/scummvm/scummvm/commit/0185c6cffd851b6bde654b276b073723a5f33daf
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:13-05:00
Commit Message:
CREATE_PROJECT: Fix Xcode builder library includes
Libraries were being included unconditionally regardless of the
arguments passed to create_project, and in the case of macOS were
being added using manual linker flags and other such hacks instead
of using the Frameworks list.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 61f1c3e..7d58f31 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -452,11 +452,45 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
DEF_SYSTBD("libiconv");
// Local libraries
- DEF_LOCALLIB_STATIC("libFLAC");
- DEF_LOCALLIB_STATIC("libmad");
- DEF_LOCALLIB_STATIC("libvorbisidec");
- DEF_LOCALLIB_STATIC("libfreetype");
-// DEF_LOCALLIB_STATIC("libmpeg2");
+ if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
+ DEF_LOCALLIB_STATIC("libFLAC");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
+ DEF_LOCALLIB_STATIC("libfluidsynth");
+ DEF_LOCALLIB_STATIC("libglib-2.0");
+ DEF_SYSTBD("libffi");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_FREETYPE2")) {
+ DEF_LOCALLIB_STATIC("libfreetype");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_JPEG")) {
+ DEF_LOCALLIB_STATIC("libjpeg");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_LIBCURL")) {
+ DEF_LOCALLIB_STATIC("libcurl");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
+ DEF_LOCALLIB_STATIC("libmad");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) {
+ DEF_LOCALLIB_STATIC("libpng");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) {
+ DEF_LOCALLIB_STATIC("libogg");
+ DEF_LOCALLIB_STATIC("libvorbis");
+ DEF_LOCALLIB_STATIC("libvorbisfile");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_ZLIB")) {
+ DEF_SYSTBD("libz");
+ }
+
+ if (setup.useSDL2) {
+ DEF_LOCALLIB_STATIC("libSDL2main");
+ DEF_LOCALLIB_STATIC("libSDL2");
+ } else {
+ DEF_LOCALLIB_STATIC("libSDLmain");
+ DEF_LOCALLIB_STATIC("libSDL");
+ }
std::string absoluteOutputDir;
#ifdef POSIX
@@ -468,16 +502,6 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
absoluteOutputDir = "lib";
#endif
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libFLAC.a", "libFLAC", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libfreetype.a", "libfreetype", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libogg.a", "libogg", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libpng.a", "libpng", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libvorbis.a", "libvorbis", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libmad.a", "libmad", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libfluidsynth.a", "libfluidsynth", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libglib.a", "libglib", true);
- DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libffi.a", "libffi", true);
-
frameworksGroup->_properties["children"] = children;
_groups.add(frameworksGroup);
// Force this to be added as a sub-group in the root.
@@ -521,17 +545,21 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) {
frameworks_iOS.push_back("libogg.a");
frameworks_iOS.push_back("libvorbis.a");
+ frameworks_iOS.push_back("libvorbisfile.a");
}
if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
frameworks_iOS.push_back("libmad.a");
}
if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
frameworks_iOS.push_back("libfluidsynth.a");
- frameworks_iOS.push_back("libglib.a");
- frameworks_iOS.push_back("libffi.a");
+ frameworks_iOS.push_back("libglib-2.0.a");
+ frameworks_iOS.push_back("libffi.tbd");
frameworks_iOS.push_back("CoreMIDI.framework");
frameworks_iOS.push_back("libiconv.tbd");
}
+ if (CONTAINS_DEFINE(setup.defines, "USE_ZLIB")) {
+ frameworks_iOS.push_back("libz.tbd");
+ }
for (ValueList::iterator framework = frameworks_iOS.begin(); framework != frameworks_iOS.end(); framework++) {
std::string id = "Frameworks_" + *framework + "_iphone";
@@ -571,6 +599,46 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
frameworks_osx.push_back("Cocoa.framework");
frameworks_osx.push_back("AudioUnit.framework");
+ if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
+ frameworks_osx.push_back("libFLAC.a");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
+ frameworks_osx.push_back("libfluidsynth.a");
+ frameworks_osx.push_back("libglib-2.0.a");
+ frameworks_osx.push_back("libffi.tbd");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_FREETYPE2")) {
+ frameworks_osx.push_back("libfreetype.a");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_JPEG")) {
+ frameworks_osx.push_back("libjpeg.a");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_LIBCURL")) {
+ frameworks_osx.push_back("libcurl.a");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
+ frameworks_osx.push_back("libmad.a");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) {
+ frameworks_osx.push_back("libpng.a");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) {
+ frameworks_osx.push_back("libogg.a");
+ frameworks_osx.push_back("libvorbis.a");
+ frameworks_osx.push_back("libvorbisfile.a");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "USE_ZLIB")) {
+ frameworks_osx.push_back("libz.tbd");
+ }
+
+ if (setup.useSDL2) {
+ frameworks_osx.push_back("libSDL2main.a");
+ frameworks_osx.push_back("libSDL2.a");
+ } else {
+ frameworks_osx.push_back("libSDLmain.a");
+ frameworks_osx.push_back("libSDL.a");
+ }
+
order = 0;
for (ValueList::iterator framework = frameworks_osx.begin(); framework != frameworks_osx.end(); framework++) {
std::string id = "Frameworks_" + *framework + "_osx";
@@ -810,7 +878,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING_QUOTE(scummvm_Debug, "LIBRARY_SEARCH_PATHS", "");
ADD_SETTING(scummvm_Debug, "ONLY_ACTIVE_ARCH", "YES");
ADD_SETTING_QUOTE(scummvm_Debug, "OTHER_CFLAGS", "");
- ADD_SETTING_QUOTE(scummvm_Debug, "OTHER_LDFLAGS", "-lz");
+ ADD_SETTING_QUOTE(scummvm_Debug, "OTHER_LDFLAGS", "");
ADD_SETTING(scummvm_Debug, "ENABLE_TESTABILITY", "YES");
scummvm_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
@@ -944,26 +1012,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
scummvmOSX_LibPaths.push_back("\"\\\"$(SRCROOT)/lib\\\"\"");
ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, kSettingsNoQuote | kSettingsAsList, 5);
ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", "");
- ValueList scummvmOSX_LdFlags;
- scummvmOSX_LdFlags.push_back("-logg");
- scummvmOSX_LdFlags.push_back("-lpng");
- scummvmOSX_LdFlags.push_back("-ljpeg");
- scummvmOSX_LdFlags.push_back("-ltheora");
- scummvmOSX_LdFlags.push_back("-lfreetype");
- scummvmOSX_LdFlags.push_back("-lvorbisfile");
- scummvmOSX_LdFlags.push_back("-lvorbis");
- scummvmOSX_LdFlags.push_back("-lmad");
- scummvmOSX_LdFlags.push_back("-lFLAC");
- scummvmOSX_LdFlags.push_back("-lcurl");
- if (setup.useSDL2) {
- scummvmOSX_LdFlags.push_back("-lSDL2main");
- scummvmOSX_LdFlags.push_back("-lSDL2");
- } else {
- scummvmOSX_LdFlags.push_back("-lSDLmain");
- scummvmOSX_LdFlags.push_back("-lSDL");
- }
- scummvmOSX_LdFlags.push_back("-lz");
- ADD_SETTING_LIST(scummvmOSX_Debug, "OTHER_LDFLAGS", scummvmOSX_LdFlags, kSettingsAsList, 5);
ADD_SETTING(scummvmOSX_Debug, "PRODUCT_NAME", PROJECT_NAME);
scummvmOSX_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
Commit: 9db0c9c60707eb3e999dfb1408950a0b17c85105
https://github.com/scummvm/scummvm/commit/9db0c9c60707eb3e999dfb1408950a0b17c85105
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:13-05:00
Commit Message:
CREATE_PROJECT: Allow FluidSynth on macOS
FluidSynth does build and run successfully, but it is necessary
to get the correct static libraries. It can be manually built
against dylib, if desired, by manually adding the fluidsynth.dylib
to the Frameworks. Since this will result in a runtime dependency,
this is not set up by default.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 7d58f31..7e4a70c 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1077,7 +1077,7 @@ void XcodeProvider::setupAdditionalSources(std::string targetName, Property &fil
void XcodeProvider::setupDefines(const BuildSetup &setup) {
for (StringList::const_iterator i = setup.defines.begin(); i != setup.defines.end(); ++i) {
- if (*i == "USE_NASM" || *i == "USE_FLUIDSYNTH") // Not supported on Mac
+ if (*i == "USE_NASM") // Not supported on Mac
continue;
ADD_DEFINE(_defines, *i);
Commit: 3c5440add702f404ac9b0eac25c2655b7b23b884
https://github.com/scummvm/scummvm/commit/3c5440add702f404ac9b0eac25c2655b7b23b884
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:14-05:00
Commit Message:
CREATE_PROJECT: Move browser_osx.mm hack to Xcode generator
c19c10d548b2867bc4fd003fb29ac0017b2bd29d fixed the bad parsing of
module.mk which meant the Xcode generator broke. For the moment,
just move the hack for browser_osx.mm into the generator, until
there is a more elegant solution to this problem (if ever).
Changed paths:
devtools/create_project/xcode.cpp
gui/module.mk
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 7e4a70c..78c3cf3 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -389,6 +389,14 @@ void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &p
// for folders, we shouldn't add folders as file references, obviously.
if (node->children.empty()) {
group->addChildFile(node->name);
+
+ // HACK: Also add browser_osx.mm, since browser.cpp is added for
+ // iOS and browser_osx.mm for macOS, and create_project cannot
+ // deal with two competing exclusive ifdefs in module.mk going
+ // into one project
+ if (filePrefix.find("/gui/") == filePrefix.size() - 5 && node->name == "browser.cpp") {
+ group->addChildFile("browser_osx.mm");
+ }
}
// Process child nodes
if (!node->children.empty())
@@ -1066,6 +1074,11 @@ void XcodeProvider::setupAdditionalSources(std::string targetName, Property &fil
if (targetIsIOS(targetName)) {
const std::string absoluteCatalogPath = _projectRoot + "/dists/ios7/Images.xcassets";
ADD_SETTING_ORDER_NOVALUE(files, getHash(absoluteCatalogPath), "Image Asset Catalog", order++);
+ } else {
+ // HACK: browser_osx.mm needs to be added
+ const std::string browserPath = "gui/browser_osx.mm";
+ const std::string comment = "browser_osx.mm in Sources";
+ ADD_SETTING_ORDER_NOVALUE(files, getHash(browserPath), comment, order++);
}
}
diff --git a/gui/module.mk b/gui/module.mk
index 5b32689..171b3aa 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -37,14 +37,6 @@ MODULE_OBJS := \
widgets/scrollcontainer.o \
widgets/tab.o
-# HACK: create_project's XCode generator relies on the following ifdef
-# structure to pick up the right browser implementations for iOS and Mac OS X.
-# Please keep it like this or XCode project generation will be broken.
-# FIXME: This only works because of a bug in how we handle ifdef statements in
-# create_project's module.mk parser. create_project will think that both
-# browser.o and browser_osx.o is built when both IPHONE and MACOSX is set.
-# When we do proper ifdef handling, only browser.o will be picked up, breaking
-# XCode generation.
ifdef IPHONE
MODULE_OBJS += \
browser.o
@@ -52,9 +44,6 @@ else
ifdef MACOSX
MODULE_OBJS += \
browser_osx.o
-else
-MODULE_OBJS += \
- browser.o
endif
endif
Commit: dbcde0c4147c6b6357e0da59036b4aa2291df011
https://github.com/scummvm/scummvm/commit/dbcde0c4147c6b6357e0da59036b4aa2291df011
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:14-05:00
Commit Message:
CREATE_PROJECT: Ignore undefined-var-template warnings by default
Starting in Xcode 8, clang reports warnings about singleton
instantiation which are noisy, so suppress these warnings for the
moment. An attempt to fix this properly was added in
eefa72afa1978a9dea10f5b1833fcc8f58a3468e but it was backed out in
940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.
See https://github.com/scummvm/scummvm/pull/967 and
https://github.com/scummvm/scummvm/pull/994.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 78c3cf3..004a2ec 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -868,7 +868,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING(scummvm_Debug, "GCC_INPUT_FILETYPE", "automatic");
ADD_SETTING(scummvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
ADD_SETTING(scummvm_Debug, "GCC_WARN_SIGN_COMPARE", "YES");
- ADD_SETTING(scummvm_Debug, "WARNING_CFLAGS", "-Wno-multichar");
+ ADD_SETTING_QUOTE(scummvm_Debug, "WARNING_CFLAGS", "-Wno-multichar -Wno-undefined-var-template");
ValueList scummvm_defines(_defines);
REMOVE_DEFINE(scummvm_defines, "MACOSX");
REMOVE_DEFINE(scummvm_defines, "IPHONE");
Commit: d282e5c3f309a6f8183e6853eb285c62c67c91d0
https://github.com/scummvm/scummvm/commit/d282e5c3f309a6f8183e6853eb285c62c67c91d0
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:14-05:00
Commit Message:
CREATE_PROJECT: Increment default iOS build target in Xcode generator
Xcode 8/macOS 10.12 minimum target for iOS is now iOS 8.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 004a2ec..51bb9e6 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -943,8 +943,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING(iPhone_Debug, "ONLY_ACTIVE_ARCH", "YES");
ADD_SETTING(iPhone_Debug, "PRODUCT_NAME", PROJECT_NAME);
ADD_SETTING(iPhone_Debug, "PRODUCT_BUNDLE_IDENTIFIER", "\"org.scummvm.${PRODUCT_NAME}\"");
- ADD_SETTING(iPhone_Debug, "IPHONEOS_DEPLOYMENT_TARGET", "7.1");
- //ADD_SETTING_QUOTE(iPhone_Debug, "PROVISIONING_PROFILE", "EF590570-5FAC-4346-9071-D609DE2B28D8");
+ ADD_SETTING(iPhone_Debug, "IPHONEOS_DEPLOYMENT_TARGET", "8.0");
ADD_SETTING_QUOTE_VAR(iPhone_Debug, "PROVISIONING_PROFILE[sdk=iphoneos*]", "");
ADD_SETTING(iPhone_Debug, "SDKROOT", "iphoneos");
ADD_SETTING_QUOTE(iPhone_Debug, "TARGETED_DEVICE_FAMILY", "1,2");
Commit: 2191533d4fca632a631b3e1cc868c22975e09f13
https://github.com/scummvm/scummvm/commit/2191533d4fca632a631b3e1cc868c22975e09f13
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:15-05:00
Commit Message:
CREATE_PROJECT: Update Xcode generator to use most Xcode-recommended warnings
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 51bb9e6..f3eb7e0 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -859,16 +859,34 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
Property scummvm_Debug;
ADD_SETTING(scummvm_Debug, "ALWAYS_SEARCH_USER_PATHS", "NO");
ADD_SETTING_QUOTE(scummvm_Debug, "USER_HEADER_SEARCH_PATHS", "$(SRCROOT) $(SRCROOT)/engines");
+ ADD_SETTING(scummvm_Debug, "CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_BOOL_CONVERSION", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_CONSTANT_CONVERSION", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_EMPTY_BODY", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_ENUM_CONVERSION", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_INFINITE_RECURSION", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_INT_CONVERSION", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_SUSPICIOUS_MOVE", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN_UNREACHABLE_CODE", "YES");
+ ADD_SETTING(scummvm_Debug, "CLANG_WARN__DUPLICATE_METHOD_MATCH", "YES");
ADD_SETTING_QUOTE(scummvm_Debug, "CODE_SIGN_IDENTITY", "");
ADD_SETTING_QUOTE_VAR(scummvm_Debug, "CODE_SIGN_IDENTITY[sdk=iphoneos*]", "");
+ ADD_SETTING(scummvm_Debug, "ENABLE_STRICT_OBJC_MSGSEND", "YES");
ADD_SETTING_QUOTE(scummvm_Debug, "FRAMEWORK_SEARCH_PATHS", "");
ADD_SETTING(scummvm_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
ADD_SETTING(scummvm_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
ADD_SETTING(scummvm_Debug, "GCC_ENABLE_CPP_RTTI", "YES");
ADD_SETTING(scummvm_Debug, "GCC_INPUT_FILETYPE", "automatic");
+ ADD_SETTING(scummvm_Debug, "GCC_NO_COMMON_BLOCKS", "YES");
ADD_SETTING(scummvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
ADD_SETTING(scummvm_Debug, "GCC_WARN_SIGN_COMPARE", "YES");
- ADD_SETTING_QUOTE(scummvm_Debug, "WARNING_CFLAGS", "-Wno-multichar -Wno-undefined-var-template");
+ ADD_SETTING(scummvm_Debug, "GCC_WARN_UNDECLARED_SELECTOR", "YES");
+ ADD_SETTING(scummvm_Debug, "GCC_WARN_UNINITIALIZED_AUTOS", "YES");
+ ADD_SETTING(scummvm_Debug, "GCC_WARN_UNUSED_FUNCTION", "YES");
+ ValueList scummvm_WarningCFlags;
+ scummvm_WarningCFlags.push_back("-Wno-multichar");
+ scummvm_WarningCFlags.push_back("-Wno-undefined-var-template");
+ ADD_SETTING_LIST(scummvm_Debug, "WARNING_CFLAGS", scummvm_WarningCFlags, kSettingsQuoteVariable | kSettingsAsList, 5);
ValueList scummvm_defines(_defines);
REMOVE_DEFINE(scummvm_defines, "MACOSX");
REMOVE_DEFINE(scummvm_defines, "IPHONE");
Commit: 16b76d22a133eaf00f7a4dd24e8801fb8be9e8a5
https://github.com/scummvm/scummvm/commit/16b76d22a133eaf00f7a4dd24e8801fb8be9e8a5
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:15-05:00
Commit Message:
CREATE_PROJECT: Add LastUpgradeCheck to generated project file
This prevents the recommended updates warning appearing when
opening the project in Xcode for the first time.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index f3eb7e0..7a1a69d 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -34,6 +34,8 @@
namespace CreateProjectTool {
+#define LAST_XCODE_VERSION "0830"
+
#define DEBUG_XCODE_HASH 0
#define IOS_TARGET 0
@@ -707,6 +709,7 @@ void XcodeProvider::setupProject() {
project->addProperty("compatibilityVersion", "Xcode 3.2", "", kSettingsNoValue | kSettingsQuoteVariable);
project->addProperty("developmentRegion", "English", "", kSettingsNoValue);
project->addProperty("hasScannedForEncodings", "1", "", kSettingsNoValue);
+ project->addProperty("attributes", "{ LastUpgradeCheck = " LAST_XCODE_VERSION "; }", "", kSettingsNoQuote | kSettingsNoValue);
// List of known regions
Property regions;
Commit: b91a48f279d0df368019266f138dfca7895b75bf
https://github.com/scummvm/scummvm/commit/b91a48f279d0df368019266f138dfca7895b75bf
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:16-05:00
Commit Message:
CREATE_PROJECT: Fix typo in unused macro
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 7a1a69d..00ef800 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -54,7 +54,7 @@ namespace CreateProjectTool {
config._settings[key] = Setting(value, "", kSettingsNoQuote);
#define ADD_SETTING_ORDER(config, key, value, order) \
- config.settings[key] = Setting(value, "", kSettingsNoQuote, 0, order);
+ config._settings[key] = Setting(value, "", kSettingsNoQuote, 0, order);
#define ADD_SETTING_ORDER_NOVALUE(config, key, comment, order) \
config._settings[key] = Setting("", comment, kSettingsNoValue, 0, order);
Commit: 56810b5598458ce04dee4647a4044e9ca07a8577
https://github.com/scummvm/scummvm/commit/56810b5598458ce04dee4647a4044e9ca07a8577
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:16-05:00
Commit Message:
MACOS: Fix deprecation warnings in macOS 10.12
Changed paths:
backends/platform/sdl/macosx/appmenu_osx.mm
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index feea40b..452c386 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -28,6 +28,17 @@
#include <Cocoa/Cocoa.h>
+// macOS 10.12 deprecated many constants, #define the new names we need for
+// older SDKs. (This approach was taken from qemu.)
+#ifndef MAC_OS_X_VERSION_10_12
+#define MAC_OS_X_VERSION_10_12 101200
+#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
+#define NSEventModifierFlagCommand NSCommandKeyMask
+#define NSEventModifierFlagOption NSAlternateKeyMask
+#endif
+
// Apple added setAppleMenu in 10.5 and removed it in 10.6.
// But as the method still exists we declare it ourselves here.
// Yes, this works :)
@@ -92,7 +103,7 @@ void replaceApplicationMenuItems() {
// Add "Hide Others" menu item
nsString = constructNSStringFromCString(_("Hide Others"), stringEncoding);
menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:nsString action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
- [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
+ [menuItem setKeyEquivalentModifierMask:(NSEventModifierFlagOption|NSEventModifierFlagCommand)];
// Add "Show All" menu item
nsString = constructNSStringFromCString(_("Show All"), stringEncoding);
Commit: 6e2f18c498b6d40d8184dfe05993ac6d0ba99326
https://github.com/scummvm/scummvm/commit/6e2f18c498b6d40d8184dfe05993ac6d0ba99326
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:16-05:00
Commit Message:
MACOS: Fix warnings about undeclared selectors
When -Wundeclared-selector is enabled (recommended by Apple), the
calls to the setBadgeLabel selector in MacOSXTaskbarManager are
warned on because NSDockTile declarations are not included because
they do not exist in macOS 10.4 and earlier. While I don't know
that we are even supporting such old macOS versions these days, it
is simple enough to fix this problem when compiling to modern
macOS versions by conditionally including the necessary header.
Changed paths:
A backends/platform/sdl/macosx/macosx-compat.h
backends/platform/sdl/macosx/appmenu_osx.mm
backends/taskbar/macosx/macosx-taskbar.mm
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 452c386..b02d9c5 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -26,13 +26,8 @@
#include "backends/platform/sdl/macosx/appmenu_osx.h"
#include "common/translation.h"
-#include <Cocoa/Cocoa.h>
-
-// macOS 10.12 deprecated many constants, #define the new names we need for
-// older SDKs. (This approach was taken from qemu.)
-#ifndef MAC_OS_X_VERSION_10_12
-#define MAC_OS_X_VERSION_10_12 101200
-#endif
+#include "backends/platform/sdl/macosx/macosx-compat.h"
+#include <cocoa/Cocoa.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
#define NSEventModifierFlagCommand NSCommandKeyMask
diff --git a/backends/platform/sdl/macosx/macosx-compat.h b/backends/platform/sdl/macosx/macosx-compat.h
new file mode 100644
index 0000000..9bf1600
--- /dev/null
+++ b/backends/platform/sdl/macosx/macosx-compat.h
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef PLATFORM_SDL_MACOSX_COMPAT_H
+#define PLATFORM_SDL_MACOSX_COMPAT_H
+
+#include <AvailabilityMacros.h>
+
+#ifndef MAC_OS_X_VERSION_10_5
+#define MAC_OS_X_VERSION_10_5 1050
+#endif
+
+#ifndef MAC_OS_X_VERSION_10_12
+#define MAC_OS_X_VERSION_10_12 101200
+#endif
+
+#endif
diff --git a/backends/taskbar/macosx/macosx-taskbar.mm b/backends/taskbar/macosx/macosx-taskbar.mm
index 692fa84..f6d3be5 100644
--- a/backends/taskbar/macosx/macosx-taskbar.mm
+++ b/backends/taskbar/macosx/macosx-taskbar.mm
@@ -26,13 +26,10 @@
#if defined(MACOSX) && defined(USE_TASKBAR)
-// NSDockTile was introduced with Mac OS X 10.5.
-// Try provide backward compatibility by avoiding NSDockTile symbols.
-
#include "backends/taskbar/macosx/macosx-taskbar.h"
#include "common/config-manager.h"
#include "common/file.h"
-
+#include "backends/platform/sdl/macosx/macosx-compat.h"
#include <AppKit/NSApplication.h>
#include <AppKit/NSImage.h>
#include <Foundation/NSString.h>
@@ -44,7 +41,16 @@
#include <AppKit/NSBezierPath.h>
#include <CoreFoundation/CFString.h>
-id _dockTile;
+// NSDockTile was introduced with Mac OS X 10.5.
+// Try provide backward compatibility by avoiding NSDockTile symbols.
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+typedef id NSDockTilePtr;
+#else
+#include <AppKit/NSDockTile.h>
+typedef NSDockTile * NSDockTilePtr;
+#endif
+
+NSDockTilePtr _dockTile;
NSImageView *_applicationIconView;
NSImageView *_overlayIconView;
Commit: 200c8c442b21f20ac36636db58a12321c1479025
https://github.com/scummvm/scummvm/commit/200c8c442b21f20ac36636db58a12321c1479025
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:17-05:00
Commit Message:
SCI: Remove dead code
Changed paths:
engines/sci/engine/features.cpp
engines/sci/graphics/screen_item32.cpp
engines/sci/resource.cpp
engines/sci/sound/soundcmd.cpp
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp
index 03e8019..c4e23b5 100644
--- a/engines/sci/engine/features.cpp
+++ b/engines/sci/engine/features.cpp
@@ -675,7 +675,6 @@ MoveCountType GameFeatures::detectMoveCountType() {
} else {
if (!autoDetectMoveCountType()) {
error("Move count autodetection failed");
- _moveCountType = kIncrementMoveCount; // Most games do this, so best guess
}
}
diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp
index cac643e..8e4f713 100644
--- a/engines/sci/graphics/screen_item32.cpp
+++ b/engines/sci/graphics/screen_item32.cpp
@@ -361,7 +361,7 @@ void ScreenItem::calcRects(const Plane &plane) {
const Ratio scriptToScreenX = Ratio(screenWidth, scriptWidth);
const Ratio scriptToScreenY = Ratio(screenHeight, scriptHeight);
- if (/* TODO: dword_C6288 */ false && _celInfo.type == kCelTypePic) {
+ if (/* TODO: dword_C6288 */ (false) && _celInfo.type == kCelTypePic) {
_scaledPosition.x = _position.x;
_scaledPosition.y = _position.y;
} else {
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 5448469..b73b14b 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2615,9 +2615,6 @@ void ResourceManager::detectSciVersion() {
}
error("Failed to accurately determine SCI version");
- // No parser, we assume SCI_VERSION_01.
- s_sciVersion = SCI_VERSION_01;
- return;
}
// New decompressors. It's either SCI_VERSION_1_EGA_ONLY or SCI_VERSION_1_EARLY.
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 280015f..57e7516 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -678,6 +678,7 @@ reg_t SoundCommandParser::kDoSoundStopAll(EngineState *s, int argc, reg_t *argv)
// this doesn't make sense, so i disable it for now
return s->r_acc;
+#if 0
Common::StackLock(_music->_mutex);
const MusicList::iterator end = _music->getPlayListEnd();
@@ -693,6 +694,7 @@ reg_t SoundCommandParser::kDoSoundStopAll(EngineState *s, int argc, reg_t *argv)
_music->soundStop(*i);
}
return s->r_acc;
+#endif
}
reg_t SoundCommandParser::kDoSoundSetVolume(EngineState *s, int argc, reg_t *argv) {
Commit: 4706a8486eacb5a189e2e5d4e478c499f0f31039
https://github.com/scummvm/scummvm/commit/4706a8486eacb5a189e2e5d4e478c499f0f31039
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T22:17:17-05:00
Commit Message:
GRAPHICS: Remove dead code in BDF loadCharacter code
Changed paths:
graphics/fonts/bdf.cpp
diff --git a/graphics/fonts/bdf.cpp b/graphics/fonts/bdf.cpp
index 511ea5c..00e9831 100644
--- a/graphics/fonts/bdf.cpp
+++ b/graphics/fonts/bdf.cpp
@@ -275,9 +275,6 @@ byte *loadCharacter(Common::SeekableReadStream &stream, int &encoding, int &adva
return bitmap;
}
}
-
- delete[] bitmap;
- return 0;
}
void freeBitmaps(byte **bitmaps, int size) {
More information about the Scummvm-git-logs
mailing list