Other buildsystem updates for cross-compiling.

git-svn-id: https://svn.code.sf.net/p/freetel/code@3595 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/freedv-dev/cmake/BuildPortaudio.cmake b/freedv-dev/cmake/BuildPortaudio.cmake
index 7acd8a03d97039b4a18b5860033dc54ac1aab743..929dbad7a829464de7b328d7d930ebe23c8c3b3e 100644 (file)
--- a/freedv-dev/cmake/BuildPortaudio.cmake
+++ b/freedv-dev/cmake/BuildPortaudio.cmake
@@ -15,7 +15,6 @@ endif()
 if(MINGW AND CMAKE_CROSSCOMPILING)
     include(cmake/MinGW.cmake)
     set(CONFIGURE_COMMAND ./configure --host=${HOST} --target=${HOST} --enable-cxx --without-jack --disable-shared --prefix=${CMAKE_BINARY_DIR}/external/dist)
-    #set(CONFIGURE_COMMAND ./configure --build=${CMAKE_HOST_SYSTEM} --host=${HOST} --target=${HOST} --enable-cxx --without-jack --disable-shared --prefix=${CMAKE_BINARY_DIR}/external/dist)
 else()
     set(CONFIGURE_COMMAND ./configure --enable-cxx --without-jack --disable-shared --prefix=${CMAKE_BINARY_DIR}/external/dist)
 endif()

diff --git a/freedv-dev/cmake/BuildSamplerate.cmake b/freedv-dev/cmake/BuildSamplerate.cmake
index 8b6b7a368f695add96f4a2a94722707449fcb57d..b728a6f030b50477dd832edaf2c8ad93767222cc 100644 (file)
--- a/freedv-dev/cmake/BuildSamplerate.cmake
+++ b/freedv-dev/cmake/BuildSamplerate.cmake
@@ -1,7 +1,7 @@
 set(SAMPLERATE_TARBALL "libsamplerate-0.1.8")
 
 if(MINGW AND CMAKE_CROSSCOMPILING)
-    set(CONFIGURE_COMMAND ./configure --build=${HOST} --host=${HOST} --target=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-sndfile --disable-fftw)
+    set(CONFIGURE_COMMAND ./configure --host=${HOST} --target=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-sndfile --disable-fftw)
 else()
     set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist)
 endif()

diff --git a/freedv-dev/cmake/BuildSndfile.cmake b/freedv-dev/cmake/BuildSndfile.cmake
index c49b6388454838fdf8461807f40017c2623892d8..a63146ad600f71703d1cea4fedffae32fa96bb2e 100644 (file)
--- a/freedv-dev/cmake/BuildSndfile.cmake
+++ b/freedv-dev/cmake/BuildSndfile.cmake
@@ -1,7 +1,7 @@
 set(SNDFILE_TARBALL "libsndfile-1.0.25")
 
 if(MINGW AND CMAKE_CROSSCOMPILING)
-    set(CONFIGURE_COMMAND ./configure --host=${HOST}  --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-sqlite)
+    set(CONFIGURE_COMMAND ./configure --host=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-sqlite)
 else()
     set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-external-libs)
 endif()