Merge branch 'master' of https://github.com/openframeworks/projectGenerator

Author: ofTheo

commandLine/config.make

@@ -143,3 +143,42 @@ 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/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

commandLine/src/addons/ofAddon.h

@@ -8,9 +8,11 @@
 #ifndef OFADDON_H_
 #define OFADDON_H_
 
+// FIXME: of::filesystem only
 #include "ofConstants.h"
 #include "LibraryBinary.h"
 #include <unordered_map>
+// #include <map>
 
 // About Metadata
 

commandLine/src/main.cpp

@@ -1,11 +1,11 @@
-//#include "ofMain.h"
+#define TARGET_NO_SOUND
+#define TARGET_NODISPLAY
 
 #include "optionparser.h"
 #include "defines.h"
+#include "Utils.h"
+#include <set>
 
-#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[] =
@@ -25,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;

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"
 

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  {

commandLine/src/projects/baseProject.h

@@ -1,9 +1,6 @@
-
-
 #pragma once
 
 #include "ofAddon.h"
-#include "ofConstants.h"
 #include "ofFileUtils.h"
 #include "pugixml.hpp"
 // TODO: - Remove

commandLine/src/projects/visualStudioProject.h

@@ -1,9 +1,6 @@
-
 #ifndef VSWINPROJECT_H_
 #define VSWINPROJECT_H_
 
-#include "ofConstants.h"
-#include "ofAddon.h"
 #include "baseProject.h"
 
 class visualStudioProject : public baseProject {
@@ -29,12 +26,9 @@ class visualStudioProject : public baseProject {
 
 	pugi::xml_document filterXmlDoc;
 
-
 	void appendFilter(std::string folderName);
 
-
 private:
 
 };
-
 #endif

commandLine/src/projects/xcodeProject.cpp

@@ -1,7 +1,7 @@
 #include "xcodeProject.h"
 #include "Utils.h"
-#include <iostream>
 #include "json.hpp"
+#include <iostream>
 
 using std::vector;
 using std::string;

commandLine/src/projects/xcodeProject.h

@@ -1,5 +1,3 @@
-
-
 #pragma once
 
 #include "baseProject.h"

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);