Property changes on: . ___________________________________________________________________ Name: svn:ignore + cache .sconsign.dblite Index: linux/alsa/alsa_midi_impl.h =================================================================== --- linux/alsa/alsa_midi_impl.h (revision 762) +++ linux/alsa/alsa_midi_impl.h (working copy) @@ -68,7 +68,7 @@ #if defined(STANDALONE) #define MESSAGE(...) fprintf(stderr, __VA_ARGS__) #elif defined(JACKMP) -#define MESSAGE(...) fprintf(stderr, __VA_ARGS__) +#define MESSAGE(...) fprintf(stderr, __VA_ARGS__) ; fprintf(stderr, "\n") #else #include #endif Index: linux/SConscript =================================================================== --- linux/SConscript (revision 762) +++ linux/SConscript (working copy) @@ -35,6 +35,9 @@ srcfiles_linux_alsa = [ 'JackAlsaDriver.cpp', + 'alsa_rawmidi.c', + 'alsa_seqmidi.c', + 'alsa_midi_jackmp.cpp', 'memops.c', 'generic_hw.c', 'hdsp.c', @@ -58,26 +61,28 @@ serverenv.PrependUnique( LIBPATH=env['build_base'] ) serverenv.PrependUnique( LIBS=[env['SERVERLIB'], 'dl'] ) -server = serverenv.Program('jackdmp', srcfiles_linux_server) +server = serverenv.Program(env['SERVER'], srcfiles_linux_server) serverenv.Install( env['BINDIR'], server ) +driver_dir = env['ADDON_DIR'] + "/" + drv = serverenv.SharedLibrary( 'jack_dummy', srcfiles_linux_dummy ) -serverenv.InstallAs( env['LIBDIR'] + '/jackmp/jack_dummy.so', drv ) +serverenv.InstallAs( driver_dir + "jack_dummy.so", drv ) if env['ENABLE_ALSA']: if not env.GetOption('clean'): serverenv.MergeFlags( env['ALSA_FLAGS'] ) drv = serverenv.SharedLibrary( 'jack_alsa', srcfiles_linux_alsa ) - serverenv.InstallAs( env['LIBDIR'] + '/jackmp/jack_alsa.so', drv ) + serverenv.InstallAs( driver_dir + "jack_alsa.so", drv ) if env['ENABLE_FREEBOB']: if not env.GetOption('clean'): serverenv.MergeFlags( env['FREEBOB_FLAGS'] ) drv = serverenv.SharedLibrary( 'jack_freebob', srcfiles_linux_freebob ) - serverenv.InstallAs( env['LIBDIR'] + '/jackmp/jack_freebob.so', drv ) + serverenv.InstallAs( driver_dir + "jack_freebob.so", drv ) if env['ENABLE_FIREWIRE']: if not env.GetOption('clean'): serverenv.MergeFlags( env['FFADO_FLAGS'] ) drv = serverenv.SharedLibrary( 'jack_firewire', srcfiles_linux_ffado ) - serverenv.InstallAs( env['LIBDIR'] + '/jackmp/jack_firewire.so', drv ) + serverenv.InstallAs( driver_dir + "jack_firewire.so", drv ) Index: linux/Makefile =================================================================== --- linux/Makefile (revision 762) +++ linux/Makefile (working copy) @@ -55,13 +55,13 @@ objects_linux_dummy := JackDummyDriver.o CFLAGS := -g -O3 -fPIC -DJACKMP -DUSE_POSIX_SHM $(addprefix -I, $(subprojects)) $(CFLAGS) -CXXFLAGS := -g -O3 -fPIC -DJACKMP -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)/bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) +CXXFLAGS := -g -O3 -fPIC -DJACKMP -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)/$(libdir)/jackmp\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)/bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) #CFLAGS := -g -fPIC -DUSE_POSIX_SHM $(addprefix -I, $(subprojects)) $(CFLAGS) -#CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)/bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) +#CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)/$(libdir)/jackmp\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)/bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) # Use this line to compile with POSIX names semaphore -#CXXFLAGS := -g -O3 -fPIC -DSOCKET_RPC_POSIX_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)/bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) +#CXXFLAGS := -g -O3 -fPIC -DSOCKET_RPC_POSIX_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)/$(libdir)/jackmp\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)/bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) all : $(TARGET_LINUX_SERVER_LIB) $(TARGET_LINUX_CLIENT_LIB) $(TARGET_LINUX_WRAPPER_LIB) \ $(TARGET_LINUX_SERVER) $(TARGET_LINUX_ALSA) $(TARGET_LINUX_DUMMY) \ Index: SConstruct =================================================================== --- SConstruct (revision 762) +++ SConstruct (working copy) @@ -59,6 +59,7 @@ BoolOption('BUILD_EXAMPLES', 'Build the example clients in their directory', True), BoolOption('INSTALL_EXAMPLES', 'Install the example clients in the BINDIR directory', True), BoolOption('BUILD_DOXYGEN_DOCS', 'Build doxygen documentation', False), + BoolOption('FULL_MIMIC', 'Mimic jack-1.0 installation layout as much as possible', False), ) # @@ -167,15 +168,31 @@ env.AppendUnique(CCFLAGS = ['-fPIC', '-DSOCKET_RPC_FIFO_SEMA', '-D__SMP__']) env.AppendUnique(CFLAGS = ['-fPIC', '-DUSE_POSIX_SHM']) +# used for alsa midi code, probably this define should be removed +env.AppendUnique(CFLAGS = ['-DJACKMP']) +env.AppendUnique(CPPFLAGS = ['-DJACKMP']) + env.Alias('install', env['LIBDIR']) env.Alias('install', env['INCLUDEDIR']) env.Alias('install', env['BINDIR']) +if env['FULL_MIMIC']: + env['SERVER'] = 'jackd' + env['CLIENTLIB'] = 'jack' + env['SERVERLIB'] = 'jackserver' + env['WRAPPERLIB'] = 'jackwrapper' + env['ADDON_DIR'] = env.subst(env['LIBDIR']) + "/jack" +else: + env['SERVER'] = 'jackdmp' + env['CLIENTLIB'] = 'jackmp' + env['SERVERLIB'] = 'jackservermp' + env['WRAPPERLIB'] = 'jackwrapper' + env['ADDON_DIR'] = env.subst(env['LIBDIR']) + "/jackmp" + # for config.h.in # TODO: Is that necessary ? -env['ADDON_DIR']='%s' % env['PREFIX'] env['LIB_DIR']='lib' -env['JACK_LOCATION']='%s' % env['BINDIR'] +env['JACK_LOCATION']=env.subst(env['BINDIR']) # To have the top_srcdir as the doxygen-script is used from auto* # TODO: Understand the previous comment Property changes on: admin ___________________________________________________________________ Name: svn:ignore + *.pyc Index: common/JackDriverLoader.cpp =================================================================== --- common/JackDriverLoader.cpp (revision 762) +++ common/JackDriverLoader.cpp (working copy) @@ -256,26 +256,21 @@ #endif int err; - /* char* driver_dir; - if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) { - driver_dir = ADDON_DIR; - } - */ + if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) { + // for WIN32 ADDON_DIR is defined in JackConstants.h as relative path + // for posix systems, it is absolute path of default driver dir #ifdef WIN32 - char* driver_dir = ADDON_DIR; - if (strcmp(ADDON_DIR, "") == 0) { char temp_driver_dir1[512]; char temp_driver_dir2[512]; GetCurrentDirectory(512, temp_driver_dir1); sprintf(temp_driver_dir2, "%s/%s", temp_driver_dir1, ADDON_DIR); driver_dir = temp_driver_dir2; - } #else - char driver_dir[512]; - snprintf(driver_dir, sizeof(driver_dir) - 1, "%s/%s/jackmp", ADDON_DIR, LIB_DIR); + driver_dir = ADDON_DIR; #endif + } filename = (char *)malloc(strlen (driver_dir) + 1 + strlen(sofile) + 1); sprintf (filename, "%s/%s", driver_dir, sofile); @@ -346,7 +341,8 @@ EXPORT JSList * jack_drivers_load (JSList * drivers) { - char driver_dir[512]; + char * driver_dir; + char driver_dir_storage[512]; char dll_filename[512]; WIN32_FIND_DATA filedata; HANDLE file; @@ -354,9 +350,16 @@ JSList * driver_list = NULL; jack_driver_desc_t * desc; - GetCurrentDirectory(512, driver_dir); + if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) { + // for WIN32 ADDON_DIR is defined in JackConstants.h as relative path + GetCurrentDirectory(512, driver_dir_storage); + strcat(driver_dir_storage, "/"); + strcat(driver_dir_storage, ADDON_DIR); + driver_dir = driver_dir_storage; + } - sprintf(dll_filename, "%s/%s", ADDON_DIR, "*.dll"); + sprintf(dll_filename, "%s/*.dll", driver_dir); + file = (HANDLE )FindFirstFile(dll_filename, &filedata); if (file == INVALID_HANDLE_VALUE) { @@ -400,14 +403,10 @@ JSList * driver_list = NULL; jack_driver_desc_t * desc; - /* char* driver_dir; if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) { - driver_dir = ADDON_DIR; + driver_dir = ADDON_DIR; } - */ - char driver_dir[512]; - snprintf(driver_dir, sizeof(driver_dir) - 1, "%s/%s/jackmp", ADDON_DIR, LIB_DIR); /* search through the driver_dir and add get descriptors from the .so files in it */ Index: common/JackError.c =================================================================== --- common/JackError.c (revision 762) +++ common/JackError.c (working copy) @@ -79,7 +79,7 @@ static void default_jack_error_callback(const char *desc) { fprintf(stderr, "%s\n", desc); - fflush(stdout); + fflush(stderr); } static void default_jack_info_callback (const char *desc) Index: common/SConscript =================================================================== --- common/SConscript (revision 762) +++ common/SConscript (working copy) @@ -41,11 +41,6 @@ # A symlinking command for our libraries' names symlinkcmd = 'ln -nsf $SOURCE.name $TARGET' -# Library names -clientlib_name = 'jackmp' -serverlib_name = 'jackservermp' -wrapperlib_name = 'jackwrapper' - # # Source files section # @@ -130,10 +125,11 @@ 'JackTools.cpp' ] -srcfiles_common_wrapperlib = [ - 'JackAPIWrapper.cpp', - 'ringbuffer.c' - ] +if not env['FULL_MIMIC']: + srcfiles_common_wrapperlib = [ + 'JackAPIWrapper.cpp', + 'ringbuffer.c' + ] jack_headers = [ 'intclient.h', @@ -153,14 +149,19 @@ # Libraries clientlib = env.SharedLibrary(env['CLIENTLIB'], srcfiles_common_clientlib) serverlib = env.SharedLibrary(env['SERVERLIB'], srcfiles_common_serverlib) -wrapperlib = env.SharedLibrary(env['WRAPPERLIB'], srcfiles_common_wrapperlib) -env.Install( env['LIBDIR'], [clientlib, serverlib, wrapperlib]) +env.Install( env['LIBDIR'], [clientlib, serverlib]) +if not env['FULL_MIMIC']: + wrapperlib = env.SharedLibrary(env['WRAPPERLIB'], srcfiles_common_wrapperlib) + env.Install( env['LIBDIR'], [wrapperlib]) env.Alias('install', env['LIBDIR']) # Handle the way we name libraries on a POSIX system # TODO: this is not quite clean yet. changing the library version is a pain we'll need a nicer loop and a config value somewhere if env['PLATFORM'] == 'posix': - for lib_name, lib in [(env['CLIENTLIB'], clientlib), (env['SERVERLIB'], serverlib), (env['WRAPPERLIB'], wrapperlib)]: + libs = [(env['CLIENTLIB'], clientlib), (env['SERVERLIB'], serverlib)] + if not env['FULL_MIMIC']: + libs.append((env['WRAPPERLIB'], wrapperlib)) + for lib_name, lib in libs: env.Command('#/common/lib' + lib_name + '.so.0', lib, symlinkcmd) env.Command('#/common/lib' + lib_name + '.so', '#/common/lib'+lib_name+'.so.0', symlinkcmd) env.Command(env['LIBDIR'] + '/lib' + lib_name + '.so.0', env['LIBDIR'] + '/lib' + lib_name + '.so.0.0', symlinkcmd) Index: example-clients/SConscript =================================================================== --- example-clients/SConscript (revision 762) +++ example-clients/SConscript (working copy) @@ -74,5 +74,5 @@ for example_lib, example_lib_source in example_libs.items(): lib = clientenv.SharedLibrary(example_lib, example_lib_source) if clientenv['INSTALL_EXAMPLES']: - clientenv.InstallAs(clientenv['LIBDIR'] + '/jackmp/' + example_lib + '.so', lib) - clientenv.Alias('install', clientenv['LIBDIR'] + '/jackmp/' + example_lib + '.so') + clientenv.InstallAs(clientenv['ADDON_DIR'] + '/' + example_lib + '.so', lib) + clientenv.Alias('install', clientenv['ADDON_DIR'] + '/' + example_lib + '.so') Index: macosx/SConscript =================================================================== --- macosx/SConscript (revision 762) +++ macosx/SConscript (working copy) @@ -46,11 +46,11 @@ serverenv.PrependUnique( LIBPATH=env['build_base'] ) serverenv.PrependUnique( LIBS=[env['SERVERLIB'], 'dl'] ) -server = serverenv.Program('jackdmp', srcfiles_macosx_server) +server = serverenv.Program(env['SERVER'], srcfiles_macosx_server) serverenv.Install( env['BINDIR'], server ) drv = serverenv.SharedLibrary( 'jack_dummy', srcfiles_macosx_dummy ) -serverenv.InstallAs( env['LIBDIR']+ '/jackmp/jack_dummy.so', drv ) +serverenv.InstallAs( env['ADDON_DIR']+ '/jack_dummy.so', drv ) drv = serverenv.SharedLibrary( 'jack_coreaudio', srcfiles_macosx_coreaudio ) -serverenv.InstallAs( env['LIBDIR']+ '/jackmp/jack_coreaudio.so', drv ) +serverenv.InstallAs( env['ADDON_DIR']+ '/jack_coreaudio.so', drv ) Index: macosx/Jackdmp.xcodeproj/project.pbxproj =================================================================== --- macosx/Jackdmp.xcodeproj/project.pbxproj (revision 762) +++ macosx/Jackdmp.xcodeproj/project.pbxproj (working copy) @@ -5838,7 +5838,7 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)", ); OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -5899,7 +5899,7 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)", ); OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -5952,7 +5952,7 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)", ); OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -6012,8 +6012,8 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)", "$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)", ); - OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\""; OTHER_LDFLAGS = ( "-framework", @@ -6074,8 +6074,8 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)", "$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)", ); - OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\""; OTHER_LDFLAGS = ( "-framework", @@ -6128,8 +6128,8 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)", "$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)", ); - OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\""; OTHER_LDFLAGS = ( "-framework", @@ -9330,7 +9330,7 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)", ); OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -9389,7 +9389,7 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)", ); OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -9440,7 +9440,7 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)", ); OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -9498,8 +9498,8 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)", "$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)", ); - OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\""; OTHER_LDFLAGS = ( "-framework", @@ -9558,8 +9558,8 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)", "$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)", ); - OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\""; OTHER_LDFLAGS = ( "-framework", @@ -9610,8 +9610,8 @@ "$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)", "$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)", ); - OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\""; - OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; + OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\""; OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\""; OTHER_LDFLAGS = ( "-framework",