[FreeBSD] move FreeBSDGNUReplacements to a freebsd folder

xbmc · May 7, 2012 · 16ffcc3 · 16ffcc3
1 parent d680135
commit 16ffcc3
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -112,6 +112,10 @@ DIRECTORY_ARCHIVES += xbmc/storage/linux/storage_linux.a
 DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
 endif
 
+ifeq ($(findstring freebsd,@ARCH@),freebsd)
+DIRECTORY_ARCHIVES += xbmc/freebsd/freebsd.a
+endif
+
 ifeq (@HAVE_XBMC_NONFREE@,1)
 DIRECTORY_ARCHIVES += lib/UnrarXLib/UnrarXLib.a
 endif
@@ -323,6 +327,10 @@ DYNOBJSXBMC= \
 	xbmc/video/video.a \
 	xbmc/guilib/guilib.a # must be dynamic to avoid linker errors
 
+ifeq ($(findstring freebsd,@ARCH@),freebsd)
+DYNOBJSXBMC+= xbmc/freebsd/freebsd.a
+endif
+
 OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
 
 LIBS += @PYTHON_LDFLAGS@

diff --git a/configure.in b/configure.in
@@ -1953,6 +1953,7 @@ OUTPUT_FILES="Makefile \
     xbmc/interfaces/python/xbmcmodule/Makefile \
     lib/libUPnP/Makefile \
     xbmc/DllPaths_generated.h \
+    xbmc/freebsd/Makefile \
     xbmc/linux/Makefile \
     xbmc/filesystem/Makefile \
     xbmc/screensavers/rsxs-0.9/xbmc/Makefile \

diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
@@ -30,7 +30,7 @@
 #include "../osx/OSXGNUReplacements.h"
 #endif
 #ifdef __FreeBSD__
-#include "FreeBSDGNUReplacements.h"
+#include "freebsd/FreeBSDGNUReplacements.h"
 #endif
 #include "utils/log.h"
 #include "utils/URIUtils.h"

diff --git a/xbmc/filesystem/SAPDirectory.cpp b/xbmc/filesystem/SAPDirectory.cpp
@@ -32,7 +32,7 @@
 #include "OSXGNUReplacements.h" // strnlen
 #endif
 #ifdef __FreeBSD__
-#include "FreeBSDGNUReplacements.h"
+#include "freebsd/FreeBSDGNUReplacements.h"
 #endif
 
 #include <sys/socket.h>

diff --git a/xbmc/linux/FreeBSDGNUReplacements.c → xbmc/freebsd/FreeBSDGNUReplacements.c b/xbmc/linux/FreeBSDGNUReplacements.c → xbmc/freebsd/FreeBSDGNUReplacements.c
diff --git a/xbmc/linux/FreeBSDGNUReplacements.h → xbmc/freebsd/FreeBSDGNUReplacements.h b/xbmc/linux/FreeBSDGNUReplacements.h → xbmc/freebsd/FreeBSDGNUReplacements.h
diff --git a/xbmc/freebsd/Makefile.in b/xbmc/freebsd/Makefile.in
@@ -0,0 +1,11 @@
+ARCH=@ARCH@
+
+CXXFLAGS+=-fPIC
+
+SRCS=FreeBSDGNUReplacements.c
+
+LIB=freebsd.a
+
+include @abs_top_srcdir@/Makefile.include
+
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
@@ -28,7 +28,7 @@
 #include "OSXGNUReplacements.h"
 #endif
 #ifdef __FreeBSD__
-#include "FreeBSDGNUReplacements.h"
+#include "freebsd/FreeBSDGNUReplacements.h"
 #endif
 
 #include "Util.h"

diff --git a/xbmc/linux/Makefile.in b/xbmc/linux/Makefile.in
@@ -16,10 +16,6 @@ SRCS=ConvUtils.cpp \
      XMemUtils.cpp \
      XTimeUtils.cpp \
 
-ifeq ($(findstring freebsd,$(ARCH)), freebsd)
-  SRCS+=FreeBSDGNUReplacements.cpp
-endif
-
 LIB=linux.a
 
 include @abs_top_srcdir@/Makefile.include