diff --git a/ardour.dox b/ardour.dox index f2036d352e..6b4f419a9e 100644 --- a/ardour.dox +++ b/ardour.dox @@ -459,7 +459,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = libs/pbd libs/midi++2 libs/ardour libs/gtkmm2ext gtk2_ardour +INPUT = libs/pbd libs/midi++2 libs/ardour libs/surfaces libs/gtkmm2ext gtk2_ardour # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -556,7 +556,7 @@ FILTER_SOURCE_FILES = NO # Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. @@ -603,7 +603,7 @@ VERBATIM_HEADERS = YES # of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. -ALPHABETICAL_INDEX = NO +ALPHABETICAL_INDEX = YES # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns @@ -766,7 +766,7 @@ COMPACT_LATEX = NO # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = a4wide +PAPER_TYPE = letter # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. @@ -791,7 +791,7 @@ PDF_HYPERLINKS = NO # plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. -USE_PDFLATEX = NO +USE_PDFLATEX = YES # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. # command to the generated LaTeX files. This will instruct LaTeX to keep @@ -1005,7 +1005,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = HAVE_COREAUDIO VST_SUPPORT HAVE_LIBLO FFT_ANALYSIS +PREDEFINED = HAVE_LIBLO FFT_ANALYSIS # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj index 7f75c2a54c..4026b65f59 100644 --- a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj +++ b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj @@ -178,6 +178,8 @@ 69AD45850B97D10600806E7E /* FLAC in Frameworks */ = {isa = PBXBuildFile; fileRef = 69AD45840B97D10600806E7E /* FLAC */; }; 69B1B5210B8E7DFD007E41C1 /* pbd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 691B3B7C0B8D5508009155B5 /* pbd.framework */; }; 69B1B5500B8E80AD007E41C1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69B1B54F0B8E80AD007E41C1 /* CoreAudio.framework */; }; + 69DBC41B0BA794A500C19E65 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69DBC41A0BA794A500C19E65 /* Accelerate.framework */; }; + 69DBC42B0BA7992800C19E65 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69DBC42A0BA7992800C19E65 /* Carbon.framework */; }; 69F7CE5A0B8DCB3300D76871 /* basic_ui.cc in Sources */ = {isa = PBXBuildFile; fileRef = 69F7CE520B8DCB3300D76871 /* basic_ui.cc */; }; 69F7CE5B0B8DCB3300D76871 /* basic_ui.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F7CE540B8DCB3300D76871 /* basic_ui.h */; }; 69F7CE5C0B8DCB3300D76871 /* control_protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F7CE550B8DCB3300D76871 /* control_protocol.h */; }; @@ -393,6 +395,8 @@ 698D9AB00B969A5B00C53B63 /* midi++.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "midi++.xcodeproj"; path = "../../midi++2/macosx/midi++.xcodeproj"; sourceTree = SOURCE_ROOT; }; 69AD45840B97D10600806E7E /* FLAC */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = FLAC; path = "/Library/Frameworks/Sndfile-ardour.framework/Versions/A/Libraries/FLAC"; sourceTree = ""; }; 69B1B54F0B8E80AD007E41C1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; + 69DBC41A0BA794A500C19E65 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = ""; }; + 69DBC42A0BA7992800C19E65 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 69F7CE520B8DCB3300D76871 /* basic_ui.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = basic_ui.cc; sourceTree = ""; }; 69F7CE540B8DCB3300D76871 /* basic_ui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = basic_ui.h; sourceTree = ""; }; 69F7CE550B8DCB3300D76871 /* control_protocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = control_protocol.h; sourceTree = ""; }; @@ -426,6 +430,8 @@ 696149EB0B97CEF500ECBDF0 /* gobject in Frameworks */, 696149EC0B97CEF500ECBDF0 /* gthread in Frameworks */, 69AD45850B97D10600806E7E /* FLAC in Frameworks */, + 69DBC41B0BA794A500C19E65 /* Accelerate.framework in Frameworks */, + 69DBC42B0BA7992800C19E65 /* Carbon.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -456,6 +462,8 @@ 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( + 69DBC42A0BA7992800C19E65 /* Carbon.framework */, + 69DBC41A0BA794A500C19E65 /* Accelerate.framework */, 69AD45840B97D10600806E7E /* FLAC */, 696149E50B97CEF500ECBDF0 /* glib */, 696149E60B97CEF500ECBDF0 /* gmodule */, @@ -821,7 +829,6 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "ardour" */; - compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 1; mainGroup = 0867D691FE84028FC02AAC07 /* ardour */; productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; @@ -837,7 +844,6 @@ }, ); projectRoot = ""; - shouldCheckCompatibility = 1; targets = ( 8D07F2BC0486CC7A007CD1D0 /* ardour */, ); @@ -1005,7 +1011,9 @@ "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", ); + FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -1034,18 +1042,19 @@ 4FADC24808B4156D00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( "$(NATIVE_ARCH)", ppc, ); - FRAMEWORK_SEARCH_PATHS = ( - /opt/ardour/src/ardour2/libs/pbd/macosx/build/Release, - "/opt/ardour/src/ardour2/libs/midi++2/macosx/build/Release", - ); + FRAMEWORK_SEARCH_PATHS = /opt/ardour/build; GCC_FAST_OBJC_DISPATCH = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G4; + GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( + BUILD_VECLIB_OPTIMIZATIONS, + HAVE_WORDEXP, HAVE_WEAK_COREAUDIO, "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_2)", @@ -1083,18 +1092,18 @@ 694E7C8A0B97B0FE0018D03D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - /opt/ardour/src/ardour2/libs/pbd/macosx/build/Release, - "/opt/ardour/src/ardour2/libs/midi++2/macosx/build/Release", - ); + FRAMEWORK_SEARCH_PATHS = /opt/ardour/build; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = NO; GCC_FAST_OBJC_DISPATCH = NO; GCC_MODEL_TUNING = G4; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( + BUILD_VECLIB_OPTIMIZATIONS, + HAVE_WORDEXP, HAVE_WEAK_COREAUDIO, "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_2)", @@ -1150,7 +1159,9 @@ "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", ); + FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G5; diff --git a/libs/midi++2/macosx/midi++.xcodeproj/project.pbxproj b/libs/midi++2/macosx/midi++.xcodeproj/project.pbxproj index 13529a497c..49896b11a3 100644 --- a/libs/midi++2/macosx/midi++.xcodeproj/project.pbxproj +++ b/libs/midi++2/macosx/midi++.xcodeproj/project.pbxproj @@ -274,7 +274,6 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "midi++" */; - compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 0867D691FE84028FC02AAC07 /* midi++ */; productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; @@ -286,7 +285,6 @@ }, ); projectRoot = ""; - shouldCheckCompatibility = 1; targets = ( 8D07F2BC0486CC7A007CD1D0 /* midi++ */, ); @@ -401,12 +399,13 @@ 4FADC24808B4156D00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( "$(NATIVE_ARCH)", ppc, ); DEAD_CODE_STRIPPING = YES; - FRAMEWORK_SEARCH_PATHS = /opt/ardour/src/ardour2/libs/pbd/macosx/build/Release; + FRAMEWORK_SEARCH_PATHS = /opt/ardour/build; GCC_FAST_OBJC_DISPATCH = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G4; @@ -425,8 +424,9 @@ 694E7C660B97AD230018D03D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = /opt/ardour/src/ardour2/libs/pbd/macosx/build/Release; + FRAMEWORK_SEARCH_PATHS = /opt/ardour/build; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_FAST_OBJC_DISPATCH = NO; GCC_OPTIMIZATION_LEVEL = 0; diff --git a/libs/pbd/macosx/pbd.xcodeproj/project.pbxproj b/libs/pbd/macosx/pbd.xcodeproj/project.pbxproj index b2e418ae48..4fcb6a7efd 100644 --- a/libs/pbd/macosx/pbd.xcodeproj/project.pbxproj +++ b/libs/pbd/macosx/pbd.xcodeproj/project.pbxproj @@ -419,13 +419,11 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "pbd" */; - compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 0867D691FE84028FC02AAC07 /* pbd */; productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; projectDirPath = ""; projectRoot = ""; - shouldCheckCompatibility = 1; targets = ( 8D07F2BC0486CC7A007CD1D0 /* pbd */, );