prep for TARGET_xxx, move _LINUX into ARCH_DEFINES

diff --git a/Makefile.include.in b/Makefile.include.in
index d4a9c41..44c4f44 100644 (file)
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -39,13 +39,12 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1)
 endif
 INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
 DEFINES+= \
-       -D_LINUX \
+       @ARCH_DEFINES@ \
        -D_FILE_DEFINED \
        -D__STDC_CONSTANT_MACROS \
        -DBIN_INSTALL_PATH="\"$(libdir)/xbmc\"" \
        -DINSTALL_PATH="\"$(datarootdir)/xbmc\"" \
        @SDL_DEFINES@ \
-       @ARCH_DEFINES@ \
        @DEFS@ \
 
 ifeq ($(findstring osx,$(ARCH)), osx)

diff --git a/configure.in b/configure.in
index 83f740d..f48c0c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -342,9 +342,11 @@ MAKE="${MAKE:-make}"
 case $host in
   i*86*-linux-gnu*)
      ARCH="i486-linux"
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX -D_POWERPC")
      ;;
   x86_64-*-linux-gnu*)
      ARCH="x86_64-linux"
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX")
      ;;
   arm-apple-darwin*)
      use_joystick=no
@@ -370,6 +372,7 @@ case $host in
      PYTHON_CPPFLAGS="-I${prefix}/include/python2.6"
      PYTHON_SITE_PKG="${prefix}/lib/python2.6/site-packages"
      PYTHON_NOVERSIONCHECK="no-check"
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX")
      ;;
   i386-apple-darwin*)
      use_joystick=no
@@ -379,6 +382,7 @@ case $host in
      ARCH="x86-osx"
      export MACOSX_DEPLOYMENT_TARGET=10.4
      SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX")
      ;;
   powerpc-apple-darwin*)
      use_joystick=no
@@ -389,20 +393,21 @@ case $host in
      use_arch="ppc"
      export MACOSX_DEPLOYMENT_TARGET=10.4
      SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX")
      ;;
   powerpc-*-linux-gnu*)
      ARCH="powerpc-linux"
-     AC_SUBST(ARCH_DEFINES, "-D_POWERPC")
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX -D_POWERPC")
      ;;
   powerpc64-*-linux-gnu*)
      ARCH="powerpc64-linux"
-     AC_SUBST(ARCH_DEFINES, "-D_POWERPC64")
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX -D_POWERPC64")
      ;;
   arm*-*-linux-gnu*)
      use_texturepacker=no
      ARCH="arm"
      use_arch="arm"
-     AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
+     AC_SUBST(ARCH_DEFINES, "-D_LINUX -D_ARMEL")
      ;;
   *)
      AC_MSG_ERROR(unsupported host ($host))