diff options
Diffstat (limited to 'lib')
20 files changed, 65 insertions, 60 deletions
diff --git a/lib/addons/library.xbmc.addon/Makefile.in b/lib/addons/library.xbmc.addon/Makefile.in index b9d327d6cc..92094a0a82 100644 --- a/lib/addons/library.xbmc.addon/Makefile.in +++ b/lib/addons/library.xbmc.addon/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc +INCLUDES=-I. -I../../../src/addons/include -I../../../src DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_addon @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.addon/libXBMC_addon.cpp b/lib/addons/library.xbmc.addon/libXBMC_addon.cpp index 4dd4d5be9d..2c695b65bc 100644 --- a/lib/addons/library.xbmc.addon/libXBMC_addon.cpp +++ b/lib/addons/library.xbmc.addon/libXBMC_addon.cpp @@ -22,9 +22,9 @@ #include <stdlib.h> #include <stdarg.h> #include <string> -#include "../../../xbmc/addons/include/xbmc_addon_types.h" +#include "../../../src/addons/include/xbmc_addon_types.h" #include "../../../addons/library.xbmc.addon/libXBMC_addon.h" -#include "../../../xbmc/addons/AddonCallbacks.h" +#include "../../../src/addons/AddonCallbacks.h" #ifdef _WIN32 #include <windows.h> diff --git a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj index 41120beff3..917d09d501 100644 --- a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj +++ b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj @@ -50,7 +50,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src\addons\include;..\..\..\..\..\src\addons;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> @@ -62,7 +62,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src\addons\include;..\..\..\..\..\src\addons;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> diff --git a/lib/addons/library.xbmc.codec/Makefile.in b/lib/addons/library.xbmc.codec/Makefile.in index 505c08f742..83a6b5062e 100644 --- a/lib/addons/library.xbmc.codec/Makefile.in +++ b/lib/addons/library.xbmc.codec/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../xbmc/addons/include +INCLUDES=-I. -I../../../src/addons/include DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_codec @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj index 67f6c384d9..6519a33f81 100644 --- a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj +++ b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj @@ -50,7 +50,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> @@ -62,7 +62,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> diff --git a/lib/addons/library.xbmc.gui/Makefile.in b/lib/addons/library.xbmc.gui/Makefile.in index 8a75239d46..2f5615f8c4 100644 --- a/lib/addons/library.xbmc.gui/Makefile.in +++ b/lib/addons/library.xbmc.gui/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers +INCLUDES=-I. -I../../../src/addons/include -I../../../src -I../../../src/cores/dvdplayer/DVDDemuxers DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_gui @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj index fa88231678..edd17d5e5e 100644 --- a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj +++ b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj @@ -50,7 +50,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> @@ -62,7 +62,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> diff --git a/lib/addons/library.xbmc.pvr/Makefile.in b/lib/addons/library.xbmc.pvr/Makefile.in index 8c10e0d5b3..96f37138a5 100644 --- a/lib/addons/library.xbmc.pvr/Makefile.in +++ b/lib/addons/library.xbmc.pvr/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers +INCLUDES=-I. -I../../../src/addons/include -I../../../src -I../../../src/cores/dvdplayer/DVDDemuxers DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_pvr @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj index b5da9b99d2..87dd972071 100644 --- a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj +++ b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj @@ -50,7 +50,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> @@ -62,7 +62,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>Sync</ExceptionHandling> <PrecompiledHeader> diff --git a/lib/asap/Makefile.in b/lib/asap/Makefile.in index 7e6df0dd82..782c46d1d1 100644 --- a/lib/asap/Makefile.in +++ b/lib/asap/Makefile.in @@ -19,7 +19,7 @@ XMMS_INPUT_PLUGIN_DIR = `xmms-config --input-plugin-dir` XMMS_USER_PLUGIN_DIR = $(HOME)/.xmms/Plugins MOC_INCLUDE = ../moc-2.4.4 MOC_PLUGIN_DIR = /usr/local/lib/moc/decoder_plugins -XBMC_DLL_LOADER_EXPORTS = @abs_top_srcdir@/xbmc/cores/DllLoader/exports +XBMC_DLL_LOADER_EXPORTS = @abs_top_srcdir@/src/cores/DllLoader/exports COMMON_C = asap.c acpu.c apokeysnd.c COMMON_H = asap.h asap_internal.h anylang.h players.h @@ -51,8 +51,8 @@ libasap_decoder.so: moc/libasap_decoder.c $(COMMON_C) $(COMMON_H) asap-xbmc: mads/mads xasm/xasm @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so -xbmc/xbmc_asap.o: xbmc/xbmc_asap.c - $(CC) -I. -O2 -o $@ -c xbmc/xbmc_asap.c +src/xbmc_asap.o: src/xbmc_asap.c + $(CC) -I. -O2 -o $@ -c src/xbmc_asap.c asap.o: asap.c $(COMMON_H) $(CC) -I. -O2 -o $@ -c asap.c @@ -63,8 +63,8 @@ acpu.o: acpu.c $(COMMON_H) apokeysnd.o: apokeysnd.c $(CC) -I. -O2 -o $@ -c apokeysnd.c -@abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so: xbmc/xbmc_asap.o $(COMMON_O) $(COMMON_H) - $(CC) -shared -fPIC -o $@ -I. xbmc/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O) +@abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so: src/xbmc_asap.o $(COMMON_O) $(COMMON_H) + $(CC) -shared -fPIC -o $@ -I. src/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O) players.h: files2anylang.pl $(PLAYERS_OBX) $(PERL) files2anylang.pl $(PLAYERS_OBX) >$@ @@ -149,7 +149,7 @@ players-clean: distclean: clean clean: players-clean - $(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so players.h xbmc/xbmc_asap.o + $(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so players.h src/xbmc_asap.o README.html: README INSTALL NEWS CREDITS $(ASCIIDOC) -o $@ -a asapsrc -a asapports README diff --git a/lib/cmyth/Win32/libcmyth.vcxproj b/lib/cmyth/Win32/libcmyth.vcxproj index d075528131..0e9428e57f 100644 --- a/lib/cmyth/Win32/libcmyth.vcxproj +++ b/lib/cmyth/Win32/libcmyth.vcxproj @@ -53,7 +53,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../xbmc/win32</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../src/win32</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_LIB;inline=__inline;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> @@ -85,7 +85,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../xbmc/win32</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../src/win32</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_LIB;inline=__inline;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in index 54387cc99a..44aa4d38f5 100644 --- a/lib/libdvd/Makefile.in +++ b/lib/libdvd/Makefile.in @@ -8,8 +8,8 @@ SOS= libdvdnav-$(ARCH).so DIRS= libdvdread \ libdvdnav -WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias +WRAPPER=@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o +WRAPPER_MACH_ALIAS=@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias ifeq ($(findstring osx,$(ARCH)),osx) LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress diff --git a/lib/libexif/Makefile.in b/lib/libexif/Makefile.in index cab9560dd1..0a45c3bf90 100644 --- a/lib/libexif/Makefile.in +++ b/lib/libexif/Makefile.in @@ -10,12 +10,12 @@ SLIB=@abs_top_srcdir@/system/$(SO) $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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@/src/cores/DllLoader/exports/wrapper.o $(OBJS) else $(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 + `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/libhdhomerun/Makefile.in b/lib/libhdhomerun/Makefile.in index ce909c17ca..da8f38ed4f 100644 --- a/lib/libhdhomerun/Makefile.in +++ b/lib/libhdhomerun/Makefile.in @@ -20,13 +20,13 @@ SLIB=$(SYSDIR)/$(SO) $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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@/src/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all -lm \ - `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \ - @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` \ + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o endif hdhomerun_dll : $(OBJS) diff --git a/lib/libsidplay2/Makefile.in b/lib/libsidplay2/Makefile.in index 5dda4c9328..cc1c6f5ffa 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 -fPIC + -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC CFLAGS += $(SIDFLAGS) CXXFLAGS += $(SIDFLAGS) ifeq ($(ARCH), powerpc-osx) @@ -54,13 +54,18 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else - $(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 + $(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 endif include @abs_top_srcdir@/Makefile.include +%.o: %.cpp + @rm -f $@ + $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \ + && $(GEN_DEPS) + diff --git a/lib/nosefart/Makefile.in b/lib/nosefart/Makefile.in index 0da88b6a76..453d1c4824 100644 --- a/lib/nosefart/Makefile.in +++ b/lib/nosefart/Makefile.in @@ -27,12 +27,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/nosefart-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all -lm \ - `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/snesapu/SNES/SNESAPU/Makefile.in b/lib/snesapu/SNES/SNESAPU/Makefile.in index 89c9955851..7d23efca46 100644 --- a/lib/snesapu/SNES/SNESAPU/Makefile.in +++ b/lib/snesapu/SNES/SNESAPU/Makefile.in @@ -17,12 +17,12 @@ SLIB=$(SYSDIR)/$(SO) $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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@/src/cores/DllLoader/exports/wrapper.o $(OBJS) else $(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 + `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o endif %o : %Asm diff --git a/lib/stsound/StSoundLibrary/Makefile.in b/lib/stsound/StSoundLibrary/Makefile.in index 595cf8711b..c190180184 100644 --- a/lib/stsound/StSoundLibrary/Makefile.in +++ b/lib/stsound/StSoundLibrary/Makefile.in @@ -20,12 +20,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/stsoundlibrary-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else $(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 + `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/timidity/Makefile.in b/lib/timidity/Makefile.in index 3e33e8926c..94c60617d7 100644 --- a/lib/timidity/Makefile.in +++ b/lib/timidity/Makefile.in @@ -53,11 +53,11 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/timidity-@ARCH@.so $(SLIB): $(OBJS) exports.def 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) $(BUNDLE1_O) + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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) else - $(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 -Wl,--version-script=exports.def + $(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 -Wl,--version-script=exports.def endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/vgmstream/Makefile.in b/lib/vgmstream/Makefile.in index edbaceff23..3455459902 100644 --- a/lib/vgmstream/Makefile.in +++ b/lib/vgmstream/Makefile.in @@ -195,12 +195,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/vgmstream-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/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) + @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else $(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 + `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o endif |