repositories
/
deb_shairplay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba0970e
)
Rename libairplay to libshairplay to avoid confusion with Apple.
author
Juho Vähä-Herttua
<juhovh@iki.fi>
Sun, 18 Mar 2012 12:04:41 +0000
(14:04 +0200)
committer
Juho Vähä-Herttua
<juhovh@iki.fi>
Wed, 16 May 2012 21:33:31 +0000
(
00:33
+0300)
src/SConscript
patch
|
blob
|
blame
|
history
diff --git
a/src/SConscript
b/src/SConscript
index c5634988dcb7164b2f643ff6011d26af76abd377..181b4d82ad8f60ded90de05cf903922915422e53 100644
(file)
--- a/
src/SConscript
+++ b/
src/SConscript
@@
-22,8
+22,8
@@
else:
# Compile the static library into lib directory and shared library
# for the bindings
if not libenv['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME']:
# Compile the static library into lib directory and shared library
# for the bindings
if not libenv['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME']:
- libenv.Library('airplay', libobj, install=False)
-libenv.SharedLibrary('airplay', shlibobj, install=False)
+ libenv.Library('
sh
airplay', libobj, install=False)
+libenv.SharedLibrary('
sh
airplay', shlibobj, install=False)
# If we want to create universal binaries of the dynamic library on Mac, do it here
if GetOption('universal'):
# If we want to create universal binaries of the dynamic library on Mac, do it here
if GetOption('universal'):
@@
-34,17
+34,17
@@
if GetOption('universal'):
libenv32.Append(LINKFLAGS = ['-undefined', 'dynamic_lookup'])
libenv32.Append(LINKFLAGS = ['-arch', 'i386'])
libenv32.Append(LINKFLAGS = ['-undefined', 'dynamic_lookup'])
libenv32.Append(LINKFLAGS = ['-arch', 'i386'])
- libenv32.Append(LINKFLAGS = ['-install_name', 'libairplay32.dylib'])
- libenv32.SharedLibrary('airplay32', shlibobj, install=False)
+ libenv32.Append(LINKFLAGS = ['-install_name', 'lib
sh
airplay32.dylib'])
+ libenv32.SharedLibrary('
sh
airplay32', shlibobj, install=False)
libenv64.Append(LINKFLAGS = ['-undefined', 'dynamic_lookup'])
libenv64.Append(LINKFLAGS = ['-arch', 'x86_64'])
libenv64.Append(LINKFLAGS = ['-undefined', 'dynamic_lookup'])
libenv64.Append(LINKFLAGS = ['-arch', 'x86_64'])
- libenv64.Append(LINKFLAGS = ['-install_name', 'libairplay64.dylib'])
- libenv64.SharedLibrary('airplay64', shlibobj, install=False)
+ libenv64.Append(LINKFLAGS = ['-install_name', 'lib
sh
airplay64.dylib'])
+ libenv64.SharedLibrary('
sh
airplay64', shlibobj, install=False)
libenv.Append(LINKFLAGS = ['-undefined', 'dynamic_lookup'])
libenv.Append(LINKFLAGS = ['-arch', 'i386', '-arch', 'x86_64'])
libenv.Append(LINKFLAGS = ['-undefined', 'dynamic_lookup'])
libenv.Append(LINKFLAGS = ['-arch', 'i386', '-arch', 'x86_64'])
- libenv.Append(LINKFLAGS = ['-install_name', 'libairplay.dylib'])
+ libenv.Append(LINKFLAGS = ['-install_name', 'lib
sh
airplay.dylib'])
# Set up the environment for compiling the examples
appenv = env.Clone()
# Set up the environment for compiling the examples
appenv = env.Clone()
@@
-52,7
+52,7
@@
conf = Configure(appenv)
conf.CheckLib('pthread')
appenv = conf.Finish()
appenv.Append(LIBPATH = ['.'])
conf.CheckLib('pthread')
appenv = conf.Finish()
appenv.Append(LIBPATH = ['.'])
-appenv.Prepend(LIBS = ['airplay'])
+appenv.Prepend(LIBS = ['
sh
airplay'])
exampleobj = appenv.Object(['test/example.c'])
appenv.Program('example', exampleobj, install=False)
exampleobj = appenv.Object(['test/example.c'])
appenv.Program('example', exampleobj, install=False)