Commit 88c195d4 authored by sletz's avatar sletz
Browse files

Correct wscript for jack_disconnect installation, various renaming.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3117 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 196afce5
......@@ -30,9 +30,6 @@ def create_jack_process_obj(bld, target, sources, uselib = None):
process.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
#process.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
process.env.append_value("LINKFLAGS", "")
#steph
#process.inst_var = bld.env['ADDON_DIR']
#process.inst_dir = '/'
process.install_path = '${ADDON_DIR}/'
process.uselib_local = uselib.name
return process
......@@ -231,6 +228,4 @@ def build(bld):
'JACK_VERSION': bld.env['JACK_VERSION'],
}
obj.install_path = '${PREFIX}/lib/pkgconfig/'
#steph
#obj.fun = subst_func # @VAR@ -> ${VAR}
obj.fun = misc.subst_func
......@@ -19,7 +19,7 @@ example_programs = {
'jack_evmon' : 'evmon.c',
'jack_monitor_client' : 'monitor_client.c',
'jack_thru' : 'thru_client.c',
'jack_server_control' : 'jack_server_control.cpp',
'jack_server_control' : 'server_control.cpp',
}
example_libs = {
......@@ -112,6 +112,6 @@ def build(bld):
lib.uselib_local = 'serverlib'
lib.install_path = '${ADDON_DIR}/'
bld.symlink_as('${PREFIX}/jack_connect', 'bin/jack_disconnect')
bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect')
bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0755)
......@@ -23,9 +23,6 @@ def create_jack_audio_driver_obj(bld, target, sources, uselib = None):
driver.includes = ['.', '../macosx', '../posix', '../common', '../common/jack']
driver.target = target
driver.source = sources
#steph
#driver.inst_var = bld.env['ADDON_DIR']
#driver.inst_dir = '/'
driver.install_path = '${ADDON_DIR}/'
driver.uselib_local = 'serverlib'
driver.env.append_value("LINKFLAGS", "-framework CoreAudio -framework CoreServices -framework AudioUnit")
......
......@@ -9,7 +9,7 @@ test_programs = {
'jack_test': ['jack_test.cpp'],
'jack_cpu': ['jack_cpu.c'],
'jdelay': ['jdelay.cpp'],
'multiple_metro' : ['external_metro.cpp'],
'jack_multiple_metro' : ['external_metro.cpp'],
}
def build(bld):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment