From de5165be43ff5ae16077da5cfcb82aad67f9bdd5 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 18 Apr 2023 15:59:48 -0300 Subject: [PATCH 1/4] merge main --- commandLine/config.make | 25 +++++++++++++++++++++++++ commandLine/src/addons/ofAddon.h | 7 +++++++ commandLine/src/main.cpp | 2 -- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/commandLine/config.make b/commandLine/config.make index 443af4e0..1bce943e 100644 --- a/commandLine/config.make +++ b/commandLine/config.make @@ -143,3 +143,28 @@ PROJECT_OPTIMIZATION_CFLAGS_RELEASE = -O3 # PROJECT_CXX = # PROJECT_CC = + +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/utils +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/sound + + +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/3d +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/communication +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/events +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/gl +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/graphics +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/math +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/types +PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/video +PLATFORM_CORE_EXCLUSIONS += ../../../libs/boost% +PLATFORM_CORE_EXCLUSIONS += ../../../libs/cairo% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/curl% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/fmod% +PLATFORM_CORE_EXCLUSIONS += ../../../libs/rtAudio% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/freetype% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/FreeImage% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/glew% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/glfw% +PLATFORM_CORE_EXCLUSIONS += ../../../libs/glm% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/tess2% +#PLATFORM_CORE_EXCLUSIONS += ../../../libs/uriparser% diff --git a/commandLine/src/addons/ofAddon.h b/commandLine/src/addons/ofAddon.h index a9f12842..09143350 100644 --- a/commandLine/src/addons/ofAddon.h +++ b/commandLine/src/addons/ofAddon.h @@ -8,9 +8,16 @@ #ifndef OFADDON_H_ #define OFADDON_H_ +<<<<<<< HEAD:commandLine/src/addons/ofAddon.h #include "ofConstants.h" #include "LibraryBinary.h" #include +======= +// FIXME: of::filesystem only +#include "ofConstants.h" +#include "LibraryBinary.h" +#include +>>>>>>> 4f16f91 (removing unneded paths):ofxProjectGenerator/src/addons/ofAddon.h // About Metadata diff --git a/commandLine/src/main.cpp b/commandLine/src/main.cpp index f9ccdd03..33ebf8a3 100644 --- a/commandLine/src/main.cpp +++ b/commandLine/src/main.cpp @@ -1,5 +1,3 @@ -//#include "ofMain.h" - #include "optionparser.h" #include "defines.h" From 04b2127d037a6568d70a1266c6165b47f49b7834 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 18 Apr 2023 16:00:40 -0300 Subject: [PATCH 2/4] one more --- commandLine/config.make | 8 ++++---- commandLine/src/main.cpp | 3 --- commandLine/src/projects/CBLinuxProject.h | 4 ++-- commandLine/src/projects/CBWinProject.h | 4 ++-- commandLine/src/projects/baseProject.h | 4 +--- commandLine/src/projects/visualStudioProject.h | 8 ++------ commandLine/src/utils/Utils.h | 6 +++--- 7 files changed, 14 insertions(+), 23 deletions(-) diff --git a/commandLine/config.make b/commandLine/config.make index 1bce943e..0e23c961 100644 --- a/commandLine/config.make +++ b/commandLine/config.make @@ -146,8 +146,6 @@ PROJECT_OPTIMIZATION_CFLAGS_RELEASE = -O3 #PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/utils PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/sound - - PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/3d PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/communication PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/events @@ -156,15 +154,17 @@ PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/graphics PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/math PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/types PLATFORM_CORE_EXCLUSIONS += ../../../libs/openFrameworks/video + PLATFORM_CORE_EXCLUSIONS += ../../../libs/boost% PLATFORM_CORE_EXCLUSIONS += ../../../libs/cairo% +PLATFORM_CORE_EXCLUSIONS += ../../../libs/rtAudio% +PLATFORM_CORE_EXCLUSIONS += ../../../libs/glm% + #PLATFORM_CORE_EXCLUSIONS += ../../../libs/curl% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/fmod% -PLATFORM_CORE_EXCLUSIONS += ../../../libs/rtAudio% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/freetype% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/FreeImage% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/glew% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/glfw% -PLATFORM_CORE_EXCLUSIONS += ../../../libs/glm% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/tess2% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/uriparser% diff --git a/commandLine/src/main.cpp b/commandLine/src/main.cpp index 33ebf8a3..f14f3458 100644 --- a/commandLine/src/main.cpp +++ b/commandLine/src/main.cpp @@ -1,9 +1,6 @@ #include "optionparser.h" #include "defines.h" -#include "Utils.h" // TODO: remove, temporary, only for alert function - -//cxxopts::Options options("Project Generator", "OpenFrameworks tool to generate projects"); enum optionIndex { UNKNOWN, HELP, PLUS, RECURSIVE, LISTTEMPLATES, PLATFORMS, ADDONS, OFPATH, VERBOSE, TEMPLATE, DRYRUN, SRCEXTERNAL, VERSION}; constexpr option::Descriptor usage[] = diff --git a/commandLine/src/projects/CBLinuxProject.h b/commandLine/src/projects/CBLinuxProject.h index 1a2427e9..5aaaf38c 100644 --- a/commandLine/src/projects/CBLinuxProject.h +++ b/commandLine/src/projects/CBLinuxProject.h @@ -8,8 +8,8 @@ #ifndef CBLINUXPROJECT_H_ #define CBLINUXPROJECT_H_ -#include "ofConstants.h" -#include "ofAddon.h" +//#include "ofConstants.h" +//#include "ofAddon.h" #include "CBWinProject.h" #include "LibraryBinary.h" diff --git a/commandLine/src/projects/CBWinProject.h b/commandLine/src/projects/CBWinProject.h index f8e57365..1acfa695 100644 --- a/commandLine/src/projects/CBWinProject.h +++ b/commandLine/src/projects/CBWinProject.h @@ -8,8 +8,8 @@ #ifndef CBWINPROJECT_H_ #define CBWINPROJECT_H_ -#include "ofConstants.h" -#include "ofAddon.h" +//#include "ofConstants.h" +//#include "ofAddon.h" #include "baseProject.h" class CBWinProject: public baseProject { diff --git a/commandLine/src/projects/baseProject.h b/commandLine/src/projects/baseProject.h index c99beaae..317ea558 100644 --- a/commandLine/src/projects/baseProject.h +++ b/commandLine/src/projects/baseProject.h @@ -1,9 +1,7 @@ - - #pragma once #include "ofAddon.h" -#include "ofConstants.h" +//#include "ofConstants.h" #include "ofFileUtils.h" #include "pugixml.hpp" // TODO: - Remove diff --git a/commandLine/src/projects/visualStudioProject.h b/commandLine/src/projects/visualStudioProject.h index 0037b0cb..f0ddc3bd 100644 --- a/commandLine/src/projects/visualStudioProject.h +++ b/commandLine/src/projects/visualStudioProject.h @@ -1,9 +1,8 @@ - #ifndef VSWINPROJECT_H_ #define VSWINPROJECT_H_ -#include "ofConstants.h" -#include "ofAddon.h" +//#include "ofConstants.h" +//#include "ofAddon.h" #include "baseProject.h" class visualStudioProject : public baseProject { @@ -29,12 +28,9 @@ class visualStudioProject : public baseProject { pugi::xml_document filterXmlDoc; - void appendFilter(std::string folderName); - private: }; - #endif diff --git a/commandLine/src/utils/Utils.h b/commandLine/src/utils/Utils.h index f971757d..058b74d5 100644 --- a/commandLine/src/utils/Utils.h +++ b/commandLine/src/utils/Utils.h @@ -10,10 +10,10 @@ #include "pugixml.hpp" -#include "ofConstants.h" -#include "ofFileUtils.h" +//#include "ofConstants.h" +//#include "ofFileUtils.h" #include "ofLog.h" -#include "ofUtils.h" +//#include "ofUtils.h" #include "ofSystemUtils.h" #include "LibraryBinary.h" #include "baseProject.h" From 148bb71fb78e4fa31c9d38f436ea5b846a5293ec Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 1 Apr 2023 19:23:41 -0300 Subject: [PATCH 3/4] idea --- commandLine/config.make | 14 ++++++++++++++ commandLine/src/main.cpp | 10 +++++----- commandLine/src/projects/CBLinuxProject.h | 2 -- commandLine/src/projects/CBWinProject.h | 2 -- commandLine/src/projects/baseProject.h | 1 - commandLine/src/projects/visualStudioProject.h | 2 -- commandLine/src/projects/xcodeProject.cpp | 2 +- commandLine/src/projects/xcodeProject.h | 2 -- commandLine/src/utils/Utils.h | 6 +----- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/commandLine/config.make b/commandLine/config.make index 0e23c961..93c6ca9b 100644 --- a/commandLine/config.make +++ b/commandLine/config.make @@ -160,11 +160,25 @@ PLATFORM_CORE_EXCLUSIONS += ../../../libs/cairo% PLATFORM_CORE_EXCLUSIONS += ../../../libs/rtAudio% PLATFORM_CORE_EXCLUSIONS += ../../../libs/glm% +# unable to remove because ofURLFileLoaderImpl is being used by ofImage, which is being used by ofUtils #PLATFORM_CORE_EXCLUSIONS += ../../../libs/curl% + #PLATFORM_CORE_EXCLUSIONS += ../../../libs/fmod% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/freetype% #PLATFORM_CORE_EXCLUSIONS += ../../../libs/FreeImage% + +# ../../../libs/openFrameworks/utils/ofConstants.h:192:11: fatal error: 'GL/glew.h' file not found #PLATFORM_CORE_EXCLUSIONS += ../../../libs/glew% + +# not possible to remove yet #PLATFORM_CORE_EXCLUSIONS += ../../../libs/glfw% + +# ../../../libs/openFrameworks/utils/ofConstants.h:287:10: fatal error: 'tesselator.h' file not found #PLATFORM_CORE_EXCLUSIONS += ../../../libs/tess2% + +# inside ofImage inside ofUtils #PLATFORM_CORE_EXCLUSIONS += ../../../libs/uriparser% + +# FIXME: REMOVE +#PROJECT_CXX = include-what-you-use +#PROJECT_CC = include-what-you-use \ No newline at end of file diff --git a/commandLine/src/main.cpp b/commandLine/src/main.cpp index f14f3458..b908e246 100644 --- a/commandLine/src/main.cpp +++ b/commandLine/src/main.cpp @@ -1,5 +1,10 @@ +#define TARGET_NO_SOUND +#define TARGET_NODISPLAY + #include "optionparser.h" #include "defines.h" +#include "Utils.h" +#include enum optionIndex { UNKNOWN, HELP, PLUS, RECURSIVE, LISTTEMPLATES, PLATFORMS, ADDONS, OFPATH, VERBOSE, TEMPLATE, DRYRUN, SRCEXTERNAL, VERSION}; @@ -20,11 +25,6 @@ constexpr option::Descriptor usage[] = {0,0,0,0,0,0} }; -#include "qtcreatorproject.h" -#include "visualStudioProject.h" -#include "xcodeProject.h" -#include "androidStudioProject.h" -#include "Utils.h" using std::cout; using std::endl; diff --git a/commandLine/src/projects/CBLinuxProject.h b/commandLine/src/projects/CBLinuxProject.h index 5aaaf38c..b3075099 100644 --- a/commandLine/src/projects/CBLinuxProject.h +++ b/commandLine/src/projects/CBLinuxProject.h @@ -8,8 +8,6 @@ #ifndef CBLINUXPROJECT_H_ #define CBLINUXPROJECT_H_ -//#include "ofConstants.h" -//#include "ofAddon.h" #include "CBWinProject.h" #include "LibraryBinary.h" diff --git a/commandLine/src/projects/CBWinProject.h b/commandLine/src/projects/CBWinProject.h index 1acfa695..66fe5f85 100644 --- a/commandLine/src/projects/CBWinProject.h +++ b/commandLine/src/projects/CBWinProject.h @@ -8,8 +8,6 @@ #ifndef CBWINPROJECT_H_ #define CBWINPROJECT_H_ -//#include "ofConstants.h" -//#include "ofAddon.h" #include "baseProject.h" class CBWinProject: public baseProject { diff --git a/commandLine/src/projects/baseProject.h b/commandLine/src/projects/baseProject.h index 317ea558..f2ac008f 100644 --- a/commandLine/src/projects/baseProject.h +++ b/commandLine/src/projects/baseProject.h @@ -1,7 +1,6 @@ #pragma once #include "ofAddon.h" -//#include "ofConstants.h" #include "ofFileUtils.h" #include "pugixml.hpp" // TODO: - Remove diff --git a/commandLine/src/projects/visualStudioProject.h b/commandLine/src/projects/visualStudioProject.h index f0ddc3bd..40f5fdfe 100644 --- a/commandLine/src/projects/visualStudioProject.h +++ b/commandLine/src/projects/visualStudioProject.h @@ -1,8 +1,6 @@ #ifndef VSWINPROJECT_H_ #define VSWINPROJECT_H_ -//#include "ofConstants.h" -//#include "ofAddon.h" #include "baseProject.h" class visualStudioProject : public baseProject { diff --git a/commandLine/src/projects/xcodeProject.cpp b/commandLine/src/projects/xcodeProject.cpp index 7c6c7df8..5fb97839 100644 --- a/commandLine/src/projects/xcodeProject.cpp +++ b/commandLine/src/projects/xcodeProject.cpp @@ -1,7 +1,7 @@ #include "xcodeProject.h" #include "Utils.h" -#include #include "json.hpp" +#include using std::vector; using std::string; diff --git a/commandLine/src/projects/xcodeProject.h b/commandLine/src/projects/xcodeProject.h index e7166ced..1787b3ac 100644 --- a/commandLine/src/projects/xcodeProject.h +++ b/commandLine/src/projects/xcodeProject.h @@ -1,5 +1,3 @@ - - #pragma once #include "baseProject.h" diff --git a/commandLine/src/utils/Utils.h b/commandLine/src/utils/Utils.h index 058b74d5..71fde996 100644 --- a/commandLine/src/utils/Utils.h +++ b/commandLine/src/utils/Utils.h @@ -10,14 +10,10 @@ #include "pugixml.hpp" -//#include "ofConstants.h" -//#include "ofFileUtils.h" #include "ofLog.h" -//#include "ofUtils.h" #include "ofSystemUtils.h" -#include "LibraryBinary.h" #include "baseProject.h" - +struct LibraryBinary; std::string generateUUID(std::string input); From 8971fe528edf3454cf689bd403518ff63dec5e34 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 18 Apr 2023 16:04:48 -0300 Subject: [PATCH 4/4] fix conflicts --- commandLine/src/addons/ofAddon.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/commandLine/src/addons/ofAddon.h b/commandLine/src/addons/ofAddon.h index 09143350..3f537ebe 100644 --- a/commandLine/src/addons/ofAddon.h +++ b/commandLine/src/addons/ofAddon.h @@ -8,16 +8,11 @@ #ifndef OFADDON_H_ #define OFADDON_H_ -<<<<<<< HEAD:commandLine/src/addons/ofAddon.h -#include "ofConstants.h" -#include "LibraryBinary.h" -#include -======= // FIXME: of::filesystem only #include "ofConstants.h" #include "LibraryBinary.h" -#include ->>>>>>> 4f16f91 (removing unneded paths):ofxProjectGenerator/src/addons/ofAddon.h +#include +// #include // About Metadata