[Scummvm-git-logs] scummvm master -> 86dc1ceab6bdae46c7f7cb24754a74eebb8bd305

[mduggan]

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

Summary:
86dc1ceab6 CREATE_PROJECT: Don't add DEBUG to XCode Debug builds


Commit: 86dc1ceab6bdae46c7f7cb24754a74eebb8bd305
    https://github.com/scummvm/scummvm/commit/86dc1ceab6bdae46c7f7cb24754a74eebb8bd305
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-01-11T10:49:29+09:00

Commit Message:
CREATE_PROJECT: Don't add DEBUG to XCode Debug builds

This breaks some builds for some engines, and it had a bug which added it to
Release build too (oops!)

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index a175b1eb24..79668ee74a 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -995,7 +995,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 	REMOVE_DEFINE(scummvm_defines, "IPHONE_IOS7");
 	REMOVE_DEFINE(scummvm_defines, "IPHONE_SANDBOXED");
 	REMOVE_DEFINE(scummvm_defines, "SDL_BACKEND");
-	ADD_DEFINE(scummvm_defines, "DEBUG");
 	ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, kSettingsNoQuote | kSettingsAsList, 5);
 	ADD_SETTING(scummvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
 	ADD_SETTING(scummvm_Debug, "GCC_WARN_UNUSED_VARIABLE", "YES");
@@ -1023,7 +1022,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 	REMOVE_SETTING(scummvm_Release, "ENABLE_TESTABILITY");
 	REMOVE_SETTING(scummvm_Release, "GCC_PREPROCESSOR_DEFINITIONS");
 	ValueList scummvm_Release_defines(scummvm_defines);
-	REMOVE_DEFINE(scummvm_defines, "DEBUG");
 	ADD_DEFINE(scummvm_Release_defines, "RELEASE_BUILD");
 	ADD_SETTING_LIST(scummvm_Release, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_Release_defines, kSettingsNoQuote | kSettingsAsList, 5);