diff options
| author | S. Davilla <davilla@4pi.com> | 2011-03-09 00:04:18 -0500 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-03-09 00:23:03 -0500 |
| commit | 7f09c04d325765d51554697ed67117d2612156c1 (patch) | |
| tree | ec4342a5ea605ea303f54d0dfbcac19f961bae1d /lib/vgmstream | |
| parent | b27f04cca4c421ae53e242884a3f0d4f5e8e6930 (diff) | |
[darwin] changed, replace wrapping with wrapper.rb with linker alias_list
Diffstat (limited to 'lib/vgmstream')
| -rw-r--r-- | lib/vgmstream/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/vgmstream/Makefile.in b/lib/vgmstream/Makefile.in index 9db00ba6cb..0d5cfad179 100644 --- a/lib/vgmstream/Makefile.in +++ b/lib/vgmstream/Makefile.in @@ -1,8 +1,9 @@ ARCH=@ARCH@ +SYSROOT=@SYSROOT@ ifeq ($(findstring osx,$(ARCH)), osx) - CFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC - CXXFLAGS +=-D_LINUX -fPIC -DPIC -O3 -DXBMC + CFLAGS +=-fms-extensions -D_LINUX -O3 -DXBMC + CXXFLAGS +=-fms-extensions -D_LINUX -O3 -DXBMC else CFLAGS +=-D_LINUX -fPIC -DXBMC CXXFLAGS +=-D_LINUX -fPIC -DXBMC @@ -195,9 +196,9 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/vgmstream-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - ld -bundle -flat_namespace -undefined suppress -o $@ $(OBJS) $(BUNDLE1_O) - @abs_top_srcdir@/tools/Mach5/wrapper.rb $@;mv output.so $@ - chmod +x $@ + $(CXX) $(SYSROOT) -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 |