diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2017-02-04 12:54:19 +0000 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2017-02-04 12:54:19 +0000 |
| commit | d1599abad301b81a05b208704434f19d8bb76d4e (patch) | |
| tree | 98f725c2c8fb61331ca3276b8ff6b83c1a0e510a /gtk2_ardour/bundle_env_msvc.cc | |
| parent | f7b005ebf10982c4e3c9f3462e2b4d5b5e99c0fb (diff) | |
Some paths weren't getting set up correctly for the MSVC build
Fortunately, only the VAMP_PATH was causing a problem. The others were only relevant for a Debug build
Diffstat (limited to 'gtk2_ardour/bundle_env_msvc.cc')
| -rw-r--r-- | gtk2_ardour/bundle_env_msvc.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc index 9932a19027..a188e705aa 100644 --- a/gtk2_ardour/bundle_env_msvc.cc +++ b/gtk2_ardour/bundle_env_msvc.cc @@ -236,6 +236,7 @@ string fonts_conf_file; if (!fonts_conf_file.empty()) { fonts_conf_file += "\\"; fonts_conf_file += PROGRAM_NAME; + fonts_conf_file += PROGRAM_VERSION; fonts_conf_file += FONTS_CONF_LOCATION; #else if (PBD::find_file (ARDOUR::ardour_config_search_path(), "fonts.conf", fonts_conf_file)) { @@ -261,6 +262,7 @@ string pango_modules_file; if (!pango_modules_file.empty()) { pango_modules_file += "\\"; pango_modules_file += PROGRAM_NAME; + pango_modules_file += PROGRAM_VERSION; pango_modules_file += PANGO_CONF_LOCATION; #if 0 // JE - handy for non-English locale testing (Greek, in this case) @@ -299,6 +301,7 @@ string gdk_pixbuf_loaders_file; if (!gdk_pixbuf_loaders_file.empty()) { gdk_pixbuf_loaders_file += "\\"; gdk_pixbuf_loaders_file += PROGRAM_NAME; + gdk_pixbuf_loaders_file += PROGRAM_VERSION; gdk_pixbuf_loaders_file += PIXBUFLOADERS_CONF_LOCATION; #else if (PBD::find_file (ARDOUR::ardour_config_search_path(), "gdk-pixbuf.loaders", gdk_pixbuf_loaders_file)) { @@ -325,6 +328,7 @@ string clearlooks_la_file; if (!clearlooks_la_file.empty()) { clearlooks_la_file += "\\"; clearlooks_la_file += PROGRAM_NAME; + clearlooks_la_file += PROGRAM_VERSION; clearlooks_la_file += CLEARLOOKS_CONF_LOCATION; #else if (PBD::find_file (ARDOUR::ardour_config_search_path(), "libclearlooks.la", clearlooks_la_file)) { @@ -373,6 +377,7 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir) // Next, set up 'ARDOUR_DATA_PATH' path = get_module_folder() + "\\"; path += PROGRAM_NAME; + path += PROGRAM_VERSION; path += "\\share"; Glib::setenv ("ARDOUR_DATA_PATH", path, true); @@ -410,6 +415,7 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir) } path += get_module_folder() + "\\"; path += PROGRAM_NAME; + path += PROGRAM_VERSION; path += "\\bin\\vamp"; path += G_SEARCHPATH_SEPARATOR; path += "%ProgramFiles%\\Vamp Plugins"; |