diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2014-12-16 12:21:41 +0100 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2014-12-16 12:21:41 +0100 |
| commit | 1eb76885b36989a62737cdfb35a20954feb5b6b9 (patch) | |
| tree | 8ed135fbac9d3e4e45d48244445848fd576990ae /lib/libsidplay2 | |
| parent | 7c97b3358ec978d510b53eed8d5cca64d5c39c36 (diff) | |
Revert "change xbmc/ path to src/ in all files"
This reverts commit 4949be256667f3e500e52b7084476ae1f2b00d92.
Diffstat (limited to 'lib/libsidplay2')
| -rw-r--r-- | lib/libsidplay2/Makefile.in | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/libsidplay2/Makefile.in b/lib/libsidplay2/Makefile.in index cc1c6f5ffa..5dda4c9328 100644 --- a/lib/libsidplay2/Makefile.in +++ b/lib/libsidplay2/Makefile.in @@ -3,7 +3,7 @@ ARCH=@ARCH@ SIDFLAGS =-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \ -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \ -Ibuilders/resid-builder/include/sidplay/builders \ - -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC + -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -fPIC CFLAGS += $(SIDFLAGS) CXXFLAGS += $(SIDFLAGS) ifeq ($(ARCH), powerpc-osx) @@ -54,18 +54,13 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else - $(SILENT_CPP) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ + `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 -%.o: %.cpp - @rm -f $@ - $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \ - && $(GEN_DEPS) - |