Skip to content
Browse files

do not use flat_name space when making bundles that we wrap/alias

  • Loading branch information...
1 parent a781d7a commit 1e32fe436ab4cd6a9ade153ef7fc57d0a7de764d @davilla davilla committed
View
2 lib/libass/xbmc/Makefile.in
@@ -13,7 +13,7 @@ DIRS=..
ifeq ($(findstring osx,$(ARCH)), osx)
$(SLIB): ../libass/.libs/libass.dylib
$(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,../../../xbmc/cores/DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress \
-lfontconfig -o $@ ../../../xbmc/cores/DllLoader/exports/wrapper.o ../libass/.libs/*.o
../libass/.libs/libass.dylib: compile
View
2 xbmc/cores/dvdplayer/Codecs/Makefile.in
@@ -10,7 +10,7 @@ ifeq ($(findstring osx,$(ARCH)),osx)
ifeq ($(findstring arm,$(ARCH)),arm)
LDFLAGS=-arch armv7 -iphoneos_version_min 4.1 -bundle -undefined dynamic_lookup -read_only_relocs suppress
else
-LDFLAGS=-bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress
+LDFLAGS=-bundle -undefined dynamic_lookup -read_only_relocs suppress
endif
else
LDFLAGS=-shared -fPIC -rdynamic
View
2 xbmc/cores/paplayer/ADPCMCodec/Makefile.in
@@ -10,7 +10,7 @@ SLIB=../../../../system/players/paplayer/adpcm-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CC) $(SYSROOT) -Wl,-alias_list,../../DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
../../DllLoader/exports/wrapper.o *.o $(BUNDLE1_O)
else
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
View
2 xbmc/cores/paplayer/FLACCodec/Makefile.in
@@ -13,7 +13,7 @@ all: $(FLAC_LIB)
ifeq ($(findstring osx,$(ARCH)), osx)
$(FLAC_LIB): flac-1.2.1/src/libFLAC/.libs/libFLAC.a
- $(CC) $(SYSROOT) -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -fPIC \
+ $(CC) $(SYSROOT) -bundle -undefined dynamic_lookup -read_only_relocs suppress -fPIC \
-alias_list $(WRAPPER_MACH_ALIAS) \
-o $@ ../../DllLoader/exports/wrapper.o flac-1.2.1/src/libFLAC/.libs/*.o
else
View
2 xbmc/cores/paplayer/NSFCodec/Makefile.in
@@ -18,7 +18,7 @@ SLIB=../../../../system/players/paplayer/nosefart-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CC) $(SYSROOT) -Wl,-alias_list,../../DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
../../DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
View
2 xbmc/cores/paplayer/SIDCodec/Makefile.in
@@ -13,7 +13,7 @@ SLIB=../../../../system/players/paplayer/libsidplay2-@ARCH@.so
$(SLIB): $(OBJS) ../../../linux/XHandle.o
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CXX) $(SYSROOT) -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ $(CXX) $(SYSROOT) -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
$(OBJS) ../../../linux/XHandle.o $(BUNDLE1_O)
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
View
2 xbmc/cores/paplayer/WavPackCodec/Makefile.in
@@ -11,7 +11,7 @@ SLIB=../../../../system/players/paplayer/wavpack-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CC) $(SYSROOT) -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ $(OBJS) $(BUNDLE1_O)
+ $(CC) $(SYSROOT) -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ $(OBJS) $(BUNDLE1_O)
../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
chmod +x $@
else
View
2 xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in
@@ -15,7 +15,7 @@ SLIB=../../../../../system/players/paplayer/stsoundlibrary-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(SYSROOT) -Wl,-alias_list,../../../DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
../../../DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
View
2 xbmc/cores/paplayer/timidity/Makefile.in
@@ -54,7 +54,7 @@ SLIB=../../../../system/players/paplayer/timidity-@ARCH@.so
$(SLIB): $(OBJS) exports.def
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CXX) $(SYSROOT) -Wl,-alias_list,../../DllLoader/exports/wrapper_mach_alias -bundle -flat_namespace \
+ $(CXX) $(SYSROOT) -Wl,-alias_list,../../DllLoader/exports/wrapper_mach_alias -bundle \
-undefined dynamic_lookup -read_only_relocs suppress -o $@ ../../DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
View
2 xbmc/cores/paplayer/vgmstream/Makefile.in
@@ -197,7 +197,7 @@ SLIB=../../../../system/players/paplayer/vgmstream-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(SYSROOT) -Wl,-alias_list,../../DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
../../DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
View
2 xbmc/lib/cximage-6.0/Makefile.in
@@ -18,7 +18,7 @@ endif
$(SLIB): $(SLIBS)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(LDFLAGS) -Wl,-alias_list,../../cores/DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -lpng -lz -o $@ \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -lpng -lz -o $@ \
../../cores/DllLoader/exports/wrapper.o CxImage/*.o jasper/*/*.o jbig/*.o jpeg/*.o raw/*.o tiff/*.o
chmod +x $@
else
View
2 xbmc/lib/libPython/linux/Makefile.in
@@ -80,7 +80,7 @@ $(SLIB): $(PYWRAP) ../Python/libpython2.4.a $(PYO) ../../../../tools/Mach5/wrapp
@rm -rf tmp
else
$(SLIB): $(PYWRAP)
- $(CC) $(LDFLAGS) -bundle -flat_namespace -undefined dynamic_lookup -o $@ \
+ $(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup -o $@ \
-l$(PYVERSION) wrapper_python.o
endif
View
2 xbmc/lib/libexif/Makefile.in
@@ -11,7 +11,7 @@ SLIB=../../../system/$(SO)
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(LDFLAGS) -Wl,-alias_list,../../cores/DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
../../cores/DllLoader/exports/wrapper.o $(OBJS)
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) \
View
2 xbmc/lib/libhdhomerun/Makefile.in
@@ -21,7 +21,7 @@ SLIB=$(SYSDIR)/$(SO)
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CC) $(LDFLAGS) -Wl,-alias_list,../../cores/DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
../../cores/DllLoader/exports/wrapper.o $(OBJS)
else
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ `cat ../../cores/DllLoader/exports/wrapper.def` \
View
2 xbmc/lib/libid3tag/Makefile.in
@@ -11,7 +11,7 @@ CLEAN_FILES=libid3tag/compat.c libid3tag/frametype.c
ifeq ($(findstring osx,$(ARCH)), osx)
$(SLIB): libid3tag/.libs/libid3tag.dylib
$(CXX) $(LDFLAGS) -Wl,-alias_list,../../cores/DllLoader/exports/wrapper_mach_alias \
- -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -fPIC \
+ -bundle -undefined dynamic_lookup -read_only_relocs suppress -fPIC \
-o $@ ../../cores/DllLoader/exports/wrapper.o libid3tag/.libs/*.o
else
$(SLIB): libid3tag/.libs/libid3tag.so

0 comments on commit 1e32fe4

Please sign in to comment.
Something went wrong with that request. Please try again.