Index: mppenc/trunk/src/CMakeLists.txt
===================================================================
--- mppenc/trunk/src/CMakeLists.txt	(revision 124)
+++ mppenc/trunk/src/CMakeLists.txt	(revision 170)
@@ -1,3 +1,8 @@
 add_definitions(-DMPP_ENCODER -DFAST_MATH -DCVD_FASTLOG)
+
+if(MPC_ENDIANNESS)
+add_definitions(-DMPC_BIG_ENDIAN)
+endif(MPC_ENDIANNESS)
+
 add_executable(mppenc analy_filter encode_sv7 huffsv7 profile stderr winmsg ans fastmath keyboard psy tags bitstream fft4g mppenc psy_tab tools cvd fft_routines pipeopen quant wave_in)
 
Index: mppenc/trunk/src/bitstream.c
===================================================================
--- mppenc/trunk/src/bitstream.c	(revision 124)
+++ mppenc/trunk/src/bitstream.c	(revision 170)
@@ -36,5 +36,5 @@
  */
 
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef MPC_BIG_ENDIAN
 
 static void
@@ -63,5 +63,5 @@
 }
 
-#endif /* ENDIAN == HAVE_BIG_ENDIAN */
+#endif /* MPC_BIG_ENDIAN */
 
 
@@ -72,5 +72,5 @@
     const Uint32_t*  p             = buffer;
 
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef MPC_BIG_ENDIAN
     size_t           CC            = words32bit;
     Change_Endian32 ( (Uint32_t*)buffer, CC );
@@ -90,5 +90,5 @@
     } while ( words32bit != 0 );
 
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef MPC_BIG_ENDIAN
     Change_Endian32 ( (Uint32_t*)buffer, CC );
 #endif
Index: mppenc/trunk/src/config.h
===================================================================
--- mppenc/trunk/src/config.h	(revision 124)
+++ mppenc/trunk/src/config.h	(revision 170)
@@ -17,11 +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
 
 
Index: mppenc/trunk/src/cvd.c
===================================================================
--- mppenc/trunk/src/cvd.c	(revision 124)
+++ mppenc/trunk/src/cvd.c	(revision 170)
@@ -223,8 +223,8 @@
     tmp.d *= tmp.d;
     tmp.d *= tmp.d;
-#if ENDIAN == HAVE_LITTLE_ENDIAN
+#ifdef MPC_BIG_ENDIAN
+    return (tmp.n[0] + (45127.5 - 1072693248.)) * ( M_LN2 / (1L<<23) );
+#else
     return (tmp.n[1] + (45127.5 - 1072693248.)) * ( M_LN2 / (1L<<23) );
-#else
-    return (tmp.n[0] + (45127.5 - 1072693248.)) * ( M_LN2 / (1L<<23) );
 #endif
 }
Index: mppenc/trunk/src/mppdec.h
===================================================================
--- mppenc/trunk/src/mppdec.h	(revision 124)
+++ mppenc/trunk/src/mppdec.h	(revision 170)
@@ -131,6 +131,4 @@
 # undef USE_ESD_AUDIO
 # define NO_DEV_AUDIO
-# undef ENDIAN
-# define ENDIAN HAVE_BIG_ENDIAN
 #endif
 
@@ -1000,13 +998,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
@@ -1133,5 +1122,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: mppenc/trunk/src/tools.c
===================================================================
--- mppenc/trunk/src/tools.c	(revision 124)
+++ mppenc/trunk/src/tools.c	(revision 170)
@@ -83,5 +83,5 @@
  */
 
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef MPC_BIG_ENDIAN 
 
 static void
@@ -110,5 +110,5 @@
 }
 
-#endif /* ENDIAN == HAVE_BIG_ENDIAN */
+#endif /* MPC_BIG_ENDIAN */
 
 
@@ -128,5 +128,5 @@
     wordsread = READ ( fp, dst, words32bit * sizeof(*dst) ) / sizeof(*dst);
 
-#if ENDIAN == HAVE_BIG_ENDIAN
+#ifdef MPC_BIG_ENDIAN
     Change_Endian32 ( dst, wordsread );
 #endif
Index: mppenc/trunk/src/wave_in.c
===================================================================
--- mppenc/trunk/src/wave_in.c	(revision 124)
+++ mppenc/trunk/src/wave_in.c	(revision 170)
@@ -300,5 +300,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 ) {