Skip to content

small fix to hide required ofxiOS addons #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ofTheo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

small fix to hide required ofxiOS addons #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/testApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#include <stdio.h>
#include "ofConstants.h"

//for ios, we need to fake that the target is ios (since we're compiling w/ osx OF)
//#define MAKE_IOS


void convertWindowsToUnixPath(string & path){
for (int i = 0; i < path.size(); i++){
if (path[i] == '\\') path[i] = '/';
Expand Down Expand Up @@ -255,6 +259,16 @@ void testApp::setup(){
panelOtherAddons.setup();

ofDirectory addons(addonsPath);

vector <string> ignoreAddons;

#ifdef MAKE_IOS
ignoreAddons.push_back("ofxiOS");
ignoreAddons.push_back("ofxMultiTouch");
ignoreAddons.push_back("ofxAccelerometer");
ignoreAddons.push_back("ofxKinect");
ignoreAddons.push_back("ofxVectorGraphics");
#endif

addons.listDir();
for(int i=0;i<(int)addons.size();i++){
Expand All @@ -265,7 +279,7 @@ void testApp::setup(){
if (isAddonCore(addon)){
ofxToggle * toggle = new ofxToggle();
panelCoreAddons.add(toggle->setup(addon,false,300));
} else {
} else if( find(ignoreAddons.begin(), ignoreAddons.end(), addon) == ignoreAddons.end() ){
bHaveNonCoreAddons = true;
ofxToggle * toggle = new ofxToggle();
panelOtherAddons.add(toggle->setup(addon,false,300));
Expand All @@ -283,10 +297,6 @@ void testApp::setup(){
panelPlatforms.add(winvsToggle.setup("windows (visual studio)", ofGetTargetPlatform()==OF_TARGET_WINVS));
panelPlatforms.add(linuxcbToggle.setup("linux (codeblocks)",ofGetTargetPlatform()==OF_TARGET_LINUX));
panelPlatforms.add(linux64cbToggle.setup("linux64 (codeblocks)",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));
Expand Down