From 7d8858e349f411a154969e7d4793dd9a6218f479 Mon Sep 17 00:00:00 2001
From: Philip Whitfield <phwhitfield@touch.ch>
Date: Fri, 2 Nov 2012 16:20:44 +0100
Subject: [PATCH 1/7] added codelite linux project

---
 bin/data/templates/codeliteLinux/Makefile     |   2 +
 .../templates/codeliteLinux/bin/data/.gitkeep |   0
 bin/data/templates/codeliteLinux/config.make  |  56 +++++++
 .../codeliteLinux/emptyExample.project        | 105 ++++++++++++
 .../codeliteLinux/emptyExample.workspace      |  20 +++
 bin/data/templates/codeliteLinux/src/main.cpp |  16 ++
 .../templates/codeliteLinux/src/testApp.cpp   |  59 +++++++
 .../templates/codeliteLinux/src/testApp.h     |  22 +++
 projectGenerator_linux64.cbp                  |   2 +-
 projectGenerator_linux64.workspace            |  10 +-
 src/projects/CodeliteLinuxProject.cpp         | 150 ++++++++++++++++++
 src/projects/CodeliteLinuxProject.h           |  25 +++
 src/testApp.cpp                               | 114 ++++++++-----
 src/testApp.h                                 |  41 ++---
 14 files changed, 558 insertions(+), 64 deletions(-)
 create mode 100644 bin/data/templates/codeliteLinux/Makefile
 create mode 100644 bin/data/templates/codeliteLinux/bin/data/.gitkeep
 create mode 100644 bin/data/templates/codeliteLinux/config.make
 create mode 100644 bin/data/templates/codeliteLinux/emptyExample.project
 create mode 100644 bin/data/templates/codeliteLinux/emptyExample.workspace
 create mode 100644 bin/data/templates/codeliteLinux/src/main.cpp
 create mode 100644 bin/data/templates/codeliteLinux/src/testApp.cpp
 create mode 100644 bin/data/templates/codeliteLinux/src/testApp.h
 create mode 100644 src/projects/CodeliteLinuxProject.cpp
 create mode 100644 src/projects/CodeliteLinuxProject.h

