Changeset 1407:674e1a6e032b in mediastreamer2

Timestamp:

Jun 14, 2011 1:43:51 PM (2 years ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Parents:

1406:6ec2f57760a0 (diff), 1405:a263cfb550b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

File:

• src/CMakeLists.txt (modified) (2 diffs)

src/CMakeLists.txt

@@ -75 +75 @@
 endif(PORTAUDIO_FOUND)
 
-if(NOT CMAKE_UNDER_CE)
+if(NOT CMAKE_UNDER_CE AND NOT IPHONE)
         TEST_BIG_ENDIAN(BIG_ENDIAN)
         if(BIG_ENDIAN)
@@ -83 +83 @@
           )
         endif(BIG_ENDIAN)
-endif(NOT CMAKE_UNDER_CE)
+endif(NOT CMAKE_UNDER_CE AND NOT IPHONE)
 
 #FIXME: it's won't work if the MS_FILTER_DESC_EXPORTs are in middle of the file, will work only if they are declared at end