aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorbeenje <beenje@xbmc.org>2011-05-01 14:42:47 +0200
committerbeenje <beenje@xbmc.org>2011-05-02 23:00:49 +0200
commitd493b3b6375b127720b9a09fdf7e9cd410c0c4f4 (patch)
treef609633897d67a07e0a1a863e52ee5cdadc39687 /lib
parent3ffe5659769242c9e54c2d83c43632ba36735c0a (diff)
[osx] cross-compile powerpc-osx
Diffstat (limited to 'lib')
-rw-r--r--lib/cmyth/Makefile.in2
-rw-r--r--lib/libdvd/Makefile.in5
-rw-r--r--lib/libsidplay2/Makefile.in3
-rw-r--r--lib/nosefart/Makefile.in3
-rw-r--r--lib/stsound/StSoundLibrary/Makefile.in3
-rw-r--r--lib/timidity/Makefile.in3
-rw-r--r--lib/vgmstream/Makefile.in3
-rw-r--r--lib/xbadpcm/Makefile.in3
8 files changed, 9 insertions, 16 deletions
diff --git a/lib/cmyth/Makefile.in b/lib/cmyth/Makefile.in
index 2002ded8d1..325106a07d 100644
--- a/lib/cmyth/Makefile.in
+++ b/lib/cmyth/Makefile.in
@@ -12,7 +12,7 @@ all: $(CMYTH_LIB)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CMYTH_LIB): libcmyth/libcmyth.a librefmem/librefmem.a
- $(CC) $(SYSROOT) $(LDFLAGS) -bundle -o $@ @MYSQL_LIBS@ \
+ $(CC) $(LDFLAGS) -bundle -o $@ @MYSQL_LIBS@ \
-Wl,-all_load libcmyth/libcmyth.a librefmem/librefmem.a
else
$(CMYTH_LIB): libcmyth/libcmyth.a librefmem/librefmem.a
diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
index 8ada35cbee..0e36a6a080 100644
--- a/lib/libdvd/Makefile.in
+++ b/lib/libdvd/Makefile.in
@@ -1,6 +1,5 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CC=@CC@
CXX=@CXX@
@@ -46,11 +45,11 @@ all: $(SLIB)
ifeq ($(findstring osx,$(ARCH)), osx)
$(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
- $(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
+ $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
+ $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
else
diff --git a/lib/libsidplay2/Makefile.in b/lib/libsidplay2/Makefile.in
index eddf8cb854..77a7846267 100644
--- a/lib/libsidplay2/Makefile.in
+++ b/lib/libsidplay2/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CFLAGS +=-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
-DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \
@@ -54,7 +53,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so
$(SLIB): $(OBJS) @abs_top_srcdir@/xbmc/linux/XHandle.o
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CXX) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) @abs_top_srcdir@/xbmc/linux/XHandle.o $(BUNDLE1_O)
else
diff --git a/lib/nosefart/Makefile.in b/lib/nosefart/Makefile.in
index 2d0fe71a75..edbaaa93b1 100644
--- a/lib/nosefart/Makefile.in
+++ b/lib/nosefart/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CFLAGS +=-D_LINUX -fPIC -DNSF_PLAYER
CXXFLAGS +=-D_LINUX -fPIC -DNSF_PLAYER
@@ -28,7 +27,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/nosefart-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CC) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
diff --git a/lib/stsound/StSoundLibrary/Makefile.in b/lib/stsound/StSoundLibrary/Makefile.in
index b75fda3ea5..0f30a115d4 100644
--- a/lib/stsound/StSoundLibrary/Makefile.in
+++ b/lib/stsound/StSoundLibrary/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CFLAGS +=-D_LINUX -fPIC
CXXFLAGS +=-D_LINUX -fPIC
@@ -21,7 +20,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/stsoundlibrary-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CXX) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
diff --git a/lib/timidity/Makefile.in b/lib/timidity/Makefile.in
index fa9f20806b..fef6e28fce 100644
--- a/lib/timidity/Makefile.in
+++ b/lib/timidity/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CFLAGS+=-D_LINUX -fPIC -DHAVE_GETTIMEOFDAY -I. -Itimidity -Ilibarc -Iutils
ifeq ($(ARCH), powerpc-osx)
@@ -54,7 +53,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/timidity-@ARCH@.so
$(SLIB): $(OBJS) exports.def
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CXX) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias -bundle \
+ $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias -bundle \
-undefined dynamic_lookup -read_only_relocs suppress -o $@ @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
diff --git a/lib/vgmstream/Makefile.in b/lib/vgmstream/Makefile.in
index 0d5cfad179..361a4cb42e 100644
--- a/lib/vgmstream/Makefile.in
+++ b/lib/vgmstream/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
ifeq ($(findstring osx,$(ARCH)), osx)
CFLAGS +=-fms-extensions -D_LINUX -O3 -DXBMC
@@ -196,7 +195,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/vgmstream-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CXX) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
diff --git a/lib/xbadpcm/Makefile.in b/lib/xbadpcm/Makefile.in
index 20807fd9e5..894146c771 100644
--- a/lib/xbadpcm/Makefile.in
+++ b/lib/xbadpcm/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
OBJS=uXboxAdpcmDecoder.o ADPCMDll.o
CFLAGS +=-D_LINUX -fPIC
CXXFLAGS += -D_LINUX -fPIC
@@ -8,7 +7,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/adpcm-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CC) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o *.o $(BUNDLE1_O)
chmod +x $@