Index: libmpc/branches/r2d/mpcenc/CMakeLists.txt
===================================================================
--- libmpc/branches/r2d/mpcenc/CMakeLists.txt	(revision 165)
+++ libmpc/branches/r2d/mpcenc/CMakeLists.txt	(revision 171)
@@ -1,3 +1,7 @@
 add_definitions(-DMPP_ENCODER -DFAST_MATH -DCVD_FASTLOG)
+
+if(MPC_ENDIANNESS)
+add_definitions(-DMPC_BIG_ENDIAN)
+endif(MPC_ENDIANNESS)
 
 include_directories(${libmpc_SOURCE_DIR}/include)
Index: libmpc/branches/r2d/mpcenc/config.h
===================================================================
--- libmpc/branches/r2d/mpcenc/config.h	(revision 165)
+++ libmpc/branches/r2d/mpcenc/config.h	(revision 171)
@@ -17,12 +17,4 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-/* Determine Endianess of the machine */
-
-#define HAVE_LITTLE_ENDIAN  1234
-#define HAVE_BIG_ENDIAN     4321
-
-#define ENDIAN              HAVE_LITTLE_ENDIAN
-
 
 /* Test the fast float-to-int rounding trick works */
Index: libmpc/branches/r2d/mpcenc/mppdec.h
===================================================================
--- libmpc/branches/r2d/mpcenc/mppdec.h	(revision 165)
+++ libmpc/branches/r2d/mpcenc/mppdec.h	(revision 171)
@@ -131,6 +131,4 @@
 # undef USE_ESD_AUDIO
 # define NO_DEV_AUDIO
-# undef ENDIAN
-# define ENDIAN HAVE_BIG_ENDIAN
 #endif
 
@@ -962,13 +960,4 @@
 extern Bool_t             IS_used;
 
-#define LITTLE                  0
-#define BIG                     1
-extern Bool_t                   output_endianess;
-#if   ENDIAN == HAVE_LITTLE_ENDIAN
-# define machine_endianess      LITTLE
-#elif ENDIAN == HAVE_BIG_ENDIAN
-# define machine_endianess      BIG
-#endif
-
 // requant.c
 extern Float              __SCF    [6 + 128];       // tabulated Scalefactors from -6 to +127
@@ -1082,5 +1071,5 @@
 void       mysetargv                  ( int* argc, char*** argv, const char** extentions );
 
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef MPC_BIG_ENDIAN
 
 # define ReadLE32(dst,psrc)       dst = *(Uint32_t*)(psrc)
Index: libmpc/branches/r2d/mpcenc/wave_in.c
===================================================================
--- libmpc/branches/r2d/mpcenc/wave_in.c	(revision 165)
+++ libmpc/branches/r2d/mpcenc/wave_in.c	(revision 171)
@@ -301,5 +301,5 @@
 
     // Convert to float and calculate M=(L+R)/2 and S=(L-R)/2 signals
-#if ENDIAN == HAVE_LITTLE_ENDIAN
+#ifndef MPC_BIG_ENDIAN
     if ( t->BytesPerSample == 2 ) {
         switch ( t->Channels ) {