diff --git a/Makefile b/Makefile index 2d83a77..7a7fe8b 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,13 @@ -include config.make -include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/Makefile.examples +# Attempt to load a config.make file. +# If none is found, project defaults in config.project.make will be used. +ifneq ($(wildcard config.make),) + include config.make +endif + +# make sure the the OF_ROOT location is defined +ifndef OF_ROOT + OF_ROOT=../../.. +endif + +# call the project makefile! +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/Project.xcconfig b/Project.xcconfig index c10b9e5..c90f7b1 100644 --- a/Project.xcconfig +++ b/Project.xcconfig @@ -5,5 +5,13 @@ OF_PATH = ../../.. //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" +//ICONS - NEW IN 0072 +ICON_NAME_DEBUG = icon-debug.icns +ICON_NAME_RELEASE = icon.icns +ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/ + +//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to: +//ICON_FILE_PATH = bin/data/ + OTHER_LDFLAGS = $(OF_CORE_LIBS) HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) diff --git a/config.make b/config.make index aef9cf9..836fce7 100644 --- a/config.make +++ b/config.make @@ -1,56 +1,141 @@ -# 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 = $(addprefix -I, $(shell find src -type d)) - - -# 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 - - - +################################################################################ +# CONFIGURE PROJECT MAKEFILE (optional) +# This file is where we make project specific configurations. +################################################################################ + +################################################################################ +# OF ROOT +# The location of your root openFrameworks installation +# (default) OF_ROOT = ../../.. +################################################################################ +# OF_ROOT = ../../.. + +################################################################################ +# PROJECT ROOT +# The location of the project - a starting place for searching for files +# (default) PROJECT_ROOT = . (this directory) +# +################################################################################ +# PROJECT_ROOT = . + +################################################################################ +# PROJECT SPECIFIC CHECKS +# This is a project defined section to create internal makefile flags to +# conditionally enable or disable the addition of various features within +# this makefile. For instance, if you want to make changes based on whether +# GTK is installed, one might test that here and create a variable to check. +################################################################################ +# None + +################################################################################ +# PROJECT EXTERNAL SOURCE PATHS +# These are fully qualified paths that are not within the PROJECT_ROOT folder. +# Like source folders in the PROJECT_ROOT, these paths are subject to +# exlclusion via the PROJECT_EXLCUSIONS list. +# +# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXTERNAL_SOURCE_PATHS = + +################################################################################ +# PROJECT EXCLUSIONS +# These makefiles assume that all folders in your current project directory +# and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations +# to look for source code. The any folders or files that match any of the +# items in the PROJECT_EXCLUSIONS list below will be ignored. +# +# Each item in the PROJECT_EXCLUSIONS list will be treated as a complete +# string unless teh user adds a wildcard (%) operator to match subdirectories. +# GNU make only allows one wildcard for matching. The second wildcard (%) is +# treated literally. +# +# (default) PROJECT_EXCLUSIONS = (blank) +# +# Will automatically exclude the following: +# +# $(PROJECT_ROOT)/bin% +# $(PROJECT_ROOT)/obj% +# $(PROJECT_ROOT)/%.xcodeproj +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXCLUSIONS = + +################################################################################ +# PROJECT LINKER FLAGS +# These flags will be sent to the linker when compiling the executable. +# +# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs +# +# Note: Leave a leading space when adding list items with the += operator +# +# Currently, shared libraries that are needed are copied to the +# $(PROJECT_ROOT)/bin/libs directory. The following LDFLAGS tell the linker to +# add a runtime path to search for those shared libraries, since they aren't +# incorporated directly into the final executable application binary. +################################################################################ +# PROJECT_LDFLAGS=-Wl,-rpath=./libs + +################################################################################ +# PROJECT DEFINES +# Create a space-delimited list of DEFINES. The list will be converted into +# CFLAGS with the "-D" flag later in the makefile. +# +# (default) PROJECT_DEFINES = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_DEFINES = + +################################################################################ +# PROJECT CFLAGS +# This is a list of fully qualified CFLAGS required when compiling for this +# project. These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS +# defined in your platform specific core configuration files. These flags are +# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below. +# +# (default) PROJECT_CFLAGS = (blank) +# +# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in +# your platform specific configuration file will be applied by default and +# further flags here may not be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CFLAGS = + +################################################################################ +# PROJECT OPTIMIZATION CFLAGS +# These are lists of CFLAGS that are target-specific. While any flags could +# be conditionally added, they are usually limited to optimization flags. +# These flags are added BEFORE the PROJECT_CFLAGS. +# +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank) +# +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank) +# +# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the +# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration +# file will be applied by default and further optimization flags here may not +# be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE = +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG = + +################################################################################ +# PROJECT COMPILERS +# Custom compilers can be set for CC and CXX +# (default) PROJECT_CXX = (blank) +# (default) PROJECT_CC = (blank) +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CXX = +# PROJECT_CC = diff --git a/openFrameworks-Info.plist b/openFrameworks-Info.plist index e5db555..8d64d2b 100644 --- a/openFrameworks-Info.plist +++ b/openFrameworks-Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.yourcompany.openFrameworks + cc.openFrameworks.ofapp CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -16,5 +16,7 @@ ???? CFBundleVersion 1.0 + CFBundleIconFile + ${ICON} diff --git a/projectGenerator.cbp b/projectGenerator.cbp index 9ba734b..2e83263 100644 --- a/projectGenerator.cbp +++ b/projectGenerator.cbp @@ -1,4 +1,4 @@ - + @@ -9,10 +9,10 @@ diff --git a/projectGenerator.sln b/projectGenerator.sln index bad886e..995acf0 100644 --- a/projectGenerator.sln +++ b/projectGenerator.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projectGenerator", "projectGenerator.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" EndProject diff --git a/projectGenerator.vcxproj b/projectGenerator.vcxproj index af0cb25..590dd31 100644 --- a/projectGenerator.vcxproj +++ b/projectGenerator.vcxproj @@ -1,151 +1,169 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7FD42DF7-442E-479A-BA76-D0022F99702A} - Win32Proj - projectGenerator - - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - - - - - - - - - - - - bin\ - obj\$(Configuration)\ - $(ProjectName)_debug - true - true - - - bin\ - obj\$(Configuration)\ - false - - - - Disabled - true - EnableFastChecks - %(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level3 - EditAndContinue - %(AdditionalIncludeDirectories);src;src\addons;src\projects;src\pugixmlLib;src\pugixmlLib\contrib;src\pugixmlLib\lib;src\pugixmlLib\scripts;src\pugixmlLib\scripts\pugixml.xcodeproj;src\pugixmlLib\src;src\utils;..\..\..\addons\ofxGui\libs;..\..\..\addons\ofxGui\src;..\..\..\addons\ofxXmlSettings\libs\tinyxml\src;..\..\..\addons\ofxXmlSettings\src - CompileAsCpp - - - true - Console - false - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - false - %(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - %(AdditionalIncludeDirectories);src;src\addons;src\projects;src\pugixmlLib;src\pugixmlLib\contrib;src\pugixmlLib\lib;src\pugixmlLib\scripts;src\pugixmlLib\scripts\pugixml.xcodeproj;src\pugixmlLib\src;src\utils;..\..\..\addons\ofxGui\libs;..\..\..\addons\ofxGui\src;..\..\..\addons\ofxXmlSettings\libs\tinyxml\src;..\..\..\addons\ofxXmlSettings\src - CompileAsCpp - - - false - false - Console - true - true - false - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {5837595d-aca9-485c-8e76-729040ce4b0b} - - - - - /D_DEBUG %(AdditionalOptions) - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {7FD42DF7-442E-479A-BA76-D0022F99702A} + Win32Proj + projectGenerator + + + + Application + Unicode + v110 + + + Application + Unicode + true + v110 + + + + + + + + + + + + + bin\ + obj\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Configuration)\ + false + + + + Disabled + true + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + EditAndContinue + %(AdditionalIncludeDirectories);..\..\..\addons\ofxGui\libs;..\..\..\addons\ofxGui\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;src;src\addons;src\projects;src\pugixmlLib;src\pugixmlLib\contrib;src\pugixmlLib\lib;src\pugixmlLib\scripts;src\pugixmlLib\scripts\pugixml.xcodeproj;src\pugixmlLib\src;src\utils + CompileAsCpp + + + true + Console + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + %(AdditionalIncludeDirectories);..\..\..\addons\ofxGui\libs;..\..\..\addons\ofxGui\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;src;src\addons;src\projects;src\pugixmlLib;src\pugixmlLib\contrib;src\pugixmlLib\lib;src\pugixmlLib\scripts;src\pugixmlLib\scripts\pugixml.xcodeproj;src\pugixmlLib\src;src\utils + CompileAsCpp + + + false + false + Console + true + true + false + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {5837595d-aca9-485c-8e76-729040ce4b0b} + + + + + /D_DEBUG %(AdditionalOptions) + + + + diff --git a/projectGenerator.vcxproj.filters b/projectGenerator.vcxproj.filters index f3adbe6..4c112f3 100644 --- a/projectGenerator.vcxproj.filters +++ b/projectGenerator.vcxproj.filters @@ -1,180 +1,246 @@ - - - - - {48f095f5-6680-4fb7-ba62-6e5d4a59b3d3} - - - {a438fe03-3664-49e1-8a3d-c0f49b8e256d} - - - {966756a9-90b3-462d-9f43-e66ce13ac9c7} - - - {d9b15813-4d8e-4feb-af69-2dcb671c5546} - - - {c76d9651-8ebc-49ba-bec0-c8a9abda3102} - - - {a12b2e3d-9ce0-4bc4-ac1b-c93770f10cee} - - - {dbbee140-b712-40e2-9599-16b6b532f8e4} - - - {07a44bca-7ae5-4f1b-b2af-16f8e734cc04} - - - {19df3bd2-e50a-49cb-b98b-afe55e360e64} - - - {0f9e2643-d98b-44b1-9345-17976da56985} - - - {217849b9-1bf5-4f68-9732-2edc1db560ac} - - - {904a39a2-a8d4-47d3-9701-383c10559b94} - - - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - src - - - src\addons - - - src\pugixmlLib\src - - - src\pugixmlLib\src - - - src\projects - - - src\projects - - - src\projects - - - src\projects - - - src\utils - - - addons\ofxXmlSettings\src - - - src\projects - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - src - - - addons\ofxXmlSettings\libs - - - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - src - - - src - - - src\addons - - - src\pugixmlLib\src - - - src\projects - - - src\projects - - - src\projects - - - src\projects - - - src\utils - - - addons\ofxXmlSettings\src - - - src\projects - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxXmlSettings\libs - - - addons\ofxXmlSettings\libs - - - addons\ofxXmlSettings\libs - - - - - - + + + + + src + + + src + + + src\addons + + + src\projects + + + src\projects + + + src\projects + + + src\projects + + + src\projects + + + src\pugixmlLib + + + src\pugixmlLib + + + src\pugixmlLib\lib + + + src\pugixmlLib + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts\pugixml.xcodeproj + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\scripts + + + src\pugixmlLib\src + + + src + + + src\utils + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxXmlSettings\src + + + addons\ofxXmlSettings\libs + + + addons\ofxXmlSettings\libs + + + addons\ofxXmlSettings\libs + + + + + {d8376475-7454-4a24-b08a-aac121d3ad6f} + + + {B6C0D928-343F-57FD-EEFB-0BB4} + + + {FB1E18F7-62A2-A244-E17A-5914} + + + {E0AAE880-D93F-752C-66C5-7C67} + + + {EFC234D6-70A8-ADD4-184E-1800} + + + {FC6CE0EB-B2D0-6B90-03A8-B40F} + + + {6EBB2E0D-C16B-6509-9706-5790} + + + {321E56DA-F360-7DB4-3836-7038} + + + {720C0C49-8380-7AC4-1CEE-925E} + + + {FF53B027-68B2-4010-4AB2-068A} + + + {71834F65-F3A9-211E-73B8-DC85} + + + {4F2A59AF-5F4E-704B-D067-EC13} + + + {645E9533-4DCD-6179-1CDF-CB65} + + + {877F005D-13E6-0592-1D97-F2E3} + + + {CCB2AC63-49D2-977C-CFE8-AEAD} + + + {687714A8-1662-FA1C-261F-50F0} + + + + + src + + + src\addons + + + src\projects + + + src\projects + + + src\projects + + + src\projects + + + src\projects + + + src\pugixmlLib\contrib + + + src\pugixmlLib\src + + + src\pugixmlLib\src + + + src + + + src + + + src\utils + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxGui\src + + + addons\ofxXmlSettings\src + + + addons\ofxXmlSettings\libs + + + + + + diff --git a/projectGenerator.vcxproj.user b/projectGenerator.vcxproj.user index bedf919..7bf3df8 100644 --- a/projectGenerator.vcxproj.user +++ b/projectGenerator.vcxproj.user @@ -1,11 +1,11 @@ - - - - $(ProjectDir)/bin - WindowsLocalDebugger - - - $(ProjectDir)/bin - WindowsLocalDebugger - + + + + $(ProjectDir)/bin + WindowsLocalDebugger + + + $(ProjectDir)/bin + WindowsLocalDebugger + \ No newline at end of file diff --git a/projectGenerator.workspace b/projectGenerator.workspace index 7882d26..7ec556f 100644 --- a/projectGenerator.workspace +++ b/projectGenerator.workspace @@ -1,7 +1,9 @@ - - + + + + diff --git a/projectGenerator.xcodeproj/project.pbxproj b/projectGenerator.xcodeproj/project.pbxproj index f423075..c1bf189 100644 --- a/projectGenerator.xcodeproj/project.pbxproj +++ b/projectGenerator.xcodeproj/project.pbxproj @@ -3,47 +3,64 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 1120712114AE3D360035CB7E /* libpugixml_d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1120712014AE3D360035CB7E /* libpugixml_d.a */; }; - 1120713014AE3D4F0035CB7E /* xcodeProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1120712B14AE3D4F0035CB7E /* xcodeProject.cpp */; }; - 1120713614AE3D840035CB7E /* ofAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1120713414AE3D840035CB7E /* ofAddon.cpp */; }; - 113CAA5C14F88EDD00D3906E /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113CAA5914F88EDD00D3906E /* Utils.cpp */; }; - 113CAA7314F88F4200D3906E /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113CAA6C14F88F4200D3906E /* tinyxml.cpp */; }; - 113CAA7414F88F4200D3906E /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113CAA6E14F88F4200D3906E /* tinyxmlerror.cpp */; }; - 113CAA7514F88F4200D3906E /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113CAA6F14F88F4200D3906E /* tinyxmlparser.cpp */; }; - 113CAA7614F88F4200D3906E /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113CAA7114F88F4200D3906E /* ofxXmlSettings.cpp */; }; - 116601FE1513758200DE9D73 /* CBWinProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 116601FA1513758200DE9D73 /* CBWinProject.cpp */; }; - 116601FF1513758200DE9D73 /* visualStudioProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 116601FC1513758200DE9D73 /* visualStudioProject.cpp */; }; - 116EA815150E68B2004EBBD3 /* baseProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 116EA814150E68B2004EBBD3 /* baseProject.cpp */; }; - 116EA81D150E7288004EBBD3 /* CBLinuxProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 116EA81B150E7287004EBBD3 /* CBLinuxProject.cpp */; }; - 27C4A1BA179491920031C6E4 /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1A9179491920031C6E4 /* ofxBaseGui.cpp */; }; - 27C4A1BB179491920031C6E4 /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1AB179491920031C6E4 /* ofxButton.cpp */; }; - 27C4A1BC179491920031C6E4 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1AE179491920031C6E4 /* ofxGuiGroup.cpp */; }; - 27C4A1BD179491920031C6E4 /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B0179491920031C6E4 /* ofxLabel.cpp */; }; - 27C4A1BE179491920031C6E4 /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B2179491920031C6E4 /* ofxPanel.cpp */; }; - 27C4A1BF179491920031C6E4 /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B4179491920031C6E4 /* ofxSlider.cpp */; }; - 27C4A1C0179491920031C6E4 /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B6179491920031C6E4 /* ofxSliderGroup.cpp */; }; - 27C4A1C1179491920031C6E4 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B8179491920031C6E4 /* ofxToggle.cpp */; }; + 1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; }; + 37C59FA14CABFEBA11F5E8A2 /* premake4.lua in Sources */ = {isa = PBXBuildFile; fileRef = 68AF841D88C6C78435DD9597 /* premake4.lua */; }; + 3884BDB3CAB3DAAC3806BD28 /* pugixml_vs2005.vcproj in Sources */ = {isa = PBXBuildFile; fileRef = E6DF9C0EF78B8C059FC1C3D4 /* pugixml_vs2005.vcproj */; }; + 39F976C0D8E6D21BE4DF89E6 /* CMakeLists.txt in Sources */ = {isa = PBXBuildFile; fileRef = 674E3C0C5D0B2AC94A0E0DC0 /* CMakeLists.txt */; }; + 402A5F224EA78D9C9A80C597 /* Jamrules.jam in Sources */ = {isa = PBXBuildFile; fileRef = 1EC2BFF88B1464B1915228E5 /* Jamrules.jam */; }; + 452E0F1E8B3AF31CCAB44DA8 /* pugixml_codelite.project in Sources */ = {isa = PBXBuildFile; fileRef = 3E297799CC6A48ECBAE93F31 /* pugixml_codelite.project */; }; + 483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78D67A00EB899FAC09430597 /* ofxLabel.cpp */; }; + 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; }; + 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; + 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; }; + 66D7078869A78A4E13E1A4B3 /* pugixml_vs2008.vcproj in Sources */ = {isa = PBXBuildFile; fileRef = 24EE7F902E65F9EB0F019F72 /* pugixml_vs2008.vcproj */; }; + 6EBA35198FCCDB191F12A5E8 /* visualStudioProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02199743B391EB67AEB9D277 /* visualStudioProject.cpp */; }; + 6EEC67D90485FADB839CE477 /* xcodeProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4296952767AAEDB0152CB77B /* xcodeProject.cpp */; }; + 78D8B3FDB7837BBF44D7B5C6 /* project.pbxproj in Sources */ = {isa = PBXBuildFile; fileRef = A41D10D3D687D63F69350C7D /* project.pbxproj */; }; + 8031774F343E2825214C5D79 /* pugixml_codeblocks.cbp in Sources */ = {isa = PBXBuildFile; fileRef = 2F0F0C701DAF9653B34259DC /* pugixml_codeblocks.cbp */; }; + 8331F2B8EC74447BC690587C /* pugixml_vs2005_static.vcproj in Sources */ = {isa = PBXBuildFile; fileRef = A144B38608BB2F23A63BC3F7 /* pugixml_vs2005_static.vcproj */; }; + 837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */; }; + 856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9604B925D32EE39065747725 /* ofxBaseGui.cpp */; }; + 8EE01AD2CD4297019068E250 /* pugixml_vs2010.vcxproj in Sources */ = {isa = PBXBuildFile; fileRef = 6208ED229FEA1847016717BF /* pugixml_vs2010.vcxproj */; }; + 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */; }; + 98BC3024543A9587B77C5762 /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEBD7CF0821162782FE25373 /* pugixml.cpp */; }; + 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; }; + B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; }; + B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */; }; BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; + BF7F6AEB1F7496B1A34F4780 /* pugixml_vs2008_static.vcproj in Sources */ = {isa = PBXBuildFile; fileRef = CFC0CB103D27E3692BA6A8EF /* pugixml_vs2008_static.vcproj */; }; + C1C1C910A67FA8FB026F16D9 /* libpugixml_d.a in Sources */ = {isa = PBXBuildFile; fileRef = BABF433ED98C7BC4FF26F57E /* libpugixml_d.a */; }; + C275C68AF74CEE4641683025 /* CBLinuxProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BFB736360496B05EDEECD6C /* CBLinuxProject.cpp */; }; + CBCA6DEB32691ACEB77E1A27 /* Jamfile.jam in Sources */ = {isa = PBXBuildFile; fileRef = D182E9432912D3C162B6664A /* Jamfile.jam */; }; + DB49B46C16026402905485B4 /* baseProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEC25CE50D80333F281580C4 /* baseProject.cpp */; }; + DBB5A2C2DCFA03BE3AE14A87 /* CBWinProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4AF60B1756A0D43EA2D64FD /* CBWinProject.cpp */; }; + E2D282BC734A6FC9D7316A10 /* pugixml_vs2010_static.vcxproj in Sources */ = {isa = PBXBuildFile; fileRef = 43117DCA76F667F7FFF0474E /* pugixml_vs2010_static.vcxproj */; }; + E303F3BE53565EA1BAE841B5 /* readme.txt in Sources */ = {isa = PBXBuildFile; fileRef = 243811BF36C57AAECA219C52 /* readme.txt */; }; E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; }; E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; }; E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; }; E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */; }; - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9740E8CC7DD009D7055 /* Carbon.framework */; }; E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */; }; E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */; }; E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9770E8CC7DD009D7055 /* CoreServices.framework */; }; E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; }; E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; }; E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; }; + E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */; }; E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; }; E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; }; E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; }; E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; + E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */; }; + E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E715D3B6510020DFD4 /* QTKit.framework */; }; + E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F985F515E0DE99003869B5 /* Accelerate.framework */; }; + E9674458973BE58E3C788C77 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF38643DB210DF92F4360017 /* Utils.cpp */; }; + F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */; }; + FB1294F164F5B38F76FE12B9 /* ofAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 98AB6BBF3E94A2F9ACDBFAB4 /* ofAddon.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -77,54 +94,61 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1120712014AE3D360035CB7E /* libpugixml_d.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml_d.a; path = lib/libpugixml_d.a; sourceTree = ""; }; - 1120712214AE3D410035CB7E /* foreach.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = foreach.hpp; path = src/pugixmlLib/contrib/foreach.hpp; sourceTree = SOURCE_ROOT; }; - 1120712414AE3D4F0035CB7E /* baseProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = baseProject.h; sourceTree = ""; }; - 1120712B14AE3D4F0035CB7E /* xcodeProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xcodeProject.cpp; sourceTree = ""; }; - 1120712C14AE3D4F0035CB7E /* xcodeProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xcodeProject.h; sourceTree = ""; }; - 1120713414AE3D840035CB7E /* ofAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofAddon.cpp; sourceTree = ""; }; - 1120713514AE3D840035CB7E /* ofAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofAddon.h; sourceTree = ""; }; - 113CAA5914F88EDD00D3906E /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utils.cpp; sourceTree = ""; }; - 113CAA5A14F88EDD00D3906E /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = ""; }; - 113CAA6C14F88F4200D3906E /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = ""; }; - 113CAA6D14F88F4200D3906E /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml.h; sourceTree = ""; }; - 113CAA6E14F88F4200D3906E /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlerror.cpp; sourceTree = ""; }; - 113CAA6F14F88F4200D3906E /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlparser.cpp; sourceTree = ""; }; - 113CAA7114F88F4200D3906E /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxXmlSettings.cpp; sourceTree = ""; }; - 113CAA7214F88F4200D3906E /* ofxXmlSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxXmlSettings.h; sourceTree = ""; }; - 116601FA1513758200DE9D73 /* CBWinProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CBWinProject.cpp; sourceTree = ""; }; - 116601FB1513758200DE9D73 /* CBWinProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBWinProject.h; sourceTree = ""; }; - 116601FC1513758200DE9D73 /* visualStudioProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visualStudioProject.cpp; sourceTree = ""; }; - 116601FD1513758200DE9D73 /* visualStudioProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visualStudioProject.h; sourceTree = ""; }; - 116EA814150E68B2004EBBD3 /* baseProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = baseProject.cpp; sourceTree = ""; }; - 116EA81B150E7287004EBBD3 /* CBLinuxProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CBLinuxProject.cpp; sourceTree = ""; }; - 116EA81C150E7288004EBBD3 /* CBLinuxProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBLinuxProject.h; sourceTree = ""; }; - 119B95D714A65CA0001E1E20 /* pugiconfig.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pugiconfig.hpp; sourceTree = ""; }; - 119B95D814A65CA0001E1E20 /* pugixml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pugixml.hpp; sourceTree = ""; }; - 11BCDC821607709900FCCD85 /* textButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textButton.h; sourceTree = ""; }; - 27C4A1A9179491920031C6E4 /* ofxBaseGui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxBaseGui.cpp; sourceTree = ""; }; - 27C4A1AA179491920031C6E4 /* ofxBaseGui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxBaseGui.h; sourceTree = ""; }; - 27C4A1AB179491920031C6E4 /* ofxButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxButton.cpp; sourceTree = ""; }; - 27C4A1AC179491920031C6E4 /* ofxButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxButton.h; sourceTree = ""; }; - 27C4A1AD179491920031C6E4 /* ofxGui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxGui.h; sourceTree = ""; }; - 27C4A1AE179491920031C6E4 /* ofxGuiGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxGuiGroup.cpp; sourceTree = ""; }; - 27C4A1AF179491920031C6E4 /* ofxGuiGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxGuiGroup.h; sourceTree = ""; }; - 27C4A1B0179491920031C6E4 /* ofxLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxLabel.cpp; sourceTree = ""; }; - 27C4A1B1179491920031C6E4 /* ofxLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxLabel.h; sourceTree = ""; }; - 27C4A1B2179491920031C6E4 /* ofxPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxPanel.cpp; sourceTree = ""; }; - 27C4A1B3179491920031C6E4 /* ofxPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxPanel.h; sourceTree = ""; }; - 27C4A1B4179491920031C6E4 /* ofxSlider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxSlider.cpp; sourceTree = ""; }; - 27C4A1B5179491920031C6E4 /* ofxSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxSlider.h; sourceTree = ""; }; - 27C4A1B6179491920031C6E4 /* ofxSliderGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxSliderGroup.cpp; sourceTree = ""; }; - 27C4A1B7179491920031C6E4 /* ofxSliderGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxSliderGroup.h; sourceTree = ""; }; - 27C4A1B8179491920031C6E4 /* ofxToggle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxToggle.cpp; sourceTree = ""; }; - 27C4A1B9179491920031C6E4 /* ofxToggle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxToggle.h; sourceTree = ""; }; + 01DCC0911400F9ACF5B65578 /* ofxXmlSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxXmlSettings.h; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.h; sourceTree = SOURCE_ROOT; }; + 02199743B391EB67AEB9D277 /* visualStudioProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = visualStudioProject.cpp; path = src/projects/visualStudioProject.cpp; sourceTree = SOURCE_ROOT; }; + 0A1DAC09F322AE313A40706D /* ofxToggle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxToggle.h; path = ../../../addons/ofxGui/src/ofxToggle.h; sourceTree = SOURCE_ROOT; }; + 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSlider.cpp; path = ../../../addons/ofxGui/src/ofxSlider.cpp; sourceTree = SOURCE_ROOT; }; + 17E65988300FBD9AAA2CD0CA /* ofxGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxGui.h; path = ../../../addons/ofxGui/src/ofxGui.h; sourceTree = SOURCE_ROOT; }; + 1C0DA2561397A7DE0246858B /* ofxGuiGroup.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxGuiGroup.h; path = ../../../addons/ofxGui/src/ofxGuiGroup.h; sourceTree = SOURCE_ROOT; }; + 1EC2BFF88B1464B1915228E5 /* Jamrules.jam */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = Jamrules.jam; path = src/pugixmlLib/Jamrules.jam; sourceTree = SOURCE_ROOT; }; + 21B23EA2EF8F9B6B2D7455CF /* pugiconfig.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = pugiconfig.hpp; path = src/pugixmlLib/src/pugiconfig.hpp; sourceTree = SOURCE_ROOT; }; + 243811BF36C57AAECA219C52 /* readme.txt */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = readme.txt; path = src/pugixmlLib/readme.txt; sourceTree = SOURCE_ROOT; }; + 24EE7F902E65F9EB0F019F72 /* pugixml_vs2008.vcproj */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_vs2008.vcproj; path = src/pugixmlLib/scripts/pugixml_vs2008.vcproj; sourceTree = SOURCE_ROOT; }; + 270C7C86817A6681AF41919F /* baseProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = baseProject.h; path = src/projects/baseProject.h; sourceTree = SOURCE_ROOT; }; + 2834D88A62CD23F3DE2C47D1 /* ofxButton.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxButton.h; path = ../../../addons/ofxGui/src/ofxButton.h; sourceTree = SOURCE_ROOT; }; + 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tinyxml.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxml.cpp; sourceTree = SOURCE_ROOT; }; + 2F0F0C701DAF9653B34259DC /* pugixml_codeblocks.cbp */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_codeblocks.cbp; path = src/pugixmlLib/scripts/pugixml_codeblocks.cbp; sourceTree = SOURCE_ROOT; }; + 3A860406AF029B6D53D76EF6 /* Utils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Utils.h; path = src/utils/Utils.h; sourceTree = SOURCE_ROOT; }; + 3E297799CC6A48ECBAE93F31 /* pugixml_codelite.project */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_codelite.project; path = src/pugixmlLib/scripts/pugixml_codelite.project; sourceTree = SOURCE_ROOT; }; + 4296952767AAEDB0152CB77B /* xcodeProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = xcodeProject.cpp; path = src/projects/xcodeProject.cpp; sourceTree = SOURCE_ROOT; }; + 43117DCA76F667F7FFF0474E /* pugixml_vs2010_static.vcxproj */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_vs2010_static.vcxproj; path = src/pugixmlLib/scripts/pugixml_vs2010_static.vcxproj; sourceTree = SOURCE_ROOT; }; + 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxXmlSettings.cpp; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.cpp; sourceTree = SOURCE_ROOT; }; + 52AFA1F08C420992CAAAE648 /* ofxSlider.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSlider.h; path = ../../../addons/ofxGui/src/ofxSlider.h; sourceTree = SOURCE_ROOT; }; + 5F224728C386D5B3F377F051 /* foreach.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = foreach.hpp; path = src/pugixmlLib/contrib/foreach.hpp; sourceTree = SOURCE_ROOT; }; + 6208ED229FEA1847016717BF /* pugixml_vs2010.vcxproj */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_vs2010.vcxproj; path = src/pugixmlLib/scripts/pugixml_vs2010.vcxproj; sourceTree = SOURCE_ROOT; }; + 64F7A44591FE6A87C537AA7E /* xcodeProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = xcodeProject.h; path = src/projects/xcodeProject.h; sourceTree = SOURCE_ROOT; }; + 674E3C0C5D0B2AC94A0E0DC0 /* CMakeLists.txt */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = CMakeLists.txt; path = src/pugixmlLib/scripts/CMakeLists.txt; sourceTree = SOURCE_ROOT; }; + 68AF841D88C6C78435DD9597 /* premake4.lua */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = premake4.lua; path = src/pugixmlLib/scripts/premake4.lua; sourceTree = SOURCE_ROOT; }; + 6F2DFD8DFF7E6FEBE6105E52 /* textButton.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = textButton.h; path = src/textButton.h; sourceTree = SOURCE_ROOT; }; + 78D67A00EB899FAC09430597 /* ofxLabel.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxLabel.cpp; path = ../../../addons/ofxGui/src/ofxLabel.cpp; sourceTree = SOURCE_ROOT; }; + 7BFB736360496B05EDEECD6C /* CBLinuxProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = CBLinuxProject.cpp; path = src/projects/CBLinuxProject.cpp; sourceTree = SOURCE_ROOT; }; + 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSliderGroup.cpp; path = ../../../addons/ofxGui/src/ofxSliderGroup.cpp; sourceTree = SOURCE_ROOT; }; + 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tinyxmlerror.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxmlerror.cpp; sourceTree = SOURCE_ROOT; }; + 87F26B4B24CBD428AD9EEBAA /* ofxBaseGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxBaseGui.h; path = ../../../addons/ofxGui/src/ofxBaseGui.h; sourceTree = SOURCE_ROOT; }; + 89449E3044D456F7DE7BEA14 /* ofxPanel.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxPanel.h; path = ../../../addons/ofxGui/src/ofxPanel.h; sourceTree = SOURCE_ROOT; }; + 8E96EBFB259F20B76D331F0D /* ofAddon.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofAddon.h; path = src/addons/ofAddon.h; sourceTree = SOURCE_ROOT; }; + 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxToggle.cpp; path = ../../../addons/ofxGui/src/ofxToggle.cpp; sourceTree = SOURCE_ROOT; }; + 9604B925D32EE39065747725 /* ofxBaseGui.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxBaseGui.cpp; path = ../../../addons/ofxGui/src/ofxBaseGui.cpp; sourceTree = SOURCE_ROOT; }; + 98123BA3A3024BB469773B1D /* visualStudioProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = visualStudioProject.h; path = src/projects/visualStudioProject.h; sourceTree = SOURCE_ROOT; }; + 98AB6BBF3E94A2F9ACDBFAB4 /* ofAddon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofAddon.cpp; path = src/addons/ofAddon.cpp; sourceTree = SOURCE_ROOT; }; + A144B38608BB2F23A63BC3F7 /* pugixml_vs2005_static.vcproj */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_vs2005_static.vcproj; path = src/pugixmlLib/scripts/pugixml_vs2005_static.vcproj; sourceTree = SOURCE_ROOT; }; + A41D10D3D687D63F69350C7D /* project.pbxproj */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = project.pbxproj; path = src/pugixmlLib/scripts/pugixml.xcodeproj/project.pbxproj; sourceTree = SOURCE_ROOT; }; + A4AF60B1756A0D43EA2D64FD /* CBWinProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = CBWinProject.cpp; path = src/projects/CBWinProject.cpp; sourceTree = SOURCE_ROOT; }; + AF38643DB210DF92F4360017 /* Utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Utils.cpp; path = src/utils/Utils.cpp; sourceTree = SOURCE_ROOT; }; + B21E7E5F548EEA92F368040B /* tinyxml.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = tinyxml.h; path = ../../../addons/ofxXmlSettings/libs/tinyxml.h; sourceTree = SOURCE_ROOT; }; + B31F88BC630A432D67216E11 /* pugixml.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = pugixml.hpp; path = src/pugixmlLib/src/pugixml.hpp; sourceTree = SOURCE_ROOT; }; + B87C60311EC1FE841C1ECD89 /* ofxLabel.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxLabel.h; path = ../../../addons/ofxGui/src/ofxLabel.h; sourceTree = SOURCE_ROOT; }; + BABF433ED98C7BC4FF26F57E /* libpugixml_d.a */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = libpugixml_d.a; path = src/pugixmlLib/lib/libpugixml_d.a; sourceTree = SOURCE_ROOT; }; BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = ""; }; + C70D8946940288799E82131E /* ofxSliderGroup.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSliderGroup.h; path = ../../../addons/ofxGui/src/ofxSliderGroup.h; sourceTree = SOURCE_ROOT; }; + C88333E71C9457E441C33474 /* ofxButton.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxButton.cpp; path = ../../../addons/ofxGui/src/ofxButton.cpp; sourceTree = SOURCE_ROOT; }; + CFC0CB103D27E3692BA6A8EF /* pugixml_vs2008_static.vcproj */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_vs2008_static.vcproj; path = src/pugixmlLib/scripts/pugixml_vs2008_static.vcproj; sourceTree = SOURCE_ROOT; }; + D182E9432912D3C162B6664A /* Jamfile.jam */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = Jamfile.jam; path = src/pugixmlLib/Jamfile.jam; sourceTree = SOURCE_ROOT; }; + E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxPanel.cpp; path = ../../../addons/ofxGui/src/ofxPanel.cpp; sourceTree = SOURCE_ROOT; }; E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; }; E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = ""; }; E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; - E45BE9740E8CC7DD009D7055 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; E45BE9770E8CC7DD009D7055 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; @@ -132,14 +156,24 @@ E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; E4B69B5B0A3A1756003C02F2 /* projectGeneratorDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = projectGeneratorDebug.app; sourceTree = BUILT_PRODUCTS_DIR; }; E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; }; - E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; }; - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; }; + E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofApp.cpp; path = src/ofApp.cpp; sourceTree = SOURCE_ROOT; }; + E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; }; E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = ""; }; E4C2424410CC5A17004149E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; E4C2424510CC5A17004149E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; }; E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; + E6DF9C0EF78B8C059FC1C3D4 /* pugixml_vs2005.vcproj */ = {isa = PBXFileReference; explicitFileType = file; fileEncoding = 30; name = pugixml_vs2005.vcproj; path = src/pugixmlLib/scripts/pugixml_vs2005.vcproj; sourceTree = SOURCE_ROOT; }; + E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; + E7E077E715D3B6510020DFD4 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; + E7F985F515E0DE99003869B5 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = ""; }; + EC279306316E5263E4A08185 /* CBLinuxProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = CBLinuxProject.h; path = src/projects/CBLinuxProject.h; sourceTree = SOURCE_ROOT; }; + ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxGuiGroup.cpp; path = ../../../addons/ofxGui/src/ofxGuiGroup.cpp; sourceTree = SOURCE_ROOT; }; + EEC25CE50D80333F281580C4 /* baseProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = baseProject.cpp; path = src/projects/baseProject.cpp; sourceTree = SOURCE_ROOT; }; + FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tinyxmlparser.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxmlparser.cpp; sourceTree = SOURCE_ROOT; }; + FD43935E46D40A2C49D75DD6 /* CBWinProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = CBWinProject.h; path = src/projects/CBWinProject.h; sourceTree = SOURCE_ROOT; }; + FEBD7CF0821162782FE25373 /* pugixml.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = pugixml.cpp; path = src/pugixmlLib/src/pugixml.cpp; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -147,12 +181,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */, + E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */, E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */, E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */, E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */, E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */, E45BE97D0E8CC7DD009D7055 /* AudioToolbox.framework in Frameworks */, - E45BE97E0E8CC7DD009D7055 /* Carbon.framework in Frameworks */, E45BE97F0E8CC7DD009D7055 /* CoreAudio.framework in Frameworks */, E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */, E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */, @@ -161,135 +196,149 @@ E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */, E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */, E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */, - 1120712114AE3D360035CB7E /* libpugixml_d.a in Frameworks */, + E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1120712314AE3D4F0035CB7E /* projects */ = { + 1C5A547470DE335DD20BC0B9 /* contrib */ = { isa = PBXGroup; children = ( - 116601FA1513758200DE9D73 /* CBWinProject.cpp */, - 116601FB1513758200DE9D73 /* CBWinProject.h */, - 116601FC1513758200DE9D73 /* visualStudioProject.cpp */, - 116601FD1513758200DE9D73 /* visualStudioProject.h */, - 1120712414AE3D4F0035CB7E /* baseProject.h */, - 116EA814150E68B2004EBBD3 /* baseProject.cpp */, - 1120712B14AE3D4F0035CB7E /* xcodeProject.cpp */, - 1120712C14AE3D4F0035CB7E /* xcodeProject.h */, - 116EA81B150E7287004EBBD3 /* CBLinuxProject.cpp */, - 116EA81C150E7288004EBBD3 /* CBLinuxProject.h */, - ); - path = projects; + 5F224728C386D5B3F377F051 /* foreach.hpp */, + ); + name = contrib; sourceTree = ""; }; - 113CAA5614F88EDD00D3906E /* utils */ = { + 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */ = { isa = PBXGroup; children = ( - 113CAA5914F88EDD00D3906E /* Utils.cpp */, - 113CAA5A14F88EDD00D3906E /* Utils.h */, + 6ECEF0D76BC33727823EADFF /* src */, + 6E54289412D2D94F45A05113 /* libs */, ); - path = utils; + name = ofxXmlSettings; sourceTree = ""; }; - 113CAA6914F88F4200D3906E /* ofxXmlSettings */ = { + 24ED6ADFE567210AD0DCC5F0 /* scripts */ = { isa = PBXGroup; children = ( - 113CAA6B14F88F4200D3906E /* libs */, - 113CAA7014F88F4200D3906E /* src */, - ); - name = ofxXmlSettings; - path = ../../../addons/ofxXmlSettings; + 674E3C0C5D0B2AC94A0E0DC0 /* CMakeLists.txt */, + 68AF841D88C6C78435DD9597 /* premake4.lua */, + D5F042094266A637D2823034 /* pugixml.xcodeproj */, + 2F0F0C701DAF9653B34259DC /* pugixml_codeblocks.cbp */, + 3E297799CC6A48ECBAE93F31 /* pugixml_codelite.project */, + E6DF9C0EF78B8C059FC1C3D4 /* pugixml_vs2005.vcproj */, + A144B38608BB2F23A63BC3F7 /* pugixml_vs2005_static.vcproj */, + 24EE7F902E65F9EB0F019F72 /* pugixml_vs2008.vcproj */, + CFC0CB103D27E3692BA6A8EF /* pugixml_vs2008_static.vcproj */, + 6208ED229FEA1847016717BF /* pugixml_vs2010.vcxproj */, + 43117DCA76F667F7FFF0474E /* pugixml_vs2010_static.vcxproj */, + ); + name = scripts; sourceTree = ""; }; - 113CAA6B14F88F4200D3906E /* libs */ = { + 3087FF8939B323B0D194ED60 /* projects */ = { isa = PBXGroup; children = ( - 113CAA6C14F88F4200D3906E /* tinyxml.cpp */, - 113CAA6D14F88F4200D3906E /* tinyxml.h */, - 113CAA6E14F88F4200D3906E /* tinyxmlerror.cpp */, - 113CAA6F14F88F4200D3906E /* tinyxmlparser.cpp */, - ); - path = libs; + EEC25CE50D80333F281580C4 /* baseProject.cpp */, + 270C7C86817A6681AF41919F /* baseProject.h */, + 7BFB736360496B05EDEECD6C /* CBLinuxProject.cpp */, + EC279306316E5263E4A08185 /* CBLinuxProject.h */, + A4AF60B1756A0D43EA2D64FD /* CBWinProject.cpp */, + FD43935E46D40A2C49D75DD6 /* CBWinProject.h */, + 02199743B391EB67AEB9D277 /* visualStudioProject.cpp */, + 98123BA3A3024BB469773B1D /* visualStudioProject.h */, + 4296952767AAEDB0152CB77B /* xcodeProject.cpp */, + 64F7A44591FE6A87C537AA7E /* xcodeProject.h */, + ); + name = projects; sourceTree = ""; }; - 113CAA7014F88F4200D3906E /* src */ = { + 3DC5B4A8A81A944074BA767C /* src */ = { isa = PBXGroup; children = ( - 113CAA7114F88F4200D3906E /* ofxXmlSettings.cpp */, - 113CAA7214F88F4200D3906E /* ofxXmlSettings.h */, + 21B23EA2EF8F9B6B2D7455CF /* pugiconfig.hpp */, + FEBD7CF0821162782FE25373 /* pugixml.cpp */, + B31F88BC630A432D67216E11 /* pugixml.hpp */, ); - path = src; + name = src; sourceTree = ""; }; - 119B95D214A65CA0001E1E20 /* pugixmlLib */ = { + 480A780D8D0308AE4A368801 /* ofxGui */ = { isa = PBXGroup; children = ( - 1120712014AE3D360035CB7E /* libpugixml_d.a */, - 119B95D514A65CA0001E1E20 /* src */, + A763ED608B35AE3310251DEE /* src */, ); - path = pugixmlLib; + name = ofxGui; sourceTree = ""; }; - 119B95D514A65CA0001E1E20 /* src */ = { + 6B6AD5A931E565B62CDF53FA /* utils */ = { isa = PBXGroup; children = ( - 1120712214AE3D410035CB7E /* foreach.hpp */, - 119B95D714A65CA0001E1E20 /* pugiconfig.hpp */, - 119B95D814A65CA0001E1E20 /* pugixml.hpp */, + AF38643DB210DF92F4360017 /* Utils.cpp */, + 3A860406AF029B6D53D76EF6 /* Utils.h */, ); - path = src; + name = utils; sourceTree = ""; }; - 11D6814214A8EC0F008E3E3D /* addons */ = { + 6E54289412D2D94F45A05113 /* libs */ = { isa = PBXGroup; children = ( - 1120713414AE3D840035CB7E /* ofAddon.cpp */, - 1120713514AE3D840035CB7E /* ofAddon.h */, + 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */, + B21E7E5F548EEA92F368040B /* tinyxml.h */, + 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */, + FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */, ); - path = addons; + name = libs; sourceTree = ""; }; - 27C4A1A7179491920031C6E4 /* ofxGui */ = { + 6ECEF0D76BC33727823EADFF /* src */ = { isa = PBXGroup; children = ( - 27C4A1A8179491920031C6E4 /* src */, + 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */, + 01DCC0911400F9ACF5B65578 /* ofxXmlSettings.h */, ); - name = ofxGui; - path = ../../../addons/ofxGui; + name = src; sourceTree = ""; }; - 27C4A1A8179491920031C6E4 /* src */ = { + 716D04507DF9A708CAD7C04E /* lib */ = { isa = PBXGroup; children = ( - 27C4A1A9179491920031C6E4 /* ofxBaseGui.cpp */, - 27C4A1AA179491920031C6E4 /* ofxBaseGui.h */, - 27C4A1AB179491920031C6E4 /* ofxButton.cpp */, - 27C4A1AC179491920031C6E4 /* ofxButton.h */, - 27C4A1AD179491920031C6E4 /* ofxGui.h */, - 27C4A1AE179491920031C6E4 /* ofxGuiGroup.cpp */, - 27C4A1AF179491920031C6E4 /* ofxGuiGroup.h */, - 27C4A1B0179491920031C6E4 /* ofxLabel.cpp */, - 27C4A1B1179491920031C6E4 /* ofxLabel.h */, - 27C4A1B2179491920031C6E4 /* ofxPanel.cpp */, - 27C4A1B3179491920031C6E4 /* ofxPanel.h */, - 27C4A1B4179491920031C6E4 /* ofxSlider.cpp */, - 27C4A1B5179491920031C6E4 /* ofxSlider.h */, - 27C4A1B6179491920031C6E4 /* ofxSliderGroup.cpp */, - 27C4A1B7179491920031C6E4 /* ofxSliderGroup.h */, - 27C4A1B8179491920031C6E4 /* ofxToggle.cpp */, - 27C4A1B9179491920031C6E4 /* ofxToggle.h */, + BABF433ED98C7BC4FF26F57E /* libpugixml_d.a */, ); - path = src; + name = lib; + sourceTree = ""; + }; + A763ED608B35AE3310251DEE /* src */ = { + isa = PBXGroup; + children = ( + 9604B925D32EE39065747725 /* ofxBaseGui.cpp */, + 87F26B4B24CBD428AD9EEBAA /* ofxBaseGui.h */, + C88333E71C9457E441C33474 /* ofxButton.cpp */, + 2834D88A62CD23F3DE2C47D1 /* ofxButton.h */, + 17E65988300FBD9AAA2CD0CA /* ofxGui.h */, + ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */, + 1C0DA2561397A7DE0246858B /* ofxGuiGroup.h */, + 78D67A00EB899FAC09430597 /* ofxLabel.cpp */, + B87C60311EC1FE841C1ECD89 /* ofxLabel.h */, + E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */, + 89449E3044D456F7DE7BEA14 /* ofxPanel.h */, + 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */, + 52AFA1F08C420992CAAAE648 /* ofxSlider.h */, + 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */, + C70D8946940288799E82131E /* ofxSliderGroup.h */, + 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */, + 0A1DAC09F322AE313A40706D /* ofxToggle.h */, + ); + name = src; sourceTree = ""; }; BB4B014C10F69532006C3DED /* addons */ = { isa = PBXGroup; children = ( - 27C4A1A7179491920031C6E4 /* ofxGui */, - 113CAA6914F88F4200D3906E /* ofxXmlSettings */, + 480A780D8D0308AE4A368801 /* ofxGui */, + 1F4FB5C423662B96ADFDCC0B /* ofxXmlSettings */, ); name = addons; sourceTree = ""; @@ -297,18 +346,20 @@ BBAB23C913894ECA00AA2426 /* system frameworks */ = { isa = PBXGroup; children = ( + E7F985F515E0DE99003869B5 /* Accelerate.framework */, E4C2424410CC5A17004149E2 /* AppKit.framework */, E4C2424510CC5A17004149E2 /* Cocoa.framework */, E4C2424610CC5A17004149E2 /* IOKit.framework */, E45BE9710E8CC7DD009D7055 /* AGL.framework */, E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */, E45BE9730E8CC7DD009D7055 /* AudioToolbox.framework */, - E45BE9740E8CC7DD009D7055 /* Carbon.framework */, E45BE9750E8CC7DD009D7055 /* CoreAudio.framework */, E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */, E45BE9770E8CC7DD009D7055 /* CoreServices.framework */, E45BE9790E8CC7DD009D7055 /* OpenGL.framework */, E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */, + E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */, + E7E077E715D3B6510020DFD4 /* QTKit.framework */, ); name = "system frameworks"; sourceTree = ""; @@ -321,6 +372,28 @@ name = "3rd party frameworks"; sourceTree = ""; }; + C52E1B6711887167FA8AE784 /* pugixmlLib */ = { + isa = PBXGroup; + children = ( + 1C5A547470DE335DD20BC0B9 /* contrib */, + D182E9432912D3C162B6664A /* Jamfile.jam */, + 1EC2BFF88B1464B1915228E5 /* Jamrules.jam */, + 716D04507DF9A708CAD7C04E /* lib */, + 243811BF36C57AAECA219C52 /* readme.txt */, + 24ED6ADFE567210AD0DCC5F0 /* scripts */, + 3DC5B4A8A81A944074BA767C /* src */, + ); + name = pugixmlLib; + sourceTree = ""; + }; + D5F042094266A637D2823034 /* pugixml.xcodeproj */ = { + isa = PBXGroup; + children = ( + A41D10D3D687D63F69350C7D /* project.pbxproj */, + ); + name = pugixml.xcodeproj; + sourceTree = ""; + }; E4328144138ABC890047C5CB /* Products */ = { isa = PBXGroup; children = ( @@ -354,14 +427,14 @@ E4B69E1C0A3A1BDC003C02F2 /* src */ = { isa = PBXGroup; children = ( - 113CAA5614F88EDD00D3906E /* utils */, - 1120712314AE3D4F0035CB7E /* projects */, - 119B95D214A65CA0001E1E20 /* pugixmlLib */, E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, - E4B69E1F0A3A1BDC003C02F2 /* testApp.h */, - E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */, - 11BCDC821607709900FCCD85 /* textButton.h */, - 11D6814214A8EC0F008E3E3D /* addons */, + E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */, + E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */, + E9B41616011648F9E8AD33EB /* addons */, + 3087FF8939B323B0D194ED60 /* projects */, + C52E1B6711887167FA8AE784 /* pugixmlLib */, + 6F2DFD8DFF7E6FEBE6105E52 /* textButton.h */, + 6B6AD5A931E565B62CDF53FA /* utils */, ); path = src; sourceTree = SOURCE_ROOT; @@ -375,6 +448,15 @@ name = openFrameworks; sourceTree = ""; }; + E9B41616011648F9E8AD33EB /* addons */ = { + isa = PBXGroup; + children = ( + 98AB6BBF3E94A2F9ACDBFAB4 /* ofAddon.cpp */, + 8E96EBFB259F20B76D331F0D /* ofAddon.h */, + ); + name = addons; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -402,8 +484,11 @@ /* Begin PBXProject section */ E4B69B4C0A3A1720003C02F2 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0460; + }; buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "projectGenerator" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -450,7 +535,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";"; + shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\nmkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\ncp -f \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -460,26 +545,42 @@ buildActionMask = 2147483647; files = ( E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, - E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */, - 1120713014AE3D4F0035CB7E /* xcodeProject.cpp in Sources */, - 1120713614AE3D840035CB7E /* ofAddon.cpp in Sources */, - 113CAA5C14F88EDD00D3906E /* Utils.cpp in Sources */, - 113CAA7314F88F4200D3906E /* tinyxml.cpp in Sources */, - 113CAA7414F88F4200D3906E /* tinyxmlerror.cpp in Sources */, - 113CAA7514F88F4200D3906E /* tinyxmlparser.cpp in Sources */, - 113CAA7614F88F4200D3906E /* ofxXmlSettings.cpp in Sources */, - 116EA815150E68B2004EBBD3 /* baseProject.cpp in Sources */, - 116EA81D150E7288004EBBD3 /* CBLinuxProject.cpp in Sources */, - 116601FE1513758200DE9D73 /* CBWinProject.cpp in Sources */, - 116601FF1513758200DE9D73 /* visualStudioProject.cpp in Sources */, - 27C4A1BA179491920031C6E4 /* ofxBaseGui.cpp in Sources */, - 27C4A1BB179491920031C6E4 /* ofxButton.cpp in Sources */, - 27C4A1BC179491920031C6E4 /* ofxGuiGroup.cpp in Sources */, - 27C4A1BD179491920031C6E4 /* ofxLabel.cpp in Sources */, - 27C4A1BE179491920031C6E4 /* ofxPanel.cpp in Sources */, - 27C4A1BF179491920031C6E4 /* ofxSlider.cpp in Sources */, - 27C4A1C0179491920031C6E4 /* ofxSliderGroup.cpp in Sources */, - 27C4A1C1179491920031C6E4 /* ofxToggle.cpp in Sources */, + E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */, + FB1294F164F5B38F76FE12B9 /* ofAddon.cpp in Sources */, + DB49B46C16026402905485B4 /* baseProject.cpp in Sources */, + C275C68AF74CEE4641683025 /* CBLinuxProject.cpp in Sources */, + DBB5A2C2DCFA03BE3AE14A87 /* CBWinProject.cpp in Sources */, + 6EBA35198FCCDB191F12A5E8 /* visualStudioProject.cpp in Sources */, + 6EEC67D90485FADB839CE477 /* xcodeProject.cpp in Sources */, + CBCA6DEB32691ACEB77E1A27 /* Jamfile.jam in Sources */, + 402A5F224EA78D9C9A80C597 /* Jamrules.jam in Sources */, + C1C1C910A67FA8FB026F16D9 /* libpugixml_d.a in Sources */, + E303F3BE53565EA1BAE841B5 /* readme.txt in Sources */, + 39F976C0D8E6D21BE4DF89E6 /* CMakeLists.txt in Sources */, + 37C59FA14CABFEBA11F5E8A2 /* premake4.lua in Sources */, + 78D8B3FDB7837BBF44D7B5C6 /* project.pbxproj in Sources */, + 8031774F343E2825214C5D79 /* pugixml_codeblocks.cbp in Sources */, + 452E0F1E8B3AF31CCAB44DA8 /* pugixml_codelite.project in Sources */, + 3884BDB3CAB3DAAC3806BD28 /* pugixml_vs2005.vcproj in Sources */, + 8331F2B8EC74447BC690587C /* pugixml_vs2005_static.vcproj in Sources */, + 66D7078869A78A4E13E1A4B3 /* pugixml_vs2008.vcproj in Sources */, + BF7F6AEB1F7496B1A34F4780 /* pugixml_vs2008_static.vcproj in Sources */, + 8EE01AD2CD4297019068E250 /* pugixml_vs2010.vcxproj in Sources */, + E2D282BC734A6FC9D7316A10 /* pugixml_vs2010_static.vcxproj in Sources */, + 98BC3024543A9587B77C5762 /* pugixml.cpp in Sources */, + E9674458973BE58E3C788C77 /* Utils.cpp in Sources */, + 856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */, + 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */, + B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */, + 483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */, + F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */, + 837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */, + B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */, + 1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */, + 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */, + 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */, + 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */, + 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -506,18 +607,38 @@ GCC_ENABLE_SSE3_EXTENSIONS = YES; GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_UNINITIALIZED_AUTOS = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; + HEADER_SEARCH_PATHS = ( + "$(OF_CORE_HEADERS)", + ../../../addons/ofxGui/libs, + ../../../addons/ofxGui/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, + src, + src/addons, + src/projects, + src/pugixmlLib, + src/pugixmlLib/contrib, + src/pugixmlLib/lib, + src/pugixmlLib/scripts, + src/pugixmlLib/scripts/pugixml.xcodeproj, + src/pugixmlLib/src, + src/utils, + ); + MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", "-lpthread", + "-mtune=native", ); + SDKROOT = macosx10.6; }; name = Debug; }; @@ -533,26 +654,46 @@ GCC_ENABLE_SSE3_EXTENSIONS = YES; GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 3; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_UNINITIALIZED_AUTOS = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; + HEADER_SEARCH_PATHS = ( + "$(OF_CORE_HEADERS)", + ../../../addons/ofxGui/libs, + ../../../addons/ofxGui/src, + ../../../addons/ofxXmlSettings/libs, + ../../../addons/ofxXmlSettings/src, + src, + src/addons, + src/projects, + src/pugixmlLib, + src/pugixmlLib/contrib, + src/pugixmlLib/lib, + src/pugixmlLib/scripts, + src/pugixmlLib/scripts/pugixml.xcodeproj, + src/pugixmlLib/src, + src/utils, + ); + MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", "-lpthread", + "-mtune=native", ); + SDKROOT = macosx10.6; }; name = Release; }; E4B69B600A3A1757003C02F2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -560,11 +701,10 @@ ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G4; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + GCC_MODEL_TUNING = NONE; + ICON = "$(ICON_NAME_DEBUG)"; + ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( @@ -630,12 +770,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/src/pugixmlLib\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/src/pugixmlLib/lib\""; - PREBINDING = NO; PRODUCT_NAME = "$(TARGET_NAME)Debug"; WRAPPER_EXTENSION = app; }; @@ -644,17 +779,17 @@ E4B69B610A3A1757003C02F2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G4; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = NONE; + ICON = "$(ICON_NAME_RELEASE)"; + ICON_FILE = "$(ICON_FILE_PATH)$(ICON)"; INFOPLIST_FILE = "openFrameworks-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( @@ -720,12 +855,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_49)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/src/pugixmlLib\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/src/pugixmlLib/lib\""; - PREBINDING = NO; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; diff --git a/projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator.xcscheme b/projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator Debug.xcscheme similarity index 94% rename from projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator.xcscheme rename to projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator Debug.xcscheme index 26b82c6..87d25d8 100644 --- a/projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator.xcscheme +++ b/projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator Debug.xcscheme @@ -1,5 +1,6 @@ @@ -39,11 +40,12 @@ @@ -62,7 +64,7 @@ shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" + buildConfiguration = "Debug" debugDocumentVersioning = "YES"> diff --git a/projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator Release.xcscheme b/projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator Release.xcscheme new file mode 100644 index 0000000..987e512 --- /dev/null +++ b/projectGenerator.xcodeproj/xcshareddata/xcschemes/projectGenerator Release.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projectGeneratorLinux.cbp b/projectGeneratorLinux.cbp index b4aba41..85cbf1f 100644 --- a/projectGeneratorLinux.cbp +++ b/projectGeneratorLinux.cbp @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ diff --git a/projectGeneratorLinux.workspace b/projectGeneratorLinux.workspace index 40e964d..c2d9f3c 100644 --- a/projectGeneratorLinux.workspace +++ b/projectGeneratorLinux.workspace @@ -1,7 +1,9 @@ - + + + + - diff --git a/projectGeneratorSimple.cbp b/projectGeneratorSimple.cbp deleted file mode 100644 index c7ba9a9..0000000 --- a/projectGeneratorSimple.cbp +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - diff --git a/projectGeneratorSimple.sln b/projectGeneratorSimple.sln deleted file mode 100644 index 7ab7ea5..0000000 --- a/projectGeneratorSimple.sln +++ /dev/null @@ -1,25 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projectGeneratorSimple", "projectGeneratorSimple.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32 - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32 - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/projectGeneratorSimple.vcxproj b/projectGeneratorSimple.vcxproj deleted file mode 100644 index c06eca7..0000000 --- a/projectGeneratorSimple.vcxproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7FD42DF7-442E-479A-BA76-D0022F99702A} - Win32Proj - projectGeneratorSimple - - - - Application - Unicode - v110 - - - Application - Unicode - true - v110 - - - - - - - - - - - - - bin\ - obj\$(Configuration)\ - $(ProjectName)_debug - true - true - - - bin\ - obj\$(Configuration)\ - false - - - - Disabled - true - EnableFastChecks - %(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level3 - EditAndContinue - %(AdditionalIncludeDirectories);src;src\addons;src\projects;src\pugixmlLib;src\pugixmlLib\contrib;src\pugixmlLib\lib;src\pugixmlLib\scripts;src\pugixmlLib\scripts\pugixml.xcodeproj;src\pugixmlLib\src;src\utils;..\..\..\addons\ofxGui\libs;..\..\..\addons\ofxGui\src;..\..\..\addons\ofxXmlSettings\libs\tinyxml\src;..\..\..\addons\ofxXmlSettings\src - CompileAsCpp - - - true - Console - false - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - false - %(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - %(AdditionalIncludeDirectories);src;src\addons;src\projects;src\pugixmlLib;src\pugixmlLib\contrib;src\pugixmlLib\lib;src\pugixmlLib\scripts;src\pugixmlLib\scripts\pugixml.xcodeproj;src\pugixmlLib\src;src\utils;..\..\..\addons\ofxGui\libs;..\..\..\addons\ofxGui\src;..\..\..\addons\ofxXmlSettings\libs\tinyxml\src;..\..\..\addons\ofxXmlSettings\src - CompileAsCpp - - - false - false - Console - true - true - false - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {5837595d-aca9-485c-8e76-729040ce4b0b} - - - - - /D_DEBUG %(AdditionalOptions) - - - - \ No newline at end of file diff --git a/projectGeneratorSimple.vcxproj.filters b/projectGeneratorSimple.vcxproj.filters deleted file mode 100644 index c9711c1..0000000 --- a/projectGeneratorSimple.vcxproj.filters +++ /dev/null @@ -1,180 +0,0 @@ - - - - - {48f095f5-6680-4fb7-ba62-6e5d4a59b3d3} - - - {a438fe03-3664-49e1-8a3d-c0f49b8e256d} - - - {966756a9-90b3-462d-9f43-e66ce13ac9c7} - - - {d9b15813-4d8e-4feb-af69-2dcb671c5546} - - - {c76d9651-8ebc-49ba-bec0-c8a9abda3102} - - - {a12b2e3d-9ce0-4bc4-ac1b-c93770f10cee} - - - {dbbee140-b712-40e2-9599-16b6b532f8e4} - - - {07a44bca-7ae5-4f1b-b2af-16f8e734cc04} - - - {19df3bd2-e50a-49cb-b98b-afe55e360e64} - - - {0f9e2643-d98b-44b1-9345-17976da56985} - - - {217849b9-1bf5-4f68-9732-2edc1db560ac} - - - {904a39a2-a8d4-47d3-9701-383c10559b94} - - - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - src - - - src\addons - - - src\pugixmlLib\src - - - src\pugixmlLib\src - - - src\projects - - - src\projects - - - src\projects - - - src\projects - - - src\utils - - - addons\ofxXmlSettings\src - - - src\projects - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - src - - - addons\ofxXmlSettings\libs - - - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - src - - - src - - - src\addons - - - src\pugixmlLib\src - - - src\projects - - - src\projects - - - src\projects - - - src\projects - - - src\utils - - - addons\ofxXmlSettings\src - - - src\projects - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxGui\src - - - addons\ofxXmlSettings\libs - - - addons\ofxXmlSettings\libs - - - addons\ofxXmlSettings\libs - - - - - - \ No newline at end of file diff --git a/projectGeneratorSimple.vcxproj.user b/projectGeneratorSimple.vcxproj.user deleted file mode 100644 index bedf919..0000000 --- a/projectGeneratorSimple.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(ProjectDir)/bin - WindowsLocalDebugger - - - $(ProjectDir)/bin - WindowsLocalDebugger - - \ No newline at end of file diff --git a/projectGeneratorSimple.workspace b/projectGeneratorSimple.workspace deleted file mode 100644 index dcb2753..0000000 --- a/projectGeneratorSimple.workspace +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/projectGenerator_linux64.cbp b/projectGenerator_linux64.cbp index 3865643..928bd78 100644 --- a/projectGenerator_linux64.cbp +++ b/projectGenerator_linux64.cbp @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ diff --git a/projectGenerator_linux64.workspace b/projectGenerator_linux64.workspace index eabcc7d..fa12ec6 100644 --- a/projectGenerator_linux64.workspace +++ b/projectGenerator_linux64.workspace @@ -1,7 +1,9 @@ + + + - diff --git a/src/main.cpp b/src/main.cpp index 390bf81..629e24f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include "ofMain.h" -#include "testApp.h" +#include "ofApp.h" #include "ofAppGlutWindow.h" -#include "ofAppNoWindow.h" +//#include "ofAppNoWindow.h" //======================================================================== @@ -10,7 +10,7 @@ int main( int argc, char *argv[] ){ ofAppGlutWindow window; ofSetupOpenGL(&window, 1024, 610, OF_WINDOW); - testApp * app = new testApp; + ofApp * app = new ofApp(); //app->buildAllExamples = false; ofRunApp( app ); } diff --git a/src/testApp.cpp b/src/ofApp.cpp similarity index 92% rename from src/testApp.cpp rename to src/ofApp.cpp index 8fe20c5..37d9527 100644 --- a/src/testApp.cpp +++ b/src/ofApp.cpp @@ -1,4 +1,4 @@ -#include "testApp.h" +#include "ofApp.h" #include "Utils.h" #include #include "ofConstants.h" @@ -16,11 +16,34 @@ string windowsFromUnixPath(string path){ return path; } + + + //------------------------------------------------------ -bool testApp::isAddonCore(string addon){ +bool ofApp::isAddonGood(string addon){ + + if (unlistedAddons.size() == 0){ + unlistedAddons.push_back("ofxiOS "); + unlistedAddons.push_back("ofxMultiTouch"); + unlistedAddons.push_back("ofxAccelorometer"); + } + + for (int i = 0; i < unlistedAddons.size(); i++){ + + if (unlistedAddons[i] == addon){ + return false; + } + } + return true; +} - if (bInited == false){ + +//------------------------------------------------------ +bool ofApp::isAddonCore(string addon){ + + + if (coreAddons.size() == 0){ coreAddons.push_back("ofx3DModelLoader"); coreAddons.push_back("ofxAssimpModelLoader"); coreAddons.push_back("ofxDirList"); @@ -35,7 +58,6 @@ bool testApp::isAddonCore(string addon){ coreAddons.push_back("ofxSvg"); coreAddons.push_back("ofxGui"); coreAddons.push_back("ofxKinect"); - bInited = true; } @@ -68,7 +90,7 @@ void fixStringCharacters(string &toFix){ //------------------------------------------------------ -string testApp::setupForTarget(int targ){ +string ofApp::setupForTarget(int targ){ if(project){ delete project; @@ -110,7 +132,7 @@ string testApp::setupForTarget(int targ){ -void testApp::setStatus(string newStatus){ +void ofApp::setStatus(string newStatus){ statusEnergy = 1; status = newStatus; statusSetTime = ofGetElapsedTimef(); @@ -119,7 +141,7 @@ void testApp::setStatus(string newStatus){ //-------------------------------------------------------------- -void testApp::setup(){ +void ofApp::setup(){ ofEnableAlphaBlending(); ofEnableSmoothing(); ofSetLogLevel(OF_LOG_VERBOSE); @@ -129,7 +151,6 @@ void testApp::setup(){ statusEnergy = 0; mode = 0; - bInited = false; project = NULL; sketchName = "mySketch"; @@ -263,13 +284,15 @@ void testApp::setup(){ if(addon.find("ofx")==0){ - if (isAddonCore(addon)){ - ofxToggle * toggle = new ofxToggle(); - panelCoreAddons.add(toggle->setup(addon,false,300)); - } else { - bHaveNonCoreAddons = true; - ofxToggle * toggle = new ofxToggle(); - panelOtherAddons.add(toggle->setup(addon,false,300)); + if (isAddonGood(addon)){ + if (isAddonCore(addon)){ + ofxToggle * toggle = new ofxToggle(); + panelCoreAddons.add(toggle->setup(addon,false,300)); + } else { + bHaveNonCoreAddons = true; + ofxToggle * toggle = new ofxToggle(); + panelOtherAddons.add(toggle->setup(addon,false,300)); + } } @@ -287,7 +310,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 +#define MAKE_IOS #ifdef MAKE_IOS panelPlatforms.add(osxToggle.setup("osx (xcode)",false)); @@ -336,7 +359,7 @@ void testApp::setup(){ //-------------------------------------------------------------- -void testApp::update(){ +void ofApp::update(){ float diff = ofGetElapsedTimef()- statusSetTime; if (diff > 3){ @@ -386,7 +409,7 @@ void testApp::update(){ } //-------------------------------------------------------------- -void testApp::draw(){ +void ofApp::draw(){ @@ -440,7 +463,7 @@ void testApp::draw(){ } //-------------------------------------------------------------- -void testApp::keyPressed(int key){ +void ofApp::keyPressed(int key){ if (key == ' '){ @@ -451,7 +474,7 @@ void testApp::keyPressed(int key){ } -void testApp::generateProject(){ +void ofApp::generateProject(){ vector targetsToMake; if( osxToggle ) targetsToMake.push_back(OF_TARGET_OSX); @@ -520,24 +543,24 @@ void testApp::generateProject(){ } //-------------------------------------------------------------- -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){ if (mode == MODE_NORMAL){ @@ -668,12 +691,12 @@ void testApp::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){ generateButton.topLeftAnchor.set(ofGetWidth() - buttons[0].rect.x - generateButton.rect.width + 10 , ofGetHeight() - generateButton.rect.height - 40);// 535); generateButton.calculateRect(); @@ -685,10 +708,10 @@ void testApp::windowResized(int w, int h){ } //-------------------------------------------------------------- -void testApp::gotMessage(ofMessage msg){ +void ofApp::gotMessage(ofMessage msg){ } -void testApp::addAddon(string addon) { +void ofApp::addAddon(string addon) { string addons = ""; @@ -722,7 +745,7 @@ void testApp::addAddon(string addon) { buttons[3].setText(addons); } //-------------------------------------------------------------- -void testApp::dragEvent(ofDragInfo dragInfo){ +void ofApp::dragEvent(ofDragInfo dragInfo){ for(int i = 0; i < dragInfo.files.size(); i++) { string path = dragInfo.files[i]; ofFile f(path); diff --git a/src/testApp.h b/src/ofApp.h similarity index 94% rename from src/testApp.h rename to src/ofApp.h index 3437a23..e1df091 100644 --- a/src/testApp.h +++ b/src/ofApp.h @@ -16,7 +16,7 @@ -class testApp : public ofBaseApp{ +class ofApp : public ofBaseApp{ public: void setup(); @@ -69,16 +69,17 @@ class testApp : public ofBaseApp{ float uiLeftX; + textButton button; textButton generateButton; textButton addonButton; vector < textButton > buttons; + bool isAddonGood(string addon); bool isAddonCore(string addon); - bool bInited; vector < string > coreAddons; - + vector < string > unlistedAddons; float statusSetTime; float statusEnergy;