#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"
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
*/
static void load_custom_fonts() {
/* this code will only compile on OS X 10.6 and above, and we currently do not
- * need it anyway since we have no custom fonts on OS X. Leave it here in case
- * we ever need to comeback to it.
+ * need it for earlier versions since we fall back on a non-monospace,
+ * non-custom font.
*/
-#if 0
+#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)) {
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
*/
cout << PROGRAM_NAME
<< VERSIONSTRING
<< _(" (built using ")
- << svn_revision
+ << revision
#ifdef __GNUC__
<< _(" and GCC version ") << __VERSION__
#endif