rename -> ResidualVM
This commit is contained in:
Pawel Kolodziejski
parent
cfe2ba6442
commit
4fa79cd323
84 changed files with 473 additions and 485 deletions
|
|
@ -86,34 +86,34 @@ XCodeProvider::XCodeProvider(StringList &global_warnings, std::map<std::string,
|
|||
|
||||
void XCodeProvider::createWorkspace(const BuildSetup &setup) {
|
||||
// Create project folder
|
||||
std::string workspace = setup.outputDir + '/' + "scummvm.xcodeproj";
|
||||
std::string workspace = setup.outputDir + '/' + "residualvm.xcodeproj";
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
if (!CreateDirectory(workspace.c_str(), NULL))
|
||||
if (GetLastError() != ERROR_ALREADY_EXISTS)
|
||||
error("Could not create folder \"" + setup.outputDir + '/' + "scummvm.xcodeproj\"");
|
||||
error("Could not create folder \"" + setup.outputDir + '/' + "residualvm.xcodeproj\"");
|
||||
#else
|
||||
if (mkdir(workspace.c_str(), 0777) == -1) {
|
||||
if (errno == EEXIST) {
|
||||
// Try to open as a folder (might be a file / symbolic link)
|
||||
DIR *dirp = opendir(workspace.c_str());
|
||||
if (dirp == NULL) {
|
||||
error("Could not create folder \"" + setup.outputDir + '/' + "scummvm.xcodeproj\"");
|
||||
error("Could not create folder \"" + setup.outputDir + '/' + "residualvm.xcodeproj\"");
|
||||
} else {
|
||||
// The folder exists, just close the stream and return
|
||||
closedir(dirp);
|
||||
}
|
||||
} else {
|
||||
error("Could not create folder \"" + setup.outputDir + '/' + "scummvm.xcodeproj\"");
|
||||
error("Could not create folder \"" + setup.outputDir + '/' + "residualvm.xcodeproj\"");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Setup global objects
|
||||
setupDefines(setup);
|
||||
_targets.push_back("ScummVM-iPhone");
|
||||
_targets.push_back("ScummVM-OS X");
|
||||
_targets.push_back("ScummVM-Simulator");
|
||||
_targets.push_back("ResidualVM-iPhone");
|
||||
_targets.push_back("ResidualVM-OS X");
|
||||
_targets.push_back("ResidualVM-Simulator");
|
||||
|
||||
setupCopyFilesBuildPhase();
|
||||
setupFrameworksBuildPhase();
|
||||
|
|
@ -153,9 +153,9 @@ void XCodeProvider::createProjectFile(const std::string &, const std::string &,
|
|||
// Main Project file
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void XCodeProvider::ouputMainProjectFile(const BuildSetup &setup) {
|
||||
std::ofstream project((setup.outputDir + '/' + "scummvm.xcodeproj" + '/' + "project.pbxproj").c_str());
|
||||
std::ofstream project((setup.outputDir + '/' + "residualvm.xcodeproj" + '/' + "project.pbxproj").c_str());
|
||||
if (!project)
|
||||
error("Could not open \"" + setup.outputDir + '/' + "scummvm.xcodeproj" + '/' + "project.pbxproj\" for writing");
|
||||
error("Could not open \"" + setup.outputDir + '/' + "residualvm.xcodeproj" + '/' + "project.pbxproj\" for writing");
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Header
|
||||
|
|
@ -392,8 +392,8 @@ void XCodeProvider::setupNativeTarget() {
|
|||
target->addProperty("dependencies", "", "", SettingsNoValue|SettingsAsList);
|
||||
|
||||
target->addProperty("name", _targets[i], "", SettingsNoValue|SettingsQuoteVariable);
|
||||
target->addProperty("productName", "scummvm", "", SettingsNoValue);
|
||||
target->addProperty("productReference", getHash("PBXFileReference_ScummVM.app_" + _targets[i]), "ScummVM.app", SettingsNoValue);
|
||||
target->addProperty("productName", "residual", "", SettingsNoValue);
|
||||
target->addProperty("productReference", getHash("PBXFileReference_ResidualVM.app_" + _targets[i]), "ResidualVM.app", SettingsNoValue);
|
||||
target->addProperty("productType", "com.apple.product-type.application", "", SettingsNoValue|SettingsQuoteVariable);
|
||||
|
||||
_nativeTarget.add(target);
|
||||
|
|
@ -405,7 +405,7 @@ void XCodeProvider::setupProject() {
|
|||
|
||||
Object *project = new Object(this, "PBXProject", "PBXProject", "PBXProject", "", "Project object");
|
||||
|
||||
project->addProperty("buildConfigurationList", getHash("XCConfigurationList_scummvm"), "Build configuration list for PBXProject \"scummvm\"", SettingsNoValue);
|
||||
project->addProperty("buildConfigurationList", getHash("XCConfigurationList_residualvm"), "Build configuration list for PBXProject \"residualvm\"", SettingsNoValue);
|
||||
project->addProperty("compatibilityVersion", "Xcode 3.2", "", SettingsNoValue|SettingsQuoteVariable);
|
||||
project->addProperty("developmentRegion", "English", "", SettingsNoValue);
|
||||
project->addProperty("hasScannedForEncodings", "1", "", SettingsNoValue);
|
||||
|
|
@ -439,18 +439,7 @@ void XCodeProvider::setupResourcesBuildPhase() {
|
|||
|
||||
// Setup resource file properties
|
||||
std::map<std::string, FileProperty> properties;
|
||||
properties["scummclassic.zip"] = FileProperty("archive.zip", "", "scummclassic.zip", "\"<group>\"");
|
||||
properties["scummmodern.zip"] = FileProperty("archive.zip", "", "scummmodern.zip", "\"<group>\"");
|
||||
|
||||
properties["kyra.dat"] = FileProperty("file", "", "kyra.dat", "\"<group>\"");
|
||||
properties["lure.dat"] = FileProperty("file", "", "lure.dat", "\"<group>\"");
|
||||
properties["queen.tbl"] = FileProperty("file", "", "queen.tbl", "\"<group>\"");
|
||||
properties["sky.cpt"] = FileProperty("file", "", "sky.cpt", "\"<group>\"");
|
||||
properties["drascula.dat"] = FileProperty("file", "", "drascula.dat", "\"<group>\"");
|
||||
properties["hugo.dat"] = FileProperty("file", "", "hugo.dat", "\"<group>\"");
|
||||
properties["m4.dat"] = FileProperty("file", "", "m4.dat", "\"<group>\"");
|
||||
properties["teenagent.dat"] = FileProperty("file", "", "teenagent.dat", "\"<group>\"");
|
||||
properties["toon.dat"] = FileProperty("file", "", "toon.dat", "\"<group>\"");
|
||||
properties["modern.zip"] = FileProperty("archive.zip", "", "modern.zip", "\"<group>\"");
|
||||
|
||||
properties["Default.png"] = FileProperty("image.png", "", "Default.png", "\"<group>\"");
|
||||
properties["icon.png"] = FileProperty("image.png", "", "icon.png", "\"<group>\"");
|
||||
|
|
@ -469,8 +458,7 @@ void XCodeProvider::setupResourcesBuildPhase() {
|
|||
files.flags = SettingsAsList;
|
||||
|
||||
ValueList files_list;
|
||||
files_list.push_back("scummclassic.zip");
|
||||
files_list.push_back("scummmodern.zip");
|
||||
files_list.push_back("modern.zip");
|
||||
files_list.push_back("kyra.dat");
|
||||
files_list.push_back("lure.dat");
|
||||
files_list.push_back("queen.tbl");
|
||||
|
|
@ -497,8 +485,8 @@ void XCodeProvider::setupResourcesBuildPhase() {
|
|||
}
|
||||
|
||||
// Add custom files depending on the target
|
||||
if (_targets[i] == "ScummVM-OS X") {
|
||||
files.settings[getHash("PBXResources_scummvm.icns")] = Setting("", "scummvm.icns in Resources", SettingsNoValue, 0, 6);
|
||||
if (_targets[i] == "ResidualVM-OS X") {
|
||||
files.settings[getHash("PBXResources_residualvm.icns")] = Setting("", "residualvm.icns in Resources", SettingsNoValue, 0, 6);
|
||||
|
||||
// Remove 2 iphone icon files
|
||||
files.settings.erase(getHash("PBXResources_Default.png"));
|
||||
|
|
@ -528,7 +516,7 @@ void XCodeProvider::setupBuildConfiguration() {
|
|||
// ****************************************/
|
||||
|
||||
// Debug
|
||||
Object *iPhone_Debug_Object = new Object(this, "XCBuildConfiguration_ScummVM-iPhone_Debug", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
|
||||
Object *iPhone_Debug_Object = new Object(this, "XCBuildConfiguration_ResidualVM-iPhone_Debug", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
|
||||
Property iPhone_Debug;
|
||||
ADD_SETTING_QUOTE(iPhone_Debug, "ARCHS", "$(ARCHS_UNIVERSAL_IPHONE_OS)");
|
||||
ADD_SETTING_QUOTE(iPhone_Debug, "CODE_SIGN_IDENTITY", "iPhone Developer");
|
||||
|
|
@ -560,7 +548,7 @@ void XCodeProvider::setupBuildConfiguration() {
|
|||
ADD_SETTING_LIST(iPhone_Debug, "LIBRARY_SEARCH_PATHS", iPhone_LibPaths, SettingsAsList, 5);
|
||||
ADD_SETTING(iPhone_Debug, "ONLY_ACTIVE_ARCH", "YES");
|
||||
ADD_SETTING(iPhone_Debug, "PREBINDING", "NO");
|
||||
ADD_SETTING(iPhone_Debug, "PRODUCT_NAME", "ScummVM");
|
||||
ADD_SETTING(iPhone_Debug, "PRODUCT_NAME", "ResidualVM");
|
||||
ADD_SETTING_QUOTE(iPhone_Debug, "PROVISIONING_PROFILE", "EF590570-5FAC-4346-9071-D609DE2B28D8");
|
||||
ADD_SETTING_QUOTE_VAR(iPhone_Debug, "PROVISIONING_PROFILE[sdk=iphoneos*]", "");
|
||||
ADD_SETTING(iPhone_Debug, "SDKROOT", "iphoneos4.0");
|
||||
|
|
@ -570,7 +558,7 @@ void XCodeProvider::setupBuildConfiguration() {
|
|||
iPhone_Debug_Object->properties["buildSettings"] = iPhone_Debug;
|
||||
|
||||
// Release
|
||||
Object *iPhone_Release_Object = new Object(this, "XCBuildConfiguration_ScummVM-iPhone_Release", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
|
||||
Object *iPhone_Release_Object = new Object(this, "XCBuildConfiguration_ResidualVM-iPhone_Release", _targets[0] /* ScummVM-iPhone */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
|
||||
Property iPhone_Release(iPhone_Debug);
|
||||
ADD_SETTING(iPhone_Release, "GCC_OPTIMIZATION_LEVEL", "3");
|
||||
ADD_SETTING(iPhone_Release, "COPY_PHASE_STRIP", "YES");
|
||||
|
|
@ -588,153 +576,153 @@ void XCodeProvider::setupBuildConfiguration() {
|
|||
****************************************/
|
||||
|
||||
// Debug
|
||||
Object *scummvm_Debug_Object = new Object(this, "XCBuildConfiguration_scummvm_Debug", "scummvm", "XCBuildConfiguration", "PBXProject", "Debug");
|
||||
Property scummvm_Debug;
|
||||
ADD_SETTING(scummvm_Debug, "ALWAYS_SEARCH_USER_PATHS", "NO");
|
||||
ADD_SETTING_QUOTE(scummvm_Debug, "ARCHS", "$(ARCHS_STANDARD_32_BIT)");
|
||||
ADD_SETTING_QUOTE(scummvm_Debug, "CODE_SIGN_IDENTITY", "Don't Code Sign");
|
||||
ADD_SETTING_QUOTE_VAR(scummvm_Debug, "CODE_SIGN_IDENTITY[sdk=iphoneos*]", "Don't Code Sign");
|
||||
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", "NO");
|
||||
ADD_SETTING(scummvm_Debug, "GCC_INPUT_FILETYPE", "automatic");
|
||||
ADD_SETTING(scummvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
|
||||
ValueList scummvm_defines(_defines);
|
||||
ADD_DEFINE(scummvm_defines, "IPHONE");
|
||||
ADD_DEFINE(scummvm_defines, "XCODE");
|
||||
ADD_DEFINE(scummvm_defines, "IPHONE_OFFICIAL");
|
||||
ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING(scummvm_Debug, "GCC_THUMB_SUPPORT", "NO");
|
||||
ADD_SETTING(scummvm_Debug, "GCC_USE_GCC3_PFE_SUPPORT", "NO");
|
||||
ADD_SETTING(scummvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
|
||||
ADD_SETTING(scummvm_Debug, "GCC_WARN_UNUSED_VARIABLE", "YES");
|
||||
ValueList scummvm_HeaderPaths;
|
||||
scummvm_HeaderPaths.push_back("include/");
|
||||
scummvm_HeaderPaths.push_back("../../engines/");
|
||||
scummvm_HeaderPaths.push_back("../../");
|
||||
ADD_SETTING_LIST(scummvm_Debug, "HEADER_SEARCH_PATHS", scummvm_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
|
||||
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(scummvm_Debug, "PREBINDING", "NO");
|
||||
ADD_SETTING(scummvm_Debug, "SDKROOT", "macosx10.6");
|
||||
Object *residualvm_Debug_Object = new Object(this, "XCBuildConfiguration_residualvm_Debug", "residualvm", "XCBuildConfiguration", "PBXProject", "Debug");
|
||||
Property residualvm_Debug;
|
||||
ADD_SETTING(residualvm_Debug, "ALWAYS_SEARCH_USER_PATHS", "NO");
|
||||
ADD_SETTING_QUOTE(residualvm_Debug, "ARCHS", "$(ARCHS_STANDARD_32_BIT)");
|
||||
ADD_SETTING_QUOTE(residualvm_Debug, "CODE_SIGN_IDENTITY", "Don't Code Sign");
|
||||
ADD_SETTING_QUOTE_VAR(residualvm_Debug, "CODE_SIGN_IDENTITY[sdk=iphoneos*]", "Don't Code Sign");
|
||||
ADD_SETTING_QUOTE(residualvm_Debug, "FRAMEWORK_SEARCH_PATHS", "");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_ENABLE_CPP_RTTI", "NO");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_INPUT_FILETYPE", "automatic");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
|
||||
ValueList residualvm_defines(_defines);
|
||||
ADD_DEFINE(residualvm_defines, "IPHONE");
|
||||
ADD_DEFINE(residualvm_defines, "XCODE");
|
||||
ADD_DEFINE(residualvm_defines, "IPHONE_OFFICIAL");
|
||||
ADD_SETTING_LIST(residualvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", residualvm_defines, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING(residualvm_Debug, "GCC_THUMB_SUPPORT", "NO");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_USE_GCC3_PFE_SUPPORT", "NO");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
|
||||
ADD_SETTING(residualvm_Debug, "GCC_WARN_UNUSED_VARIABLE", "YES");
|
||||
ValueList residualvm_HeaderPaths;
|
||||
residualvm_HeaderPaths.push_back("include/");
|
||||
residualvm_HeaderPaths.push_back("../../engines/");
|
||||
residualvm_HeaderPaths.push_back("../../");
|
||||
ADD_SETTING_LIST(residualvm_Debug, "HEADER_SEARCH_PATHS", residualvm_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING_QUOTE(residualvm_Debug, "LIBRARY_SEARCH_PATHS", "");
|
||||
ADD_SETTING(residualvm_Debug, "ONLY_ACTIVE_ARCH", "YES");
|
||||
ADD_SETTING_QUOTE(residualvm_Debug, "OTHER_CFLAGS", "");
|
||||
ADD_SETTING_QUOTE(residualvm_Debug, "OTHER_LDFLAGS", "-lz");
|
||||
ADD_SETTING(residualvm_Debug, "PREBINDING", "NO");
|
||||
ADD_SETTING(residualvm_Debug, "SDKROOT", "macosx10.6");
|
||||
|
||||
scummvm_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
|
||||
scummvm_Debug_Object->properties["buildSettings"] = scummvm_Debug;
|
||||
residualvm_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
|
||||
residualvm_Debug_Object->properties["buildSettings"] = residualvm_Debug;
|
||||
|
||||
// Release
|
||||
Object *scummvm_Release_Object = new Object(this, "XCBuildConfiguration_scummvm_Release", "scummvm", "XCBuildConfiguration", "PBXProject", "Release");
|
||||
Property scummvm_Release(scummvm_Debug);
|
||||
REMOVE_SETTING(scummvm_Release, "GCC_C_LANGUAGE_STANDARD"); // Not sure why we remove that, or any of the other warnings
|
||||
REMOVE_SETTING(scummvm_Release, "GCC_WARN_ABOUT_RETURN_TYPE");
|
||||
REMOVE_SETTING(scummvm_Release, "GCC_WARN_UNUSED_VARIABLE");
|
||||
REMOVE_SETTING(scummvm_Release, "ONLY_ACTIVE_ARCH");
|
||||
Object *residualvm_Release_Object = new Object(this, "XCBuildConfiguration_residualvm_Release", "residualvm", "XCBuildConfiguration", "PBXProject", "Release");
|
||||
Property residualvm_Release(residualvm_Debug);
|
||||
REMOVE_SETTING(residualvm_Release, "GCC_C_LANGUAGE_STANDARD"); // Not sure why we remove that, or any of the other warnings
|
||||
REMOVE_SETTING(residualvm_Release, "GCC_WARN_ABOUT_RETURN_TYPE");
|
||||
REMOVE_SETTING(residualvm_Release, "GCC_WARN_UNUSED_VARIABLE");
|
||||
REMOVE_SETTING(residualvm_Release, "ONLY_ACTIVE_ARCH");
|
||||
|
||||
scummvm_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
|
||||
scummvm_Release_Object->properties["buildSettings"] = scummvm_Release;
|
||||
residualvm_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
|
||||
residualvm_Release_Object->properties["buildSettings"] = residualvm_Release;
|
||||
|
||||
_buildConfiguration.add(scummvm_Debug_Object);
|
||||
_buildConfiguration.add(scummvm_Release_Object);
|
||||
_buildConfiguration.add(residualvm_Debug_Object);
|
||||
_buildConfiguration.add(residualvm_Release_Object);
|
||||
|
||||
/****************************************
|
||||
* ScummVM-OS X
|
||||
****************************************/
|
||||
|
||||
// Debug
|
||||
Object *scummvmOSX_Debug_Object = new Object(this, "XCBuildConfiguration_ScummVM-OSX_Debug", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
|
||||
Property scummvmOSX_Debug;
|
||||
ADD_SETTING_QUOTE(scummvmOSX_Debug, "ARCHS", "$(NATIVE_ARCH)");
|
||||
ADD_SETTING(scummvmOSX_Debug, "COMPRESS_PNG_FILES", "NO");
|
||||
ADD_SETTING(scummvmOSX_Debug, "COPY_PHASE_STRIP", "NO");
|
||||
ADD_SETTING_QUOTE(scummvmOSX_Debug, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym");
|
||||
ADD_SETTING_QUOTE(scummvmOSX_Debug, "FRAMEWORK_SEARCH_PATHS", "");
|
||||
ADD_SETTING(scummvmOSX_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
|
||||
ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
|
||||
ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_CPP_RTTI", "NO");
|
||||
ADD_SETTING(scummvmOSX_Debug, "GCC_DYNAMIC_NO_PIC", "NO");
|
||||
ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_FIX_AND_CONTINUE", "NO");
|
||||
ADD_SETTING(scummvmOSX_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
|
||||
ADD_SETTING(scummvmOSX_Debug, "GCC_PRECOMPILE_PREFIX_HEADER", "NO");
|
||||
ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_PREFIX_HEADER", "");
|
||||
ValueList scummvmOSX_defines(_defines);
|
||||
ADD_DEFINE(scummvmOSX_defines, "SDL_BACKEND");
|
||||
ADD_DEFINE(scummvmOSX_defines, "MACOSX");
|
||||
ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_VERSION", "");
|
||||
ValueList scummvmOSX_HeaderPaths;
|
||||
scummvmOSX_HeaderPaths.push_back("/opt/local/include/SDL");
|
||||
scummvmOSX_HeaderPaths.push_back("/opt/local/include");
|
||||
scummvmOSX_HeaderPaths.push_back("include/");
|
||||
scummvmOSX_HeaderPaths.push_back("../../engines/");
|
||||
scummvmOSX_HeaderPaths.push_back("../../");
|
||||
ADD_SETTING_LIST(scummvmOSX_Debug, "HEADER_SEARCH_PATHS", scummvmOSX_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING_QUOTE(scummvmOSX_Debug, "INFOPLIST_FILE", "$(SRCROOT)/../macosx/Info.plist");
|
||||
ValueList scummvmOSX_LibPaths;
|
||||
scummvmOSX_LibPaths.push_back("/sw/lib");
|
||||
scummvmOSX_LibPaths.push_back("/opt/local/lib");
|
||||
scummvmOSX_LibPaths.push_back("\"$(inherited)\"");
|
||||
scummvmOSX_LibPaths.push_back("\"\\\\\\\"$(SRCROOT)/lib\\\\\\\"\""); // mmmh, all those slashes, it's almost Christmas \o/
|
||||
ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", "");
|
||||
ValueList scummvmOSX_LdFlags;
|
||||
scummvmOSX_LdFlags.push_back("-lSDLmain");
|
||||
scummvmOSX_LdFlags.push_back("-logg");
|
||||
scummvmOSX_LdFlags.push_back("-lvorbisfile");
|
||||
scummvmOSX_LdFlags.push_back("-lvorbis");
|
||||
scummvmOSX_LdFlags.push_back("-lmad");
|
||||
scummvmOSX_LdFlags.push_back("-lFLAC");
|
||||
scummvmOSX_LdFlags.push_back("-lSDL");
|
||||
scummvmOSX_LdFlags.push_back("-lz");
|
||||
ADD_SETTING_LIST(scummvmOSX_Debug, "OTHER_LDFLAGS", scummvmOSX_LdFlags, SettingsAsList, 5);
|
||||
ADD_SETTING(scummvmOSX_Debug, "PREBINDING", "NO");
|
||||
ADD_SETTING(scummvmOSX_Debug, "PRODUCT_NAME", "ScummVM");
|
||||
Object *residualvmOSX_Debug_Object = new Object(this, "XCBuildConfiguration_ResidualVM-OSX_Debug", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
|
||||
Property residualvmOSX_Debug;
|
||||
ADD_SETTING_QUOTE(residualvmOSX_Debug, "ARCHS", "$(NATIVE_ARCH)");
|
||||
ADD_SETTING(residualvmOSX_Debug, "COMPRESS_PNG_FILES", "NO");
|
||||
ADD_SETTING(residualvmOSX_Debug, "COPY_PHASE_STRIP", "NO");
|
||||
ADD_SETTING_QUOTE(residualvmOSX_Debug, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym");
|
||||
ADD_SETTING_QUOTE(residualvmOSX_Debug, "FRAMEWORK_SEARCH_PATHS", "");
|
||||
ADD_SETTING(residualvmOSX_Debug, "GCC_C_LANGUAGE_STANDARD", "c99");
|
||||
ADD_SETTING(residualvmOSX_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO");
|
||||
ADD_SETTING(residualvmOSX_Debug, "GCC_ENABLE_CPP_RTTI", "NO");
|
||||
ADD_SETTING(residualvmOSX_Debug, "GCC_DYNAMIC_NO_PIC", "NO");
|
||||
ADD_SETTING(residualvmOSX_Debug, "GCC_ENABLE_FIX_AND_CONTINUE", "NO");
|
||||
ADD_SETTING(residualvmOSX_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
|
||||
ADD_SETTING(residualvmOSX_Debug, "GCC_PRECOMPILE_PREFIX_HEADER", "NO");
|
||||
ADD_SETTING_QUOTE(residualvmOSX_Debug, "GCC_PREFIX_HEADER", "");
|
||||
ValueList residualvmOSX_defines(_defines);
|
||||
ADD_DEFINE(residualvmOSX_defines, "SDL_BACKEND");
|
||||
ADD_DEFINE(residualvmOSX_defines, "MACOSX");
|
||||
ADD_SETTING_LIST(residualvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", residualvmOSX_defines, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING_QUOTE(residualvmOSX_Debug, "GCC_VERSION", "");
|
||||
ValueList residualvmOSX_HeaderPaths;
|
||||
residualvmOSX_HeaderPaths.push_back("/opt/local/include/SDL");
|
||||
residualvmOSX_HeaderPaths.push_back("/opt/local/include");
|
||||
residualvmOSX_HeaderPaths.push_back("include/");
|
||||
residualvmOSX_HeaderPaths.push_back("../../engines/");
|
||||
residualvmOSX_HeaderPaths.push_back("../../");
|
||||
ADD_SETTING_LIST(residualvmOSX_Debug, "HEADER_SEARCH_PATHS", residualvmOSX_HeaderPaths, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING_QUOTE(residualvmOSX_Debug, "INFOPLIST_FILE", "$(SRCROOT)/../macosx/Info.plist");
|
||||
ValueList residualvmOSX_LibPaths;
|
||||
residualvmOSX_LibPaths.push_back("/sw/lib");
|
||||
residualvmOSX_LibPaths.push_back("/opt/local/lib");
|
||||
residualvmOSX_LibPaths.push_back("\"$(inherited)\"");
|
||||
residualvmOSX_LibPaths.push_back("\"\\\\\\\"$(SRCROOT)/lib\\\\\\\"\""); // mmmh, all those slashes, it's almost Christmas \o/
|
||||
ADD_SETTING_LIST(residualvmOSX_Debug, "LIBRARY_SEARCH_PATHS", residualvmOSX_LibPaths, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING_QUOTE(residualvmOSX_Debug, "OTHER_CFLAGS", "");
|
||||
ValueList residualvmOSX_LdFlags;
|
||||
residualvmOSX_LdFlags.push_back("-lSDLmain");
|
||||
residualvmOSX_LdFlags.push_back("-logg");
|
||||
residualvmOSX_LdFlags.push_back("-lvorbisfile");
|
||||
residualvmOSX_LdFlags.push_back("-lvorbis");
|
||||
residualvmOSX_LdFlags.push_back("-lmad");
|
||||
residualvmOSX_LdFlags.push_back("-lFLAC");
|
||||
residualvmOSX_LdFlags.push_back("-lSDL");
|
||||
residualvmOSX_LdFlags.push_back("-lz");
|
||||
ADD_SETTING_LIST(residualvmOSX_Debug, "OTHER_LDFLAGS", residualvmOSX_LdFlags, SettingsAsList, 5);
|
||||
ADD_SETTING(residualvmOSX_Debug, "PREBINDING", "NO");
|
||||
ADD_SETTING(residualvmOSX_Debug, "PRODUCT_NAME", "ResidualVM");
|
||||
|
||||
scummvmOSX_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
|
||||
scummvmOSX_Debug_Object->properties["buildSettings"] = scummvmOSX_Debug;
|
||||
residualvmOSX_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
|
||||
residualvmOSX_Debug_Object->properties["buildSettings"] = residualvmOSX_Debug;
|
||||
|
||||
// Release
|
||||
Object *scummvmOSX_Release_Object = new Object(this, "XCBuildConfiguration_ScummVMOSX_Release", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
|
||||
Property scummvmOSX_Release(scummvmOSX_Debug);
|
||||
ADD_SETTING(scummvmOSX_Release, "COPY_PHASE_STRIP", "YES");
|
||||
REMOVE_SETTING(scummvmOSX_Release, "GCC_DYNAMIC_NO_PIC");
|
||||
REMOVE_SETTING(scummvmOSX_Release, "GCC_OPTIMIZATION_LEVEL");
|
||||
ADD_SETTING(scummvmOSX_Release, "WRAPPER_EXTENSION", "app");
|
||||
Object *residualvmOSX_Release_Object = new Object(this, "XCBuildConfiguration_ResidualVMOSX_Release", _targets[1] /* ScummVM-OS X */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
|
||||
Property residualvmOSX_Release(residualvmOSX_Debug);
|
||||
ADD_SETTING(residualvmOSX_Release, "COPY_PHASE_STRIP", "YES");
|
||||
REMOVE_SETTING(residualvmOSX_Release, "GCC_DYNAMIC_NO_PIC");
|
||||
REMOVE_SETTING(residualvmOSX_Release, "GCC_OPTIMIZATION_LEVEL");
|
||||
ADD_SETTING(residualvmOSX_Release, "WRAPPER_EXTENSION", "app");
|
||||
|
||||
scummvmOSX_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
|
||||
scummvmOSX_Release_Object->properties["buildSettings"] = scummvmOSX_Release;
|
||||
residualvmOSX_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
|
||||
residualvmOSX_Release_Object->properties["buildSettings"] = residualvmOSX_Release;
|
||||
|
||||
_buildConfiguration.add(scummvmOSX_Debug_Object);
|
||||
_buildConfiguration.add(scummvmOSX_Release_Object);
|
||||
_buildConfiguration.add(residualvmOSX_Debug_Object);
|
||||
_buildConfiguration.add(residualvmOSX_Release_Object);
|
||||
|
||||
/****************************************
|
||||
* ScummVM-Simulator
|
||||
****************************************/
|
||||
|
||||
// Debug
|
||||
Object *scummvmSimulator_Debug_Object = new Object(this, "XCBuildConfiguration_ScummVM-Simulator_Debug", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
|
||||
Property scummvmSimulator_Debug(iPhone_Debug);
|
||||
ADD_SETTING_QUOTE(scummvmSimulator_Debug, "FRAMEWORK_SEARCH_PATHS", "$(inherited)");
|
||||
ADD_SETTING_LIST(scummvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING(scummvmSimulator_Debug, "SDKROOT", "iphonesimulator3.2");
|
||||
REMOVE_SETTING(scummvmSimulator_Debug, "TARGETED_DEVICE_FAMILY");
|
||||
Object *residualvmSimulator_Debug_Object = new Object(this, "XCBuildConfiguration_ResidualVM-Simulator_Debug", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Debug");
|
||||
Property residualvmSimulator_Debug(iPhone_Debug);
|
||||
ADD_SETTING_QUOTE(residualvmSimulator_Debug, "FRAMEWORK_SEARCH_PATHS", "$(inherited)");
|
||||
ADD_SETTING_LIST(residualvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", residualvm_defines, SettingsNoQuote|SettingsAsList, 5);
|
||||
ADD_SETTING(residualvmSimulator_Debug, "SDKROOT", "iphonesimulator3.2");
|
||||
REMOVE_SETTING(residualvmSimulator_Debug, "TARGETED_DEVICE_FAMILY");
|
||||
|
||||
scummvmSimulator_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
|
||||
scummvmSimulator_Debug_Object->properties["buildSettings"] = scummvmSimulator_Debug;
|
||||
residualvmSimulator_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue);
|
||||
residualvmSimulator_Debug_Object->properties["buildSettings"] = residualvmSimulator_Debug;
|
||||
|
||||
// Release
|
||||
Object *scummvmSimulator_Release_Object = new Object(this, "XCBuildConfiguration_ScummVM-Simulator_Release", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
|
||||
Property scummvmSimulator_Release(scummvmSimulator_Debug);
|
||||
ADD_SETTING(scummvmSimulator_Release, "COPY_PHASE_STRIP", "YES");
|
||||
REMOVE_SETTING(scummvmSimulator_Release, "GCC_DYNAMIC_NO_PIC");
|
||||
ADD_SETTING(scummvmSimulator_Release, "WRAPPER_EXTENSION", "app");
|
||||
Object *residualvmSimulator_Release_Object = new Object(this, "XCBuildConfiguration_ResidualVM-Simulator_Release", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Release");
|
||||
Property residualvmSimulator_Release(residualvmSimulator_Debug);
|
||||
ADD_SETTING(residualvmSimulator_Release, "COPY_PHASE_STRIP", "YES");
|
||||
REMOVE_SETTING(residualvmSimulator_Release, "GCC_DYNAMIC_NO_PIC");
|
||||
ADD_SETTING(residualvmSimulator_Release, "WRAPPER_EXTENSION", "app");
|
||||
|
||||
scummvmSimulator_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
|
||||
scummvmSimulator_Release_Object->properties["buildSettings"] = scummvmSimulator_Release;
|
||||
residualvmSimulator_Release_Object->addProperty("name", "Release", "", SettingsNoValue);
|
||||
residualvmSimulator_Release_Object->properties["buildSettings"] = residualvmSimulator_Release;
|
||||
|
||||
_buildConfiguration.add(scummvmSimulator_Debug_Object);
|
||||
_buildConfiguration.add(scummvmSimulator_Release_Object);
|
||||
_buildConfiguration.add(residualvmSimulator_Debug_Object);
|
||||
_buildConfiguration.add(residualvmSimulator_Release_Object);
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Configuration List
|
||||
|
|
@ -779,7 +767,7 @@ void XCodeProvider::setupDefines(const BuildSetup &setup) {
|
|||
ADD_DEFINE(_defines, "SCUMM_NEED_ALIGNMENT");
|
||||
ADD_DEFINE(_defines, "SCUMM_LITTLE_ENDIAN");
|
||||
ADD_DEFINE(_defines, "UNIX");
|
||||
ADD_DEFINE(_defines, "SCUMMVM");
|
||||
ADD_DEFINE(_defines, "RESIDUALVM");
|
||||
ADD_DEFINE(_defines, "USE_TREMOR");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue