Skip to content

Commit 1dcf397

Browse files
authored
Merge pull request #231 from danzeeeman/feature-frameworks-exclude
feature ADDON_FRAMEWORKS_EXCLUDE to exclude frameworks from OSX projects
2 parents 5f9f625 + d459eec commit 1dcf397

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ofxProjectGenerator/src/addons/ofAddon.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ bool ofAddon::checkCorrectVariable(string variable, ConfigParseState state){
138138
variable == "ADDON_FRAMEWORKS" ||
139139
variable == "ADDON_SOURCES" || variable == "ADDON_OBJC_SOURCES" || variable == "ADDON_CPP_SOURCES" || variable == "ADDON_HEADER_SOURCES" ||
140140
variable == "ADDON_DATA" ||
141-
variable == "ADDON_LIBS_EXCLUDE" || variable == "ADDON_SOURCES_EXCLUDE" || variable == "ADDON_INCLUDES_EXCLUDE" ||
141+
variable == "ADDON_LIBS_EXCLUDE" || variable == "ADDON_SOURCES_EXCLUDE" || variable == "ADDON_INCLUDES_EXCLUDE" || variable == "ADDON_FRAMEWORKS_EXCLUDE" ||
142142
variable == "ADDON_DLLS_TO_COPY" ||
143143
variable == "ADDON_DEFINES");
144144
case Unknown:
@@ -325,6 +325,10 @@ void ofAddon::parseVariableValue(string variable, string value, bool addToValue,
325325
addReplaceStringVector(excludeIncludes,value,"",addToValue);
326326
}
327327

328+
if (variable == "ADDON_FRAMEWORKS_EXCLUDE") {
329+
addReplaceStringVector(excludeFrameworks, value, "", addToValue);
330+
}
331+
328332
if (variable == "ADDON_DEFINES") {
329333
addReplaceStringVector(defines, value, "", addToValue);
330334
}
@@ -433,6 +437,7 @@ void ofAddon::parseConfig(){
433437
exclude(objcsrcFiles,excludeSources);
434438
exclude(headersrcFiles,excludeSources);
435439
exclude(propsFiles, excludeSources);
440+
exclude(frameworks, excludeFrameworks);
436441
exclude(libs,excludeLibs);
437442

438443
ofLogVerbose("ofAddon") << "libs after exclusions " << libs.size();

ofxProjectGenerator/src/addons/ofAddon.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class ofAddon {
100100
std::vector<std::string> excludeLibs;
101101
std::vector<std::string> excludeSources;
102102
std::vector<std::string> excludeIncludes;
103+
std::vector<std::string> excludeFrameworks;
103104
};
104105

105106
#endif /* OFADDON_H_ */

0 commit comments

Comments
 (0)