From bded0ee4a34dec03480d636d67c1485703f44100 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Fri, 30 Oct 2026 10:41:27 +1100 Subject: [PATCH 1/2] -t vscode adds the vscode platform instead of replacing -p (osx / vs project files were missing); bump version (#476) --- commandLine/src/defines.h | 2 +- commandLine/src/main.cpp | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/commandLine/src/defines.h b/commandLine/src/defines.h index 46369bc5..fc7501bd 100644 --- a/commandLine/src/defines.h +++ b/commandLine/src/defines.h @@ -1,5 +1,5 @@ #define OFPROJECTGENERATOR_MAJOR_VERSION "0" -#define OFPROJECTGENERATOR_MINOR_VERSION "116" +#define OFPROJECTGENERATOR_MINOR_VERSION "117" #define OFPROJECTGENERATOR_PATCH_VERSION "0" #define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION) diff --git a/commandLine/src/main.cpp b/commandLine/src/main.cpp index 28e9c4d1..23e50268 100644 --- a/commandLine/src/main.cpp +++ b/commandLine/src/main.cpp @@ -572,9 +572,17 @@ int pgMain(int argc, char ** argv) { } //fix as we want to treat vscode as a platform not a template - if (templateName == "vscode") { - templateName = ""; - addPlatforms("vscode"); + // added to the -p platforms, not replacing them (addPlatforms clears), so -posx -tvscode still makes the xcodeproj (#476) + { + vector templateNames = ofSplitString(templateName, ",", true, true); + auto vscode = std::find(templateNames.begin(), templateNames.end(), "vscode"); + if (vscode != templateNames.end()) { + templateNames.erase(vscode); + templateName = ofJoinString(templateNames, ","); + if (std::find(targets.begin(), targets.end(), "vscode") == targets.end()) { + targets.emplace_back("vscode"); + } + } } if (options[MSYS2ENV].count() > 0 && options[MSYS2ENV].arg != NULL) { From c979168ce70b1dc21e12375a9c88d6e382e2c0b8 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Fri, 30 Oct 2026 12:07:06 +1100 Subject: [PATCH 2/2] GUI 0.110.0 --- frontend/npm-shrinkwrap.json | 4 ++-- frontend/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 565ce214..3511aebf 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "projectGenerator", - "version": "0.109.0", + "version": "0.110.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "projectGenerator", - "version": "0.109.0", + "version": "0.110.0", "license": "MIT", "dependencies": { "@types/jquery": "^3.5.34", diff --git a/frontend/package.json b/frontend/package.json index 13b6b44f..bc6eb0b7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,7 @@ { "name": "projectGenerator", "productName": "projectGenerator", - "version": "0.109.0", + "version": "0.110.0", "description": "Build electron GUI openFrameworks projectGenerator", "license": "MIT", "main": "index.js",