projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes to waveform clipping display
[ardour.git]
/
gtk2_ardour
/
main.cc
diff --git
a/gtk2_ardour/main.cc
b/gtk2_ardour/main.cc
index e53df29e2168fbd09abb29065319c79d849f1e58..21e534397976b39930a1e02fd8c7f3fb2dc21a55 100644
(file)
--- a/
gtk2_ardour/main.cc
+++ b/
gtk2_ardour/main.cc
@@
-38,7
+38,7
@@
#include <jack/jack.h>
#include <jack/jack.h>
-#include "ardour/
svn_
revision.h"
+#include "ardour/revision.h"
#include "ardour/version.h"
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
#include "ardour/version.h"
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
@@
-60,7
+60,7
@@
#include "i18n.h"
#include "i18n.h"
-#if
(defined __APPLE__ && defined OSX_CUSTOM_FONT)
+#if
def __APPLE__
#include <Carbon/Carbon.h>
#endif
#include <Carbon/Carbon.h>
#endif
@@
-184,6
+184,8
@@
fixup_bundle_environment (int, char* [])
export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
+ setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
+
/* unset GTK_RC_FILES so that we only load the RC files that we define
*/
/* unset GTK_RC_FILES so that we only load the RC files that we define
*/
@@
-222,7
+224,11
@@
fixup_bundle_environment (int, char* [])
}
static void load_custom_fonts() {
}
static void load_custom_fonts() {
-#ifdef OSX_CUSTOM_FONT
+/* this code will only compile on OS X 10.6 and above, and we currently do not
+ * need it for earlier versions since we fall back on a non-monospace,
+ * non-custom font.
+ */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
std::string ardour_mono_file;
if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
std::string ardour_mono_file;
if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
@@
-288,6
+294,8
@@
fixup_bundle_environment (int /*argc*/, char* argv[])
export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
+ setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
+
/* unset GTK_RC_FILES so that we only load the RC files that we define
*/
/* unset GTK_RC_FILES so that we only load the RC files that we define
*/
@@
-481,7
+489,7
@@
int main (int argc, char *argv[])
cout << PROGRAM_NAME
<< VERSIONSTRING
<< _(" (built using ")
cout << PROGRAM_NAME
<< VERSIONSTRING
<< _(" (built using ")
- <<
svn_
revision
+ << revision
#ifdef __GNUC__
<< _(" and GCC version ") << __VERSION__
#endif
#ifdef __GNUC__
<< _(" and GCC version ") << __VERSION__
#endif