getting closer to Windows X-compile on Ubuntu ... tweaked a few library names and...

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

diff --git a/fdmdv2-dev/README.txt b/fdmdv2-dev/README.txt
index 8a711dc84572d300e1a1c0f2093c411be7e5cc13..78bd3ef798dd30f269bfdf922a96ec4cae2e53b9 100644 (file)
--- a/fdmdv2-dev/README.txt
+++ b/fdmdv2-dev/README.txt
@@ -24,7 +24,7 @@ $ cmake -DCMAKE_BUILD_TYPE=Debug -DBOOTSTRAP_WXWIDGETS=TRUE -DCODEC2_INCLUDE_DIR
 
 OR build a local copy of codec2-dev:
 
-$ cmake cmake -DBOOTSTRAP_WXWIDGETS=TRUE -DUSE_STATIC_CODEC2=TRUE -DUSE_STATIC_PORTAUDIO=TRUE -DUSE_STATIC_SOX=TRUE ../
+$ cmake -DBOOTSTRAP_WXWIDGETS=TRUE -DUSE_STATIC_CODEC2=TRUE -DUSE_STATIC_PORTAUDIO=TRUE -DUSE_STATIC_SOX=TRUE ../
 
 $ make
 [FreeDV builds]
@@ -51,19 +51,21 @@ $ make install
  Building for Windows on Ubuntu Linux (Cross compiling)
 =======================================================
 
-$  sudo apt-get install mingw-w64
+Patch cmake using: http://www.cmake.org/gitweb?p=stage/cmake.git;a=patch;h=33286235048495ceafb636d549d9a4e8891967ae
 
-[step to wget hamlib]
-
-$ cd /path/to/fdmdv2
+$ sudo apt-get install mingw-w64
+$ cd /path/to/fdmdv2-dev
 $ mkdir build_windows
 $ cd build_windows
-$ cmake -DBOOTSTRAP_WXWIDGETS=TRUE /path/to/fdmdv2-dev -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-Ubuntu-mingw32.cmake
-[wxWidgets builds]
+$ cmake -DBOOTSTRAP_WXWIDGETS=TRUE .. -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-Ubuntu-mingw32.cmake
+$ make
 
-$ cmake -DBOOTSTRAP_WXWIDGETS=TRUE ~/tmp/fdmdv2-dev -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-Ubuntu-mingw32.cmake -DUSE_STATIC_SAMPLERATE=true -DUSE_STATIC_SNDFILE=TRUE -DHAMLIB_INCLUDE_DIR=hamlib-win32-1.2.15.3/include -DHAMLIB_LIBRARY=hamlib-win32-1.2.15.3/lib
+[wxWidgets builds]
 
+$ wget http://internode.dl.sourceforge.net/project/hamlib/hamlib/1.2.15.3/hamlib-win32-1.2.15.3.zip
+$ unzip hamlib-win32-1.2.15.3.zip
 
+$ cmake -DBOOTSTRAP_WXWIDGETS=TRUE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-Ubuntu-mingw32.cmake -DUSE_STATIC_DEPS=TRUE -DHAMLIB_INCLUDE_DIR=hamlib-win32-1.2.15.3/include -DHAMLIB_LIBRARY=hamlib-win32-1.2.15.3/lib ..
 
 
 ====================================

diff --git a/fdmdv2-dev/cmake/BuildPortaudio.cmake b/fdmdv2-dev/cmake/BuildPortaudio.cmake
index 445b1e1a970b9e92c7a02c2efb148bbfe0b3477b..c058061d797f8e78c1e1757a76797a256d4c3b82 100644 (file)
--- a/fdmdv2-dev/cmake/BuildPortaudio.cmake
+++ b/fdmdv2-dev/cmake/BuildPortaudio.cmake
@@ -21,7 +21,10 @@ ExternalProject_Add(portaudio
     INSTALL_COMMAND $(MAKE) install
 )
 if(WIN32)
-    set(PORTAUDIO_LIBRARIES ${CMAKE_BINARY_DIR}/external/dist/lib/portaudio.lib)
+    set(PORTAUDIO_LIBRARIES 
+        ${CMAKE_BINARY_DIR}/external/dist/lib/libportaudio.a
+        ${CMAKE_BINARY_DIR}/external/dist/lib/libportaudiocpp.a
+)
 else(WIN32)
     find_library(RT rt)
     find_library(ASOUND asound)

diff --git a/fdmdv2-dev/cmake/BuildSamplerate.cmake b/fdmdv2-dev/cmake/BuildSamplerate.cmake
index a3be55190ca697108ff1bb2a8f5ca4e994aaf414..7d94e4878ddf34302addf5a335294806447b8102 100644 (file)
--- a/fdmdv2-dev/cmake/BuildSamplerate.cmake
+++ b/fdmdv2-dev/cmake/BuildSamplerate.cmake
@@ -11,7 +11,7 @@ ExternalProject_Add(samplerate
 )
 if(WIN32)
     set(SAMPLERATE_LIBRARIES
-        ${CMAKE_BINARY_DIR}/external/dist/lib/samplerate.lib)
+        ${CMAKE_BINARY_DIR}/external/dist/lib/libsamplerate.a)
 else(WIN32)
     set(SAMPLERATE_LIBRARIES
         ${CMAKE_BINARY_DIR}/external/dist/lib/libsamplerate.a)

diff --git a/fdmdv2-dev/cmake/BuildSndfile.cmake b/fdmdv2-dev/cmake/BuildSndfile.cmake
index 2375c479598286d341caae4bd356e0adba0893c0..a3706ffaab1b20664fbac379c6879d631196e302 100644 (file)
--- a/fdmdv2-dev/cmake/BuildSndfile.cmake
+++ b/fdmdv2-dev/cmake/BuildSndfile.cmake
@@ -10,7 +10,7 @@ ExternalProject_Add(sndfile
     INSTALL_COMMAND $(MAKE) install
 )
 if(MINGW)
-    set(SNDFILE_LIBRARIES ${CMAKE_BINARY_DIR}/external/dist/bin/libsndfile-1.dll)
+    set(SNDFILE_LIBRARIES ${CMAKE_BINARY_DIR}/external/dist/lib/libsndfile.a)
 else()
     set(SNDFILE_LIBRARIES ${CMAKE_BINARY_DIR}/external/dist/lib/libsndfile.a)
 endif()