win_cb -> msys2

Author: arturoc

commandLine/commandLine.qbs

@@ -6,7 +6,7 @@ import qbs.TextFile
 import "../../../libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp
 
 Project{
-    property string of_root: "../../.."
+    property string of_root: '../../..'
 
     ofApp {
         name: { return FileInfo.baseName(path) }
@@ -17,9 +17,15 @@ Project{
             'src/ofApp.h',
         ]
 
-        of.addons: [
-            '../ofxProjectGenerator',
-        ]
+        // This project is using addons.make to include the addons
+        // since it was imported from old code. To change it to include
+        // the addons from the qbs file change the following lines to
+        // the list of used addons in array format. eg:
+        //
+        // of.addons: [
+        //     'ofxGui',
+        //     'ofxOpenCv',
+        // ]
 
         // additional flags for the project. the of module sets some
         // flags by default to add the core libraries, search paths...
@@ -30,7 +36,7 @@ Project{
         of.cxxFlags: []         // flags passed to the c++ compiler
         of.linkerFlags: []      // flags passed to the linker
         of.defines: []          // defines are passed as -D to the compiler
-                                // and can be checked with #ifdef or #if in the code
+        // and can be checked with #ifdef or #if in the code
 
         // other flags can be set through the cpp module: http://doc.qt.io/qbs/cpp-module.html
         // eg: this will enable ccache when compiling
@@ -54,3 +60,4 @@ Project{
 
     references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")]
 }
+

commandLine/src/main.cpp

@@ -156,8 +156,8 @@ void addPlatforms(string value) {
         else if (platforms[i] == "linuxarmv7l") {
             targets.push_back(OF_TARGET_LINUXARMV7L);
         }
-        else if (platforms[i] == "win_cb") {
-            targets.push_back(OF_TARGET_WINGCC);
+        else if (platforms[i] == "msys2") {
+            targets.push_back(OF_TARGET_MINGW);
         }
         else if (platforms[i] == "vs") {
             targets.push_back(OF_TARGET_WINVS);
@@ -177,7 +177,7 @@ void addPlatforms(string value) {
             targets.push_back(OF_TARGET_LINUX64);
             targets.push_back(OF_TARGET_LINUXARMV6L);
             targets.push_back(OF_TARGET_LINUXARMV7L);
-            targets.push_back(OF_TARGET_WINGCC);
+            targets.push_back(OF_TARGET_MINGW);
             targets.push_back(OF_TARGET_WINVS);
             targets.push_back(OF_TARGET_OSX);
             targets.push_back(OF_TARGET_IOS);
@@ -521,16 +521,6 @@ int main(int argc, char* argv[]){
         return EXIT_USAGE;
     }
 
-    
-   
-    if (!isGoodOFPath(ofPath)) {
-        consoleSpace();
-        ofLogError() << "path to openframeworks (" << ofPath << ") seems wrong, please check";
-        consoleSpace();
-		
-        return EXIT_USAGE;
-    }
-
 
     if (ofDirectory(projectPath).exists()) {
         mode = PG_MODE_UPDATE;

ofxProjectGenerator/src/addons/ofAddon.cpp

@@ -26,7 +26,7 @@ ofAddon::ConfigParseState ofAddon::stateFromString(string name){
 	if(name=="common") return Common;
 	if(name=="linux64") return Linux64;
 	if(name=="linux") return Linux;
-	if(name=="win_cb") return WinCB;
+    if(name=="msys2") return MinGW;
 	if(name=="vs") return VS;
 	if(name=="linuxarmv6l") return LinuxARMv6;
 	if(name=="linuxarmv7l") return LinuxARMv7;
@@ -47,8 +47,8 @@ string ofAddon::stateName(ofAddon::ConfigParseState state){
 		return "linux";
 	case Linux64:
 		return "linux64";
-	case WinCB:
-		return "win_cb";
+    case MinGW:
+        return "msys2";
 	case VS:
 		return "vs";
 	case LinuxARMv6:
@@ -78,7 +78,7 @@ bool ofAddon::checkCorrectPlatform(ConfigParseState state){
 		return true;
 	case Linux:
 	case Linux64:
-	case WinCB:
+    case MinGW:
 	case VS:
 	case LinuxARMv6:
 	case LinuxARMv7:
@@ -101,7 +101,7 @@ bool ofAddon::checkCorrectVariable(string variable, ConfigParseState state){
 	case Common:
 	case Linux:
 	case Linux64:
-	case WinCB:
+    case MinGW:
 	case VS:
 	case LinuxARMv6:
 	case LinuxARMv7:

ofxProjectGenerator/src/addons/ofAddon.h

@@ -68,7 +68,7 @@ class ofAddon {
     	Common,
     	Linux,
     	Linux64,
-    	WinCB,
+        MinGW,
     	VS,
     	LinuxARMv6,
     	LinuxARMv7,

ofxProjectGenerator/src/utils/Utils.cpp

@@ -211,7 +211,7 @@ static vector <string> platforms;
 bool isFolderNotCurrentPlatform(string folderName, string platform){
 	if( platforms.size() == 0 ){
 		platforms.push_back("osx");
-		platforms.push_back("win_cb");
+        platforms.push_back("msys2");
 		platforms.push_back("vs");
 		platforms.push_back("ios");
 		platforms.push_back("linux");
@@ -469,8 +469,8 @@ std::string getTargetString(ofTargetPlatform t){
     switch (t) {
     case OF_TARGET_OSX:
         return "osx";
-    case OF_TARGET_WINGCC:
-        return "win_cb";
+    case OF_TARGET_MINGW:
+        return "msys2";
     case OF_TARGET_WINVS:
         return "vs";
     case OF_TARGET_IOS:
@@ -495,7 +495,7 @@ unique_ptr<baseProject> getTargetProject(ofTargetPlatform targ) {
     switch (targ) {
     case OF_TARGET_OSX:
         return unique_ptr<xcodeProject>(new xcodeProject(getTargetString(targ)));
-    case OF_TARGET_WINGCC:
+    case OF_TARGET_MINGW:
         return unique_ptr<QtCreatorProject>(new QtCreatorProject(getTargetString(targ)));
     case OF_TARGET_WINVS:
         return unique_ptr<visualStudioProject>(new visualStudioProject(getTargetString(targ)));