[Scummvm-git-logs] scummvm master -> 2ac26ade3e9515122b0521329d750bbbd1e284a0
aquadran
noreply at scummvm.org
Mon Mar 7 10:09:04 UTC 2022
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:
2ac26ade3e DEVTOOLS: Xcode project: Add shaders files only for specific enabled engines
Commit: 2ac26ade3e9515122b0521329d750bbbd1e284a0
https://github.com/scummvm/scummvm/commit/2ac26ade3e9515122b0521329d750bbbd1e284a0
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-03-07T11:08:57+01:00
Commit Message:
DEVTOOLS: Xcode project: Add shaders files only for specific enabled engines
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 d2cf781ff36..3c20c4e62ff 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -279,7 +279,7 @@ XcodeProvider::XcodeProvider(StringList &global_warnings, std::map<std::string,
void XcodeProvider::addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList) {
includeList.push_back(setup.srcDir + "/dists/ios7/Info.plist");
- ValueList &resources = getResourceFiles();
+ ValueList &resources = getResourceFiles(setup);
for (ValueList::iterator it = resources.begin(); it != resources.end(); ++it) {
includeList.push_back(setup.srcDir + "/" + *it);
}
@@ -303,7 +303,7 @@ void XcodeProvider::createWorkspace(const BuildSetup &setup) {
setupFrameworksBuildPhase(setup);
setupNativeTarget();
setupProject();
- setupResourcesBuildPhase();
+ setupResourcesBuildPhase(setup);
setupBuildConfiguration(setup);
setupImageAssetCatalog(setup);
}
@@ -822,7 +822,7 @@ void XcodeProvider::setupProject() {
_project.add(project);
}
-XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
+XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setup) const {
static ValueList files;
if (files.empty()) {
files.push_back("gui/themes/scummclassic.zip");
@@ -862,74 +862,84 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
files.push_back("dists/ios7/LaunchScreen_ios.storyboard");
files.push_back("dists/pred.dic");
files.push_back("dists/networking/wwwroot.zip");
- files.push_back("engines/grim/shaders/grim_dim.fragment");
- files.push_back("engines/grim/shaders/grim_dim.vertex");
- files.push_back("engines/grim/shaders/grim_emerg.fragment");
- files.push_back("engines/grim/shaders/grim_emerg.vertex");
- files.push_back("engines/grim/shaders/emi_actor.fragment");
- files.push_back("engines/grim/shaders/emi_actor.vertex");
- files.push_back("engines/grim/shaders/emi_actorlights.fragment");
- files.push_back("engines/grim/shaders/emi_actorlights.vertex");
- files.push_back("engines/grim/shaders/emi_background.fragment");
- files.push_back("engines/grim/shaders/emi_background.vertex");
- files.push_back("engines/grim/shaders/emi_dimplane.fragment");
- files.push_back("engines/grim/shaders/emi_dimplane.vertex");
- files.push_back("engines/grim/shaders/emi_sprite.fragment");
- files.push_back("engines/grim/shaders/emi_sprite.vertex");
- files.push_back("engines/grim/shaders/grim_actor.fragment");
- files.push_back("engines/grim/shaders/grim_actor.vertex");
- files.push_back("engines/grim/shaders/grim_actorlights.fragment");
- files.push_back("engines/grim/shaders/grim_actorlights.vertex");
- files.push_back("engines/grim/shaders/grim_background.fragment");
- files.push_back("engines/grim/shaders/grim_background.vertex");
- files.push_back("engines/grim/shaders/grim_primitive.fragment");
- files.push_back("engines/grim/shaders/grim_primitive.vertex");
- files.push_back("engines/grim/shaders/grim_shadowplane.fragment");
- files.push_back("engines/grim/shaders/grim_shadowplane.vertex");
- files.push_back("engines/grim/shaders/grim_smush.fragment");
- files.push_back("engines/grim/shaders/grim_smush.vertex");
- files.push_back("engines/grim/shaders/grim_text.fragment");
- files.push_back("engines/grim/shaders/grim_text.vertex");
- files.push_back("engines/myst3/shaders/myst3_box.fragment");
- files.push_back("engines/myst3/shaders/myst3_box.vertex");
- files.push_back("engines/myst3/shaders/myst3_cube.fragment");
- files.push_back("engines/myst3/shaders/myst3_cube.vertex");
- files.push_back("engines/myst3/shaders/myst3_text.fragment");
- files.push_back("engines/myst3/shaders/myst3_text.vertex");
- files.push_back("engines/playground3d/shaders/playground3d_bitmap.fragment");
- files.push_back("engines/playground3d/shaders/playground3d_bitmap.vertex");
- files.push_back("engines/playground3d/shaders/playground3d_cube.fragment");
- files.push_back("engines/playground3d/shaders/playground3d_cube.vertex");
- files.push_back("engines/playground3d/shaders/playground3d_fade.fragment");
- files.push_back("engines/playground3d/shaders/playground3d_fade.vertex");
- files.push_back("engines/stark/shaders/stark_actor.fragment");
- files.push_back("engines/stark/shaders/stark_actor.vertex");
- files.push_back("engines/stark/shaders/stark_prop.fragment");
- files.push_back("engines/stark/shaders/stark_prop.vertex");
- files.push_back("engines/stark/shaders/stark_surface.fragment");
- files.push_back("engines/stark/shaders/stark_surface.vertex");
- files.push_back("engines/stark/shaders/stark_fade.fragment");
- files.push_back("engines/stark/shaders/stark_fade.vertex");
- files.push_back("engines/stark/shaders/stark_shadow.fragment");
- files.push_back("engines/stark/shaders/stark_shadow.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_geometry.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_geometry.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_line.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_modelx.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.vertex");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment");
- files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_sprite.vertex");
+ if (CONTAINS_DEFINE(setup.defines, "ENABLE_GRIME")) {
+ files.push_back("engines/grim/shaders/grim_dim.fragment");
+ files.push_back("engines/grim/shaders/grim_dim.vertex");
+ files.push_back("engines/grim/shaders/grim_emerg.fragment");
+ files.push_back("engines/grim/shaders/grim_emerg.vertex");
+ files.push_back("engines/grim/shaders/emi_actor.fragment");
+ files.push_back("engines/grim/shaders/emi_actor.vertex");
+ files.push_back("engines/grim/shaders/emi_actorlights.fragment");
+ files.push_back("engines/grim/shaders/emi_actorlights.vertex");
+ files.push_back("engines/grim/shaders/emi_background.fragment");
+ files.push_back("engines/grim/shaders/emi_background.vertex");
+ files.push_back("engines/grim/shaders/emi_dimplane.fragment");
+ files.push_back("engines/grim/shaders/emi_dimplane.vertex");
+ files.push_back("engines/grim/shaders/emi_sprite.fragment");
+ files.push_back("engines/grim/shaders/emi_sprite.vertex");
+ files.push_back("engines/grim/shaders/grim_actor.fragment");
+ files.push_back("engines/grim/shaders/grim_actor.vertex");
+ files.push_back("engines/grim/shaders/grim_actorlights.fragment");
+ files.push_back("engines/grim/shaders/grim_actorlights.vertex");
+ files.push_back("engines/grim/shaders/grim_background.fragment");
+ files.push_back("engines/grim/shaders/grim_background.vertex");
+ files.push_back("engines/grim/shaders/grim_primitive.fragment");
+ files.push_back("engines/grim/shaders/grim_primitive.vertex");
+ files.push_back("engines/grim/shaders/grim_shadowplane.fragment");
+ files.push_back("engines/grim/shaders/grim_shadowplane.vertex");
+ files.push_back("engines/grim/shaders/grim_smush.fragment");
+ files.push_back("engines/grim/shaders/grim_smush.vertex");
+ files.push_back("engines/grim/shaders/grim_text.fragment");
+ files.push_back("engines/grim/shaders/grim_text.vertex");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "ENABLE_MYST3")) {
+ files.push_back("engines/myst3/shaders/myst3_box.fragment");
+ files.push_back("engines/myst3/shaders/myst3_box.vertex");
+ files.push_back("engines/myst3/shaders/myst3_cube.fragment");
+ files.push_back("engines/myst3/shaders/myst3_cube.vertex");
+ files.push_back("engines/myst3/shaders/myst3_text.fragment");
+ files.push_back("engines/myst3/shaders/myst3_text.vertex");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "ENABLE_PLAYGROUND3D")) {
+ files.push_back("engines/playground3d/shaders/playground3d_bitmap.fragment");
+ files.push_back("engines/playground3d/shaders/playground3d_bitmap.vertex");
+ files.push_back("engines/playground3d/shaders/playground3d_cube.fragment");
+ files.push_back("engines/playground3d/shaders/playground3d_cube.vertex");
+ files.push_back("engines/playground3d/shaders/playground3d_fade.fragment");
+ files.push_back("engines/playground3d/shaders/playground3d_fade.vertex");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "ENABLE_STARK")) {
+ files.push_back("engines/stark/shaders/stark_actor.fragment");
+ files.push_back("engines/stark/shaders/stark_actor.vertex");
+ files.push_back("engines/stark/shaders/stark_prop.fragment");
+ files.push_back("engines/stark/shaders/stark_prop.vertex");
+ files.push_back("engines/stark/shaders/stark_surface.fragment");
+ files.push_back("engines/stark/shaders/stark_surface.vertex");
+ files.push_back("engines/stark/shaders/stark_fade.fragment");
+ files.push_back("engines/stark/shaders/stark_fade.vertex");
+ files.push_back("engines/stark/shaders/stark_shadow.fragment");
+ files.push_back("engines/stark/shaders/stark_shadow.vertex");
+ }
+ if (CONTAINS_DEFINE(setup.defines, "ENABLE_WINTERMUTE")) {
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_geometry.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_geometry.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_line.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_modelx.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_sprite.vertex");
+ }
files.push_back("icons/scummvm.icns");
files.push_back("AUTHORS");
files.push_back("COPYING");
@@ -948,10 +958,10 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
return files;
}
-void XcodeProvider::setupResourcesBuildPhase() {
+void XcodeProvider::setupResourcesBuildPhase(const BuildSetup &setup) {
_resourcesBuildPhase._comment = "PBXResourcesBuildPhase";
- ValueList &files_list = getResourceFiles();
+ ValueList &files_list = getResourceFiles(setup);
// Same as for containers: a rule for each native target
for (unsigned int i = 0; i < _targets.size(); i++) {
diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h
index c5a01e733ee..8f33510ff48 100644
--- a/devtools/create_project/xcode.h
+++ b/devtools/create_project/xcode.h
@@ -314,7 +314,7 @@ private:
void setupFrameworksBuildPhase(const BuildSetup &setup);
void setupNativeTarget();
void setupProject();
- void setupResourcesBuildPhase();
+ void setupResourcesBuildPhase(const BuildSetup &setup);
void setupSourcesBuildPhase();
void setupBuildConfiguration(const BuildSetup &setup);
void setupImageAssetCatalog(const BuildSetup &setup);
@@ -324,7 +324,7 @@ private:
void setupDefines(const BuildSetup &setup); // Setup the list of defines to be used on build configurations
// Retrieve information
- ValueList& getResourceFiles() const;
+ ValueList& getResourceFiles(const BuildSetup &setup) const;
// Hash generation
std::string getHash(std::string key);
More information about the Scummvm-git-logs
mailing list