smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

Some paths weren't getting set up correctly for the MSVC build

Browse source 
Fortunately, only the VAMP_PATH was causing a problem. The others were only relevant for a Debug build
This commit is contained in:
John Emmas 2017-02-04 12:54:19 +00:00
parent f7b005ebf1
commit d1599abad3
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/bundle_env_msvc.cc
View file

@ -236,6 +236,7 @@ string fonts_conf_file;
if (!fonts_conf_file.empty()) { if (!fonts_conf_file.empty()) {
fonts_conf_file += "\\"; fonts_conf_file += "\\";
fonts_conf_file += PROGRAM_NAME; fonts_conf_file += PROGRAM_NAME;
fonts_conf_file += PROGRAM_VERSION;
fonts_conf_file += FONTS_CONF_LOCATION; fonts_conf_file += FONTS_CONF_LOCATION;
#else #else
if (PBD::find_file (ARDOUR::ardour_config_search_path(), "fonts.conf", fonts_conf_file)) { 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()) { if (!pango_modules_file.empty()) {
pango_modules_file += "\\"; pango_modules_file += "\\";
pango_modules_file += PROGRAM_NAME; pango_modules_file += PROGRAM_NAME;
pango_modules_file += PROGRAM_VERSION;
pango_modules_file += PANGO_CONF_LOCATION; pango_modules_file += PANGO_CONF_LOCATION;
#if 0 #if 0
// JE - handy for non-English locale testing (Greek, in this case) // 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()) { if (!gdk_pixbuf_loaders_file.empty()) {
gdk_pixbuf_loaders_file += "\\"; gdk_pixbuf_loaders_file += "\\";
gdk_pixbuf_loaders_file += PROGRAM_NAME; gdk_pixbuf_loaders_file += PROGRAM_NAME;
gdk_pixbuf_loaders_file += PROGRAM_VERSION;
gdk_pixbuf_loaders_file += PIXBUFLOADERS_CONF_LOCATION; gdk_pixbuf_loaders_file += PIXBUFLOADERS_CONF_LOCATION;
#else #else
if (PBD::find_file (ARDOUR::ardour_config_search_path(), "gdk-pixbuf.loaders", gdk_pixbuf_loaders_file)) { 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()) { if (!clearlooks_la_file.empty()) {
clearlooks_la_file += "\\"; clearlooks_la_file += "\\";
clearlooks_la_file += PROGRAM_NAME; clearlooks_la_file += PROGRAM_NAME;
clearlooks_la_file += PROGRAM_VERSION;
clearlooks_la_file += CLEARLOOKS_CONF_LOCATION; clearlooks_la_file += CLEARLOOKS_CONF_LOCATION;
#else #else
if (PBD::find_file (ARDOUR::ardour_config_search_path(), "libclearlooks.la", clearlooks_la_file)) { 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' // Next, set up 'ARDOUR_DATA_PATH'
path = get_module_folder() + "\\"; path = get_module_folder() + "\\";
path += PROGRAM_NAME; path += PROGRAM_NAME;
path += PROGRAM_VERSION;
path += "\\share"; path += "\\share";
Glib::setenv ("ARDOUR_DATA_PATH", path, true); 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 += get_module_folder() + "\\";
path += PROGRAM_NAME; path += PROGRAM_NAME;
path += PROGRAM_VERSION;
path += "\\bin\\vamp"; path += "\\bin\\vamp";
path += G_SEARCHPATH_SEPARATOR; path += G_SEARCHPATH_SEPARATOR;
path += "%ProgramFiles%\\Vamp Plugins"; path += "%ProgramFiles%\\Vamp Plugins";