diff --git a/bin/data/templates/codeliteLinux/Makefile b/bin/data/templates/codeliteLinux/Makefile
new file mode 100644
index 0000000..2d83a77
--- /dev/null
+++ b/bin/data/templates/codeliteLinux/Makefile
@@ -0,0 +1,2 @@
+include config.make
+include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/Makefile.examples
diff --git a/bin/data/templates/codeliteLinux/bin/data/.gitkeep b/bin/data/templates/codeliteLinux/bin/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/bin/data/templates/codeliteLinux/config.make b/bin/data/templates/codeliteLinux/config.make
new file mode 100644
index 0000000..9eec157
--- /dev/null
+++ b/bin/data/templates/codeliteLinux/config.make
@@ -0,0 +1,56 @@
+# add custom variables to this file
+
+# OF_ROOT allows to move projects outside apps/* just set this variable to the
+# absoulte path to the OF root folder
+
+OF_ROOT = ../../..
+
+
+# USER_CFLAGS allows to pass custom flags to the compiler
+# for example search paths like:
+# USER_CFLAGS = -I src/objects
+
+USER_CFLAGS = 
+
+
+# USER_LDFLAGS allows to pass custom flags to the linker
+# for example libraries like:
+# USER_LDFLAGS = libs/libawesomelib.a
+
+USER_LDFLAGS =
+
+
+EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj"
+
+# change this to add different compiler optimizations to your project
+
+USER_COMPILER_OPTIMIZATION = -march=native -mtune=native -Os
+
+
+# android specific, in case you want to use different optimizations
+USER_LIBS_ARM = 
+USER_LIBS_ARM7 = 
+USER_LIBS_NEON = 
+
+# android optimizations
+
+ANDROID_COMPILER_OPTIMIZATION = -Os
+
+NDK_PLATFORM = android-8
+
+# uncomment this for custom application name (if the folder name is different than the application name)
+#APPNAME = folderName
+
+# uncomment this for custom package name, must be the same as the java package that contains OFActivity
+#PKGNAME = cc.openframeworks.$(APPNAME)
+
+
+
+
+
+# linux arm flags
+
+LINUX_ARM7_COMPILER_OPTIMIZATIONS = -march=armv7-a -mtune=cortex-a8 -finline-functions -funroll-all-loops  -O3 -funsafe-math-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=hard -mfpu=vfp
+
+
+
diff --git a/bin/data/templates/codeliteLinux/emptyExample.project b/bin/data/templates/codeliteLinux/emptyExample.project
new file mode 100644
index 0000000..392c95e
--- /dev/null
+++ b/bin/data/templates/codeliteLinux/emptyExample.project
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CodeLite_Project Name="emptyExample" InternalType="">
+  <Plugins>
+    <Plugin Name="qmake">
+      <![CDATA[00020001N0005Debug0000000000000001N0007Release000000000000]]>
+    </Plugin>
+  </Plugins>
+  <Description/>
+  <Dependencies/>
+  <VirtualDirectory Name="src">
+    <File Name="../src/testApp.cpp"/>
+    <File Name="../src/testApp.h"/>
+    <File Name="../src/main.cpp"/>
+  </VirtualDirectory>
+  <VirtualDirectory Name="config">
+    <File Name="../Makefile"/>
+    <File Name="../config.make"/>
+    <File Name="../addons.make"/>
+  </VirtualDirectory>
+  <Settings Type="Dynamic Library">
+    <GlobalSettings>
+      <Compiler Options="" C_Options="">
+        <IncludePath Value="."/>
+      </Compiler>
+      <Linker Options="">
+        <LibraryPath Value="."/>
+      </Linker>
+      <ResourceCompiler Options=""/>
+    </GlobalSettings>
+    <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
+      <Compiler Options="-g" C_Options="-g" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
+        <IncludePath Value="."/>
+      </Compiler>
+      <Linker Options="" Required="yes"/>
+      <ResourceCompiler Options="" Required="no"/>
+      <General OutputFile="" IntermediateDirectory="./Debug" Command="./$(ProjectName)_debug" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/../bin" PauseExecWhenProcTerminates="yes"/>
+      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
+        <![CDATA[]]>
+      </Environment>
+      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
+        <PostConnectCommands/>
+        <StartupCommands/>
+      </Debugger>
+      <PreBuild/>
+      <PostBuild/>
+      <CustomBuild Enabled="yes">
+        <RebuildCommand/>
+        <CleanCommand>make clean Debug</CleanCommand>
+        <BuildCommand>make Debug</BuildCommand>
+        <PreprocessFileCommand/>
+        <SingleFileCommand/>
+        <MakefileGenerationCommand/>
+        <ThirdPartyToolName>None</ThirdPartyToolName>
+        <WorkingDirectory>$(WorkspacePath)/..</WorkingDirectory>
+      </CustomBuild>
+      <AdditionalRules>
+        <CustomPostBuild/>
+        <CustomPreBuild/>
+      </AdditionalRules>
+      <Completion EnableCpp11="no">
+        <ClangCmpFlagsC/>
+        <ClangCmpFlags/>
+        <ClangPP/>
+        <SearchPaths/>
+      </Completion>
+    </Configuration>
+    <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
+      <Compiler Options="" C_Options="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
+        <IncludePath Value="."/>
+      </Compiler>
+      <Linker Options="-O2" Required="yes"/>
+      <ResourceCompiler Options="" Required="no"/>
+      <General OutputFile="" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/../bin" PauseExecWhenProcTerminates="yes"/>
+      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
+        <![CDATA[]]>
+      </Environment>
+      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
+        <PostConnectCommands/>
+        <StartupCommands/>
+      </Debugger>
+      <PreBuild/>
+      <PostBuild/>
+      <CustomBuild Enabled="yes">
+        <RebuildCommand/>
+        <CleanCommand>make clean Release</CleanCommand>
+        <BuildCommand>make Release</BuildCommand>
+        <PreprocessFileCommand/>
+        <SingleFileCommand/>
+        <MakefileGenerationCommand/>
+        <ThirdPartyToolName>None</ThirdPartyToolName>
+        <WorkingDirectory>$(WorkspacePath)/..</WorkingDirectory>
+      </CustomBuild>
+      <AdditionalRules>
+        <CustomPostBuild/>
+        <CustomPreBuild/>
+      </AdditionalRules>
+      <Completion EnableCpp11="no">
+        <ClangCmpFlagsC/>
+        <ClangCmpFlags/>
+        <ClangPP/>
+        <SearchPaths/>
+      </Completion>
+    </Configuration>
+  </Settings>
+</CodeLite_Project>
diff --git a/bin/data/templates/codeliteLinux/emptyExample.workspace b/bin/data/templates/codeliteLinux/emptyExample.workspace
new file mode 100644
index 0000000..6030c3e
--- /dev/null
+++ b/bin/data/templates/codeliteLinux/emptyExample.workspace
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CodeLite_Workspace Name="emptyExample" Database="./emptyExample.tags">
+  <Environment>
+    <![CDATA[
+  
+  
+  ]]>
+  </Environment>
+  <Project Name="emptyExample" Path="emptyExample.project" Active="Yes"/>
+  <BuildMatrix>
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
+      <Project Name="linux" ConfigName="Debug"/>
+      <Project Name="emptyExample" ConfigName="Debug"/>
+    </WorkspaceConfiguration>
+    <WorkspaceConfiguration Name="Release" Selected="yes">
+      <Project Name="linux" ConfigName="Release"/>
+      <Project Name="emptyExample" ConfigName="Release"/>
+    </WorkspaceConfiguration>
+  </BuildMatrix>
+</CodeLite_Workspace>
diff --git a/bin/data/templates/codeliteLinux/src/main.cpp b/bin/data/templates/codeliteLinux/src/main.cpp
new file mode 100644
index 0000000..6a32c6a
--- /dev/null
+++ b/bin/data/templates/codeliteLinux/src/main.cpp
@@ -0,0 +1,16 @@
+#include "ofMain.h"
+#include "testApp.h"
+#include "ofAppGlutWindow.h"
+
+//========================================================================
+int main( ){
+
+    ofAppGlutWindow window;
+	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
+
+	// this kicks off the running of my app
+	// can be OF_WINDOW or OF_FULLSCREEN
+	// pass in width and height too:
+	ofRunApp( new testApp());
+
+}
diff --git a/bin/data/templates/codeliteLinux/src/testApp.cpp b/bin/data/templates/codeliteLinux/src/testApp.cpp
new file mode 100644
index 0000000..6335e6f
--- /dev/null
+++ b/bin/data/templates/codeliteLinux/src/testApp.cpp
@@ -0,0 +1,59 @@
+#include "testApp.h"
+
+//--------------------------------------------------------------
+void testApp::setup(){
+}
+
+//--------------------------------------------------------------
+void testApp::update(){
+}
+
+//--------------------------------------------------------------
+void testApp::draw(){
+
+}
+
+//--------------------------------------------------------------
+void testApp::keyPressed(int key){
+
+}
+
+//--------------------------------------------------------------
+void testApp::keyReleased(int key){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mouseMoved(int x, int y ){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mouseDragged(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mousePressed(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mouseReleased(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void testApp::windowResized(int w, int h){
+
+}
+
+//--------------------------------------------------------------
+void testApp::gotMessage(ofMessage msg){
+
+}
+
+//--------------------------------------------------------------
+void testApp::dragEvent(ofDragInfo dragInfo){ 
+
+}
\ No newline at end of file
diff --git a/bin/data/templates/codeliteLinux/src/testApp.h b/bin/data/templates/codeliteLinux/src/testApp.h
new file mode 100644
index 0000000..0cb5a8c
--- /dev/null
+++ b/bin/data/templates/codeliteLinux/src/testApp.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "ofMain.h"
+
+class testApp : public ofBaseApp{
+
+	public:
+		void setup();
+		void update();
+		void draw();
+
+		void keyPressed  (int key);
+		void keyReleased(int key);
+		void mouseMoved(int x, int y );
+		void mouseDragged(int x, int y, int button);
+		void mousePressed(int x, int y, int button);
+		void mouseReleased(int x, int y, int button);
+		void windowResized(int w, int h);
+		void dragEvent(ofDragInfo dragInfo);
+		void gotMessage(ofMessage msg);
+		
+};
diff --git a/projectGenerator_linux64.cbp b/projectGenerator_linux64.cbp
index 3865643..8f7c973 100644
--- a/projectGenerator_linux64.cbp
+++ b/projectGenerator_linux64.cbp
@@ -2,7 +2,7 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="projectGenerator" />
+		<Option title="projectGeneratorSimple" />
 		<Option makefile_is_custom="1" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
diff --git a/projectGenerator_linux64.workspace b/projectGenerator_linux64.workspace
index eabcc7d..bfbcb8c 100644
--- a/projectGenerator_linux64.workspace
+++ b/projectGenerator_linux64.workspace
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CodeBlocks_workspace_file>
-	<Workspace title="projectGenerator">
-		<Project filename="../../../libs/openFrameworksCompiled/project/linux64/libopenFrameworks.cbp" />
-		<Project filename="projectGenerator_linux64.cbp" active="1" />
-	</Workspace>
+  <Workspace title="projectGenerator">
+    <Project filename="../../../libs/openFrameworksCompiled/project/linux64/libopenFrameworks.cbp"/>
+    <Project filename="projectGenerator_linux64.cbp" active="1"/>
+  </Workspace>
 </CodeBlocks_workspace_file>
diff --git a/src/projects/CodeliteLinuxProject.cpp b/src/projects/CodeliteLinuxProject.cpp
new file mode 100644
index 0000000..49ee3c3
--- /dev/null
+++ b/src/projects/CodeliteLinuxProject.cpp
@@ -0,0 +1,150 @@
+#include "CodeliteLinuxProject.h"
+
+#define LOG_NAME "codelite"
+
+CodeliteLinuxProject::CodeliteLinuxProject()
+{
+    codeliteDirName = "codelite/";
+}
+
+CodeliteLinuxProject::~CodeliteLinuxProject()
+{
+    //dtor
+}
+
+
+void CodeliteLinuxProject::setup(){
+    templatePath = ofToDataPath("templates/codeliteLinux/", true);
+}
+
+bool CodeliteLinuxProject::createProjectFile(){
+    ofDirectory dir(projectDir);
+	if(!dir.exists()) dir.create(true);
+
+	ofDirectory codeliteDir(ofFilePath::join(projectDir, codeliteDirName));
+    if(!codeliteDir.exists()) codeliteDir.create(true);
+
+    //prepare paths
+    ofFile project(ofFilePath::join(codeliteDir.getAbsolutePath(), projectName + ".project"));
+    string src =  ofFilePath::join(templatePath,"emptyExample.project");
+    string dst = project.path();
+
+    bool ret = true;
+
+    //copy the project file over if necessary
+     if(!project.exists()){
+        ret = ofFile::copyFromTo(src,dst);
+        if(!ret){
+            ofLogError(LOG_NAME) << "error copying codelite template from " << src << " to " << dst;
+            return false;
+        }else{
+            findandreplaceInTexfile(dst, "emptyExample", projectName);
+        }
+    }
+
+    ofFile workspace(ofFilePath::join(codeliteDir.getAbsolutePath(), projectName + ".workspace"));
+    if(!workspace.exists()){
+		src = ofFilePath::join(templatePath,"emptyExample.workspace");
+		dst = workspace.path();
+		ret = ofFile::copyFromTo(src,dst);
+		if(!ret){
+			ofLogError(LOG_NAME) << "error copying workspace template from "<< src << " to " << dst;
+			return false;
+		}else{
+			findandreplaceInTexfile(dst, "emptyExample", projectName);
+		}
+    }
+
+    ofFile makefile(ofFilePath::join(projectDir,"Makefile"));
+    if(!makefile.exists()){
+		src = ofFilePath::join(templatePath,"Makefile");
+		dst = makefile.path();
+		ret = ofFile::copyFromTo(src,dst);
+		if(!ret){
+			ofLogError(LOG_NAME) << "error copying Makefile template from " << src << " to " << dst;
+			return false;
+		}
+    }
+
+    ofFile config(ofFilePath::join(projectDir,"config.make"));
+    if(!config.exists()){
+    	src = ofFilePath::join(templatePath,"config.make");
+    	dst = config.path();
+    	ret = ofFile::copyFromTo(src,dst);
+    	if(!ret){
+    		ofLogError(LOG_NAME) << "error copying config.make template from " << src << " to " << dst;
+    		return false;
+    	}
+    }
+
+    // handle the relative roots.
+    string relRoot = getOFRelPath(ofFilePath::removeTrailingSlash(projectDir));
+    if (relRoot != "../../../"){
+        string relPath2 = relRoot;
+        relPath2.erase(relPath2.end()-1);
+        findandreplaceInTexfile(projectDir + "config.make", "../../..", relPath2);
+        findandreplaceInTexfile(ofFilePath::join(projectDir , projectName + ".workspace"), "../../../", relRoot);
+        findandreplaceInTexfile(ofFilePath::join(projectDir , projectName + ".cbp"), "../../../", relRoot);
+    }
+
+    return ret;
+}
+
+bool CodeliteLinuxProject::loadProjectFile(){
+    ofFile project(projectDir + codeliteDirName + projectName + ".project");
+	if(!project.exists()){
+		ofLogError(LOG_NAME) << "error loading" << project.path() << "doesn't exist";
+		return false;
+	}
+	pugi::xml_parse_result result = doc.load(project);
+	bLoaded =result.status==pugi::status_ok;
+	return bLoaded;
+}
+
+bool CodeliteLinuxProject::saveProjectFile(){
+    findandreplaceInTexfile(ofFilePath::join(projectDir , codeliteDirName+projectName + ".workspace"),"emptyExample",projectName);
+    pugi::xpath_node_set title = doc.select_nodes("//CodeLite_Project[@Name]");
+    if(!title.empty()){
+        if(!title[0].node().attribute("Name").set_value(projectName.c_str())){
+            ofLogError(LOG_NAME) << "can't set title";
+        }
+    }
+    return doc.save_file((projectDir + codeliteDirName + projectName + ".project").c_str());
+}
+
+void CodeliteLinuxProject::addSrc(string srcFile, string folder){
+    std::vector<string> path = ofSplitString(folder, "/");
+    pugi::xml_node node = doc.child("CodeLite_Project");
+    for(unsigned int i=0;i<path.size();i++){
+        string folder = path[i];
+        if(folder != ".."){
+            pugi::xml_node newNode = node.find_child_by_attribute("VirtualDirectory", "Name", folder.c_str());
+            if(newNode == NULL){
+                newNode = node.append_child();
+                newNode.set_name("VirtualDirectory");
+                pugi::xml_attribute nameAttr = newNode.append_attribute("Name");
+                nameAttr.set_value(folder.c_str());
+            }
+            node = newNode;
+        }
+    }
+
+    pugi::xml_node fileNode = node.append_child();
+    fileNode.set_name("File");
+    pugi::xml_attribute fileAttr = fileNode.append_attribute("Name");
+    string fullPath = srcFile;
+    if(codeliteDirName != "")
+        fullPath = "../"+fullPath;
+    fileAttr.set_value(fullPath.c_str());
+
+    doc.save_file((projectDir + codeliteDirName + projectName + ".project").c_str());
+}
+
+void CodeliteLinuxProject::addInclude(string path){
+    //ofLogNotice() << "adding include " << path;
+    //appendValue(doc, "VirtualDirectory", "Name", path, true);
+}
+void CodeliteLinuxProject::addLibrary(string libraryName, LibType libType ){
+    //ofLogNotice() << "adding library " << libraryName;
+    //appendValue(doc, "Dependencies", "library", libraryName, true);
+}
diff --git a/src/projects/CodeliteLinuxProject.h b/src/projects/CodeliteLinuxProject.h
new file mode 100644
index 0000000..51b738e
--- /dev/null
+++ b/src/projects/CodeliteLinuxProject.h
@@ -0,0 +1,25 @@
+#ifndef CODELITELINUXPROJECT_H
+#define CODELITELINUXPROJECT_H
+
+#include <baseProject.h>
+
+#define OF_TARGET_LINUX_CODELITE 99 //Philip: this is a little bit of an ugly hack but somehow we have to separate the linux codelite project from the general linux project
+
+class CodeliteLinuxProject : virtual public baseProject
+{
+    public:
+        CodeliteLinuxProject();
+        virtual ~CodeliteLinuxProject();
+        void setup();
+        bool createProjectFile();
+        bool loadProjectFile();
+        bool saveProjectFile();
+        void addSrc(string srcFile, string folder);
+        void addInclude(string path);
+        void addLibrary(string libraryName, LibType libType = RELEASE_LIB);
+    protected:
+    private:
+        string codeliteDirName;
+};
+
+#endif // CODELITELINUXPROJECT_H
diff --git a/src/testApp.cpp b/src/testApp.cpp
index a139fa8..acaf8e9 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -99,6 +99,10 @@ string testApp::setupForTarget(int targ){
             project = new CBLinuxProject;
             target = "linux64";
             break;
+        case OF_TARGET_LINUX_CODELITE:
+            project = new CodeliteLinuxProject;
+            target = "linux";
+            break;
     }
 
     project->setup(target);
@@ -123,14 +127,14 @@ void testApp::setup(){
     ofSetLogLevel(OF_LOG_VERBOSE);
     ofSetVerticalSync(true);
 
-    
+
     statusEnergy = 0;
-    
+
     mode = 0;
     bInited = false;
     project = NULL;
     sketchName = "mySketch";
-	
+
 
     //-------------------------------------
     // get settings
@@ -176,7 +180,7 @@ void testApp::setup(){
     font.loadFont("fonts/Inconsolata.otf", 14, true,false,false,0.3,90);
     titleFont.loadFont("fonts/Inconsolata.otf", 28, true,false,false,0.3,90);
     secondFont.loadFont("fonts/Inconsolata.otf", 11, true,false,false,0.3,90);
-    
+
     //  Sketch button
     //
     button.font = &font;
@@ -184,7 +188,7 @@ void testApp::setup(){
     button.prefix = "Name: ";
 	button.topLeftAnchor.set(76, 160+40); //set top button position - others are set relative to this.
     button.setText(sketchName);
-    
+
     button.secondaryText = "<< CLICK TO CHANGE THE NAME";
     buttons.push_back(button);
 
@@ -203,8 +207,12 @@ void testApp::setup(){
     button.prefix = "Platforms: ";
     button.secondaryText = "";
     button.bDrawLong = false;
-    button.secondaryText = "";
     button.bSelectable = false;
+    #ifdef TARGET_LINUX
+    button.bSelectable = true;
+    button.secondaryText = "<< CLICK TO SELECT PLATFORMS";
+    button.bDrawLong = true;
+    #endif
     button.setText(platform);
 
     button.topLeftAnchor.set(button.topLeftAnchor.x, button.topLeftAnchor.y + button.rect.height + 20);
@@ -232,13 +240,13 @@ void testApp::setup(){
     generateButton.bSelectable = true;
     generateButton.setText("");
     generateButton.bDrawLong = false;
-    
+
     addonButton = button;
     addonButton.topLeftAnchor.set(906, 535);
     addonButton.prefix = "<< BACK";
     addonButton.setText("");
     addonButton.bDrawLong = false;
-    
+
 
     for (int i = 0; i < buttons.size(); i++){
         buttons[i].calculateRect();
@@ -283,11 +291,12 @@ void testApp::setup(){
 	panelPlatforms.add(winvsToggle.setup("windows (visualStudio)", ofGetTargetPlatform()==OF_TARGET_WINVS));
 	panelPlatforms.add(linuxcbToggle.setup("linux (codeblocks)",ofGetTargetPlatform()==OF_TARGET_LINUX));
 	panelPlatforms.add(linux64cbToggle.setup("linux64 (codeblocks)",ofGetTargetPlatform()==OF_TARGET_LINUX64));
+	panelPlatforms.add(linuxCodeliteToggle.setup("linux (codelite)",ofGetTargetPlatform()==OF_TARGET_LINUX64));
 
 //for ios, we need to fake that the target is ios (since we're compiling w/ osx OF)
 
 //#define MAKE_IOS
-    
+
 #ifdef MAKE_IOS
 	panelPlatforms.add(osxToggle.setup("osx (xcode)",false));
 	panelPlatforms.add(iosToggle.setup("ios (xcode)",true));
@@ -295,8 +304,8 @@ void testApp::setup(){
     panelPlatforms.add(osxToggle.setup("osx (xcode)",ofGetTargetPlatform()==OF_TARGET_OSX));
 	panelPlatforms.add(iosToggle.setup("ios (xcode)",ofGetTargetPlatform()==OF_TARGET_IPHONE));
 #endif
-    
-    
+
+
     // update the platforms text in the platform button
     string platforms = "";
     for (int i = 0; i < panelPlatforms.getNumControls(); i++){
@@ -312,17 +321,17 @@ void testApp::setup(){
     panelPlatforms.setPosition(10,40);
     panelCoreAddons.setPosition(10,40);
     panelOtherAddons.setPosition(330,40);
-   
+
 
     logo.loadImage("images/ofw-logo.png");
 
     ofBackground(230,230,230);
-    
-    
+
+
     generateButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - generateButton.rect.width + 10 ,
                                      ofGetHeight() - generateButton.rect.height - 40);// 535);
     generateButton.calculateRect();
-    
+
     addonButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - addonButton.rect.width + 10 ,
                                   ofGetHeight() - addonButton.rect.height - 40);// 535);
     addonButton.calculateRect();
@@ -358,7 +367,7 @@ void testApp::update(){
     }
 
     generateButton.checkMousePressed(ofPoint(mouseX, mouseY));
-    
+
     for (int i = 0; i < buttons.size(); i++){
         if (i != 0){
 			buttons[i].topLeftAnchor.y = buttons[i-1].topLeftAnchor.y +buttons[i-1].rect.height + 20;
@@ -387,48 +396,58 @@ void testApp::update(){
 //--------------------------------------------------------------
 void testApp::draw(){
 
-    
-    
-    if (mode != MODE_ADDON ) {
-        
+
+
+    if (mode != MODE_ADDON && mode != MODE_PLATFORM) {
+
         ofSetColor(100);
         logo.draw(64, 61,logo.getWidth(),logo.getHeight());
-        
+
         //ofSetColor(74,255,203);
         titleFont.drawString("PROJECT", 64 + logo.getWidth() + 25, 85);
         titleFont.drawString("GENERATOR",  64 + logo.getWidth() + 25, 117);
     }
-    
+
 	if (mode == 0){
 		for (int i = 0; i < buttons.size(); i++){
 			buttons[i].draw();
 		}
-        
+
         generateButton.draw();
-        
+
     } else if (mode == 1){
         panelCoreAddons.draw();
         if (bHaveNonCoreAddons){
             panelOtherAddons.draw();
         }
-    } else if (mode == 2){
+    } else if (mode == MODE_PLATFORM){
         panelPlatforms.draw();
     }
     //cout << panelAddons.getShape().height << endl;
 
 
-    
-    
+
+
     if (mode == 1 ){
         addonButton.draw();
-        
+
         ofRectangle rect = secondFont.getStringBoundingBox("select core and non-core addons to add", addonButton.topLeftAnchor.x-200, 60);
         ofSetColor(220,220,220);
         ofRect(rect.x-10, rect.y-10, rect.width+20, rect.height+20);
         ofSetColor(0,0,0);
         secondFont.drawString("select core and non-core addons to add", addonButton.topLeftAnchor.x-200, 60);
     }
-    
+
+    if (mode == MODE_PLATFORM ){
+        addonButton.draw();
+
+        ofRectangle rect = secondFont.getStringBoundingBox("select core and non-core addons to add", addonButton.topLeftAnchor.x-200, 60);
+        ofSetColor(220,220,220);
+        ofRect(rect.x-10, rect.y-10, rect.width+20, rect.height+20);
+        ofSetColor(0,0,0);
+        secondFont.drawString("select platforms to add", addonButton.topLeftAnchor.x-200, 60);
+    }
+
     if (mode == 0){
         ofFill();
         ofSetColor(0 + 220 * (1-statusEnergy),0 + 220 * (1-statusEnergy),0 + 220 * (1-statusEnergy));
@@ -459,6 +478,7 @@ void testApp::generateProject(){
 	if( winvsToggle )	targetsToMake.push_back(OF_TARGET_WINVS);
 	if( linuxcbToggle )	targetsToMake.push_back(OF_TARGET_LINUX);
 	if( linux64cbToggle )	targetsToMake.push_back(OF_TARGET_LINUX64);
+	if( linuxCodeliteToggle ) targetsToMake.push_back(OF_TARGET_LINUX_CODELITE);
 
 	if( targetsToMake.size() == 0 ){
 		cout << "Error: makeNewProjectViaDialog - must specifiy a project to generate " <<endl;
@@ -546,13 +566,13 @@ void testApp::mousePressed(int x, int y, int button){
         for (int i = 0; i < buttons.size(); i++){
             buttons[i].checkMousePressed(ofPoint(x, y));
         }
-        
+
 
         //-------------------------------------
         // 4 = genearate
         //-------------------------------------
 
-        
+
         if (generateButton.bMouseOver == true){
             generateProject();
         }
@@ -582,19 +602,19 @@ void testApp::mousePressed(int x, int y, int button){
                 dir.create();
             }
 
-          	
+
         #ifdef TARGET_WIN32
                     ofFileDialogResult res = ofSystemLoadDialog("please select sketch folder", true, windowsFromUnixPath(dir.path()));
-        #else 
+        #else
                     ofFileDialogResult res = ofSystemLoadDialog("please select sketch folder", true, dir.path());
         #endif
-            
+
 
             if (res.bSuccess){
                 string result = res.filePath;
                 convertWindowsToUnixPath(result);
                 buttons[1].setText( result );
-                
+
                 setStatus("path set to: " + result);
             }
 
@@ -609,7 +629,7 @@ void testApp::mousePressed(int x, int y, int button){
 
         if (buttons[2].bMouseOver == true){
             // platform is diabled for now
-             mode = 2;
+             mode = MODE_PLATFORM;
         }
 
         //-------------------------------------
@@ -662,7 +682,25 @@ void testApp::mousePressed(int x, int y, int button){
     }
 
     if (mode == MODE_PLATFORM){
+        addonButton.checkMousePressed(ofPoint(x,y));
+        if(addonButton.bMouseOver){
+
+            string platforms;
+
+            for(int i=0;i<panelPlatforms.getNumControls();i++){
+                if (*((ofxToggle *)panelPlatforms.getControl(i))){
+                    if (platforms.length() > 0) platforms+=", ";
+                        platforms += ((ofxToggle *)panelPlatforms.getControl(i))->getName();
+                }
+            }
+
+            buttons[2].setText(platforms);
 
+            setStatus("platforms set to: " + platforms);
+
+            addonButton.bMouseOver = false;
+            mode = MODE_NORMAL;
+        }
     }
 }
 
@@ -676,11 +714,11 @@ void testApp::windowResized(int w, int h){
     generateButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - generateButton.rect.width + 10 ,
                                      ofGetHeight() - generateButton.rect.height - 40);// 535);
     generateButton.calculateRect();
-    
+
     addonButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - addonButton.rect.width + 10 ,
                                   ofGetHeight() - addonButton.rect.height - 40);// 535);
     addonButton.calculateRect();
-    
+
 }
 
 //--------------------------------------------------------------
diff --git a/src/testApp.h b/src/testApp.h
index 76172e6..3f51de5 100644
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -5,6 +5,7 @@
 #include "ofMain.h"
 #include "CBLinuxProject.h"
 #include "CBWinProject.h"
+#include "CodeliteLinuxProject.h"
 #include "visualStudioProject.h"
 #include "xcodeProject.h"
 #include <Poco/Path.h>
@@ -32,44 +33,44 @@ class testApp : public ofBaseApp{
 		void windowResized(int w, int h);
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
- 
-    
+
+
         string sketchName;
         string sketchPath;
         string addons;
         string platform;
-    
+
         ofxPanel panelCoreAddons;
         ofxPanel panelOtherAddons;
         bool bHaveNonCoreAddons;
-    
+
         ofxPanel panelPlatforms;
-    
-        ofxToggle osxToggle, iosToggle, wincbToggle, winvsToggle, linuxcbToggle, linux64cbToggle;
+
+        ofxToggle osxToggle, iosToggle, wincbToggle, winvsToggle, linuxcbToggle, linux64cbToggle, linuxCodeliteToggle;
 
         ofTrueTypeFont font;
         ofTrueTypeFont titleFont;
         ofTrueTypeFont secondFont;
-    
+
         int mode;
         enum { MODE_NORMAL, MODE_ADDON, MODE_PLATFORM };
-    
+
         baseProject * project;
-    
+
         string setupForTarget(int targ);
-    
+
         void generateProject();
-    
+
         string addonsPath;
         string status;
-    
+
         ofxXmlSettings XML;
         string appToRoot;
         string defaultLoc;
-		
-		float uiLeftX; 
-    
-    
+
+		float uiLeftX;
+
+
         textButton  button;
         textButton  generateButton;
         textButton  addonButton;
@@ -78,12 +79,12 @@ class testApp : public ofBaseApp{
         bool isAddonCore(string addon);
         bool bInited;
         vector < string  > coreAddons;
-    
-        
+
+
         float statusSetTime;
         float statusEnergy;
         void setStatus(string newStatus);
-        
+
         ofImage logo;
-    
+
 };

From 85c46b458d25797a07a156b4b24bbfef04740606 Mon Sep 17 00:00:00 2001
From: underdoeg <public@underdoeg.com>
Date: Wed, 29 May 2013 13:31:29 +0200
Subject: [PATCH 2/7] changed codelite project to use the new make RunDebug /
 RunRelease

---
 bin/data/templates/codeliteLinux/emptyExample.project | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/data/templates/codeliteLinux/emptyExample.project b/bin/data/templates/codeliteLinux/emptyExample.project
index 392c95e..14c9575 100644
--- a/bin/data/templates/codeliteLinux/emptyExample.project
+++ b/bin/data/templates/codeliteLinux/emptyExample.project
@@ -33,7 +33,7 @@
       </Compiler>
       <Linker Options="" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Debug" Command="./$(ProjectName)_debug" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/../bin" PauseExecWhenProcTerminates="yes"/>
+      <General OutputFile="" IntermediateDirectory="./Debug" Command="make RunDebug" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/.." PauseExecWhenProcTerminates="yes"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
@@ -70,7 +70,7 @@
       </Compiler>
       <Linker Options="-O2" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/../bin" PauseExecWhenProcTerminates="yes"/>
+      <General OutputFile="" IntermediateDirectory="./Release" Command="make RunRelease" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/.." PauseExecWhenProcTerminates="yes"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>

From aa418d2a58b72a4cf935853b88568deecbcea306 Mon Sep 17 00:00:00 2001
From: underdoeg <public@underdoeg.com>
Date: Sun, 23 Jun 2013 15:19:41 +0200
Subject: [PATCH 3/7] fix debug run

---
 bin/data/templates/codeliteLinux/emptyExample.project | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/data/templates/codeliteLinux/emptyExample.project b/bin/data/templates/codeliteLinux/emptyExample.project
index 14c9575..7f30695 100644
--- a/bin/data/templates/codeliteLinux/emptyExample.project
+++ b/bin/data/templates/codeliteLinux/emptyExample.project
@@ -33,7 +33,7 @@
       </Compiler>
       <Linker Options="" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Debug" Command="make RunDebug" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/.." PauseExecWhenProcTerminates="yes"/>
+      <General OutputFile="" IntermediateDirectory="./Debug" Command="./bin/$(ProjectName)_debug" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/.." PauseExecWhenProcTerminates="yes"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>

From 4f00fe621471000334d6b17ab730c23a466ee5b4 Mon Sep 17 00:00:00 2001
From: underdoeg <public@underdoeg.com>
Date: Sat, 17 Aug 2013 18:30:54 +0200
Subject: [PATCH 4/7] refactoring

---
 src/testApp.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/testApp.h b/src/testApp.h
index 7fed729..e4ef7f7 100644
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -46,7 +46,7 @@ class testApp : public ofBaseApp{
     
         ofxPanel panelPlatforms;
     
-        ofxToggle osxToggle, iosToggle, wincbToggle, winvsToggle, linuxcbToggle, linux64cbToggle;
+        ofxToggle osxToggle, iosToggle, wincbToggle, winvsToggle, linuxcbToggle, linux64cbToggle, linuxCodeliteToggle;
 
         ofTrueTypeFont font;
         ofTrueTypeFont titleFont;
@@ -68,7 +68,7 @@ class testApp : public ofBaseApp{
         string appToRoot;
         string defaultLoc;
 		
-		float uiLeftX; 
+	float uiLeftX; 
     
     
         textButton  button;
@@ -86,6 +86,7 @@ class testApp : public ofBaseApp{
         void setStatus(string newStatus);
         
         ofImage logo;
-		void addAddon(string addon);
-    
+	void addAddon(string addon);
+        
+
 };

From 4100d6fa2c01721d4ee9397c7563be678d1eaeb6 Mon Sep 17 00:00:00 2001
From: underdoeg <public@underdoeg.com>
Date: Sat, 26 Apr 2014 12:09:36 +0200
Subject: [PATCH 5/7] updated codelite project

---
 projectGenerator_linux64.cbp          |  6 ++
 src/projects/CodeliteLinuxProject.cpp |  2 +-
 src/projects/CodeliteLinuxProject.h   |  2 +-
 src/testApp.cpp                       | 82 +++++++++++++--------------
 4 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/projectGenerator_linux64.cbp b/projectGenerator_linux64.cbp
index 8f7c973..77a3e57 100644
--- a/projectGenerator_linux64.cbp
+++ b/projectGenerator_linux64.cbp
@@ -96,6 +96,12 @@
 		<Unit filename="src/projects/CBWinProject.h">
 			<Option virtualFolder="src/projects/" />
 		</Unit>
+		<Unit filename="src/projects/CodeliteLinuxProject.cpp">
+			<Option virtualFolder="src/projects/" />
+		</Unit>
+		<Unit filename="src/projects/CodeliteLinuxProject.h">
+			<Option virtualFolder="src/projects/" />
+		</Unit>
 		<Unit filename="src/projects/baseProject.cpp">
 			<Option virtualFolder="src/projects/" />
 		</Unit>
diff --git a/src/projects/CodeliteLinuxProject.cpp b/src/projects/CodeliteLinuxProject.cpp
index 49ee3c3..02d1e78 100644
--- a/src/projects/CodeliteLinuxProject.cpp
+++ b/src/projects/CodeliteLinuxProject.cpp
@@ -112,7 +112,7 @@ bool CodeliteLinuxProject::saveProjectFile(){
     return doc.save_file((projectDir + codeliteDirName + projectName + ".project").c_str());
 }
 
-void CodeliteLinuxProject::addSrc(string srcFile, string folder){
+void CodeliteLinuxProject::addSrc(string srcFile, string folder, SrcType type){
     std::vector<string> path = ofSplitString(folder, "/");
     pugi::xml_node node = doc.child("CodeLite_Project");
     for(unsigned int i=0;i<path.size();i++){
diff --git a/src/projects/CodeliteLinuxProject.h b/src/projects/CodeliteLinuxProject.h
index 51b738e..7ad5a1f 100644
--- a/src/projects/CodeliteLinuxProject.h
+++ b/src/projects/CodeliteLinuxProject.h
@@ -14,7 +14,7 @@ class CodeliteLinuxProject : virtual public baseProject
         bool createProjectFile();
         bool loadProjectFile();
         bool saveProjectFile();
-        void addSrc(string srcFile, string folder);
+        void addSrc(string srcFile, string folder, SrcType type=DEFAULT);
         void addInclude(string path);
         void addLibrary(string libraryName, LibType libType = RELEASE_LIB);
     protected:
diff --git a/src/testApp.cpp b/src/testApp.cpp
index 8bfa5ad..222531a 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -128,14 +128,14 @@ void testApp::setup(){
     ofSetLogLevel(OF_LOG_VERBOSE);
     ofSetVerticalSync(true);
 
-    
+
     statusEnergy = 0;
-    
+
     mode = 0;
     bInited = false;
     project = NULL;
     sketchName = "mySketch";
-	
+
 
     //-------------------------------------
     // get settings
@@ -181,7 +181,7 @@ void testApp::setup(){
     font.loadFont("fonts/Inconsolata.otf", 14, true,false,false,0.3,90);
     titleFont.loadFont("fonts/Inconsolata.otf", 28, true,false,false,0.3,90);
     secondFont.loadFont("fonts/Inconsolata.otf", 11, true,false,false,0.3,90);
-    
+
     //  Sketch button
     //
     button.font = &font;
@@ -189,7 +189,7 @@ void testApp::setup(){
     button.prefix = "Name: ";
 	button.topLeftAnchor.set(76, 160+40); //set top button position - others are set relative to this.
     button.setText(sketchName);
-    
+
     button.secondaryText = "<< CLICK TO CHANGE THE NAME";
     buttons.push_back(button);
 
@@ -242,13 +242,13 @@ void testApp::setup(){
     generateButton.bSelectable = true;
     generateButton.setText("");
     generateButton.bDrawLong = false;
-    
+
     addonButton = button;
     addonButton.topLeftAnchor.set(906, 535);
     addonButton.prefix = "<< BACK";
     addonButton.setText("");
     addonButton.bDrawLong = false;
-    
+
 
     for (int i = 0; i < buttons.size(); i++){
         buttons[i].calculateRect();
@@ -298,7 +298,7 @@ void testApp::setup(){
 //for ios, we need to fake that the target is ios (since we're compiling w/ osx OF)
 
 //#define MAKE_IOS
-    
+
 #ifdef MAKE_IOS
 	panelPlatforms.add(osxToggle.setup("osx (xcode)",false));
 	panelPlatforms.add(iosToggle.setup("ios (xcode)",true));
@@ -306,8 +306,8 @@ void testApp::setup(){
     panelPlatforms.add(osxToggle.setup("osx (xcode)",ofGetTargetPlatform()==OF_TARGET_OSX));
 	panelPlatforms.add(iosToggle.setup("ios (xcode)",ofGetTargetPlatform()==OF_TARGET_IPHONE));
 #endif
-    
-    
+
+
     // update the platforms text in the platform button
     string platforms = "";
     for (int i = 0; i < panelPlatforms.getNumControls(); i++){
@@ -323,17 +323,17 @@ void testApp::setup(){
     panelPlatforms.setPosition(10,40);
     panelCoreAddons.setPosition(10,40);
     panelOtherAddons.setPosition(330,40);
-   
+
 
     logo.loadImage("images/ofw-logo.png");
 
     ofBackground(230,230,230);
-    
-    
+
+
     generateButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - generateButton.rect.width + 10 ,
                                      ofGetHeight() - generateButton.rect.height - 40);// 535);
     generateButton.calculateRect();
-    
+
     addonButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - addonButton.rect.width + 10 ,
                                   ofGetHeight() - addonButton.rect.height - 40);// 535);
     addonButton.calculateRect();
@@ -369,7 +369,7 @@ void testApp::update(){
     }
 
     generateButton.checkMousePressed(ofPoint(mouseX, mouseY));
-    
+
     for (int i = 0; i < buttons.size(); i++){
         if (i != 0){
 			buttons[i].topLeftAnchor.y = buttons[i-1].topLeftAnchor.y +buttons[i-1].rect.height + 20;
@@ -398,25 +398,25 @@ void testApp::update(){
 //--------------------------------------------------------------
 void testApp::draw(){
 
-    
-    
+
+
     if (mode != MODE_ADDON ) {
-        
+
         ofSetColor(100);
         logo.draw(64, 61,logo.getWidth(),logo.getHeight());
-        
+
         //ofSetColor(74,255,203);
         titleFont.drawString("PROJECT", 64 + logo.getWidth() + 25, 85);
         titleFont.drawString("GENERATOR",  64 + logo.getWidth() + 25, 117);
     }
-    
+
 	if (mode == 0){
 		for (int i = 0; i < buttons.size(); i++){
 			buttons[i].draw();
 		}
-        
+
         generateButton.draw();
-        
+
     } else if (mode == 1){
         panelCoreAddons.draw();
         if (bHaveNonCoreAddons){
@@ -428,11 +428,11 @@ void testApp::draw(){
     //cout << panelAddons.getShape().height << endl;
 
 
-    
-    
+
+
     if (mode == 1 ){
         addonButton.draw();
-        
+
         ofRectangle rect = secondFont.getStringBoundingBox("select core and non-core addons to add", addonButton.topLeftAnchor.x-200, 60);
         ofSetColor(220,220,220);
         ofRect(rect.x-10, rect.y-10, rect.width+20, rect.height+20);
@@ -568,13 +568,13 @@ void testApp::mousePressed(int x, int y, int button){
         for (int i = 0; i < buttons.size(); i++){
             buttons[i].checkMousePressed(ofPoint(x, y));
         }
-        
+
 
         //-------------------------------------
         // 4 = genearate
         //-------------------------------------
 
-        
+
         if (generateButton.bMouseOver == true){
             generateProject();
         }
@@ -604,19 +604,19 @@ void testApp::mousePressed(int x, int y, int button){
                 dir.create();
             }
 
-          	
+
         #ifdef TARGET_WIN32
                     ofFileDialogResult res = ofSystemLoadDialog("please select sketch folder", true, windowsFromUnixPath(dir.path()));
-        #else 
+        #else
                     ofFileDialogResult res = ofSystemLoadDialog("please select sketch folder", true, dir.path());
         #endif
-            
+
 
             if (res.bSuccess){
                 string result = res.filePath;
                 convertWindowsToUnixPath(result);
                 buttons[1].setText( result );
-                
+
                 setStatus("path set to: " + result);
             }
 
@@ -716,11 +716,11 @@ void testApp::windowResized(int w, int h){
     generateButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - generateButton.rect.width + 10 ,
                                      ofGetHeight() - generateButton.rect.height - 40);// 535);
     generateButton.calculateRect();
-    
+
     addonButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - addonButton.rect.width + 10 ,
                                   ofGetHeight() - addonButton.rect.height - 40);// 535);
     addonButton.calculateRect();
-    
+
 }
 
 //--------------------------------------------------------------
@@ -728,35 +728,35 @@ void testApp::gotMessage(ofMessage msg){
 
 }
 void testApp::addAddon(string addon) {
-	
+
 	string addons = "";
-	
+
 	for (int i = 0; i < panelCoreAddons.getNumControls(); i++){
-		
+
 		ofxToggle *toggle = ((ofxToggle *)panelCoreAddons.getControl(i));
 		if(toggle->getName()==addon) {
 			(*toggle) = true;
 		}
-		
+
 		if (*toggle){
 			if (addons.length() > 0) addons+=", ";
 			addons += toggle->getName();
 
 		}
-		
+
 	}
 	for (int i = 0; i < panelOtherAddons.getNumControls(); i++){
 		ofxToggle *toggle = ((ofxToggle *)panelOtherAddons.getControl(i));
-		
+
 		if(toggle->getName()==addon) {
 			(*toggle) = true;
 		}
-		
+
 		if (*toggle){
 			if (addons.length() > 0) addons+=", ";
 			addons += toggle->getName();
 		}
-		
+
 	}
 	buttons[3].setText(addons);
 }

From 1500dcbda5b1b3c5211491d2e0785909e686ea4e Mon Sep 17 00:00:00 2001
From: Philip Whitfield <philip@undef.ch>
Date: Sun, 18 May 2014 19:54:45 +0200
Subject: [PATCH 6/7] update testApp to ofApp

---
 bin/data/templates/codeliteLinux/emptyExample.project         | 4 ++--
 .../templates/codeliteLinux/src/{testApp.cpp => ofApp.cpp}    | 0
 bin/data/templates/codeliteLinux/src/{testApp.h => ofApp.h}   | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename bin/data/templates/codeliteLinux/src/{testApp.cpp => ofApp.cpp} (100%)
 rename bin/data/templates/codeliteLinux/src/{testApp.h => ofApp.h} (100%)

diff --git a/bin/data/templates/codeliteLinux/emptyExample.project b/bin/data/templates/codeliteLinux/emptyExample.project
index 7f30695..60eace2 100644
--- a/bin/data/templates/codeliteLinux/emptyExample.project
+++ b/bin/data/templates/codeliteLinux/emptyExample.project
@@ -8,8 +8,8 @@
   <Description/>
   <Dependencies/>
   <VirtualDirectory Name="src">
-    <File Name="../src/testApp.cpp"/>
-    <File Name="../src/testApp.h"/>
+    <File Name="../src/ofApp.cpp"/>
+    <File Name="../src/ofApp.h"/>
     <File Name="../src/main.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="config">
diff --git a/bin/data/templates/codeliteLinux/src/testApp.cpp b/bin/data/templates/codeliteLinux/src/ofApp.cpp
similarity index 100%
rename from bin/data/templates/codeliteLinux/src/testApp.cpp
rename to bin/data/templates/codeliteLinux/src/ofApp.cpp
diff --git a/bin/data/templates/codeliteLinux/src/testApp.h b/bin/data/templates/codeliteLinux/src/ofApp.h
similarity index 100%
rename from bin/data/templates/codeliteLinux/src/testApp.h
rename to bin/data/templates/codeliteLinux/src/ofApp.h

From b6f87ddb5361d89dca0d5328508b67a14a300de3 Mon Sep 17 00:00:00 2001
From: Philip Whitfield <philip@undef.ch>
Date: Thu, 5 Jun 2014 17:29:36 +0200
Subject: [PATCH 7/7] ofApp fixes

---
 bin/data/templates/codeliteLinux/src/main.cpp |  4 +--
 .../templates/codeliteLinux/src/ofApp.cpp     | 26 +++++++++----------
 bin/data/templates/codeliteLinux/src/ofApp.h  |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bin/data/templates/codeliteLinux/src/main.cpp b/bin/data/templates/codeliteLinux/src/main.cpp
index 6a32c6a..6c04362 100644
--- a/bin/data/templates/codeliteLinux/src/main.cpp
+++ b/bin/data/templates/codeliteLinux/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofAppGlutWindow.h"
 
 //========================================================================
@@ -11,6 +11,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/bin/data/templates/codeliteLinux/src/ofApp.cpp b/bin/data/templates/codeliteLinux/src/ofApp.cpp
index 6335e6f..6f1b1bc 100644
--- a/bin/data/templates/codeliteLinux/src/ofApp.cpp
+++ b/bin/data/templates/codeliteLinux/src/ofApp.cpp
@@ -1,59 +1,59 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/bin/data/templates/codeliteLinux/src/ofApp.h b/bin/data/templates/codeliteLinux/src/ofApp.h
index 0cb5a8c..de15f19 100644
--- a/bin/data/templates/codeliteLinux/src/ofApp.h
+++ b/bin/data/templates/codeliteLinux/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();