diff options
| author | Jim Carroll <thecarrolls@jiminger.com> | 2011-07-19 08:46:23 -0400 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2011-07-20 00:58:29 -0400 |
| commit | a808c55feee89cb8b8c0a9e1a7541d9ebc4f2f97 (patch) | |
| tree | b2c0ea4466647b70ee9d53f785974b5e8f663d7a /lib/libsidplay2 | |
| parent | c2c3be2c3c1e01fc3bb53125dcf1eb15a4d90293 (diff) | |
Updated libsidplay2 Makefile to fix an include file name collision.
Diffstat (limited to 'lib/libsidplay2')
| -rw-r--r-- | lib/libsidplay2/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libsidplay2/Makefile.in b/lib/libsidplay2/Makefile.in index 77a7846267..86a33e745c 100644 --- a/lib/libsidplay2/Makefile.in +++ b/lib/libsidplay2/Makefile.in @@ -51,13 +51,13 @@ OBJS=builders/resid-builder/src/resid-builder.o \ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so -$(SLIB): $(OBJS) @abs_top_srcdir@/xbmc/linux/XHandle.o +$(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) $(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) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) @abs_top_srcdir@/xbmc/linux/XHandle.o `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o + $(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 endif include @abs_top_srcdir@/Makefile.include |