From 95976a52e623ad353a3377e2010a7745651d3e79 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Sun, 14 Jun 2015 00:39:17 +0000 Subject: [PATCH] getting closer to Windows X-compile on Ubuntu ... tweaked a few library names and updated README.txt git-svn-id: https://svn.code.sf.net/p/freetel/code@2188 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2-dev/README.txt | 18 ++++++++++-------- fdmdv2-dev/cmake/BuildPortaudio.cmake | 5 ++++- fdmdv2-dev/cmake/BuildSamplerate.cmake | 2 +- fdmdv2-dev/cmake/BuildSndfile.cmake | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/fdmdv2-dev/README.txt b/fdmdv2-dev/README.txt index 8a711dc8..78bd3ef7 100644 --- 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 445b1e1a..c058061d 100644 --- 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 a3be5519..7d94e487 100644 --- 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 2375c479..a3706ffa 100644 --- 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() -- 2.25.1