Skip to content

Commit

Permalink
Remove Docker container as it hasn't been used in quite a while.
Browse files Browse the repository at this point in the history
  • Loading branch information
tmiw committed Jan 15, 2024
1 parent fc6f30b commit 97ce4cc
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 356 deletions.
37 changes: 5 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,20 @@ The ```wav``` directory contains test files of modulated audio that you can use

## Building for Windows

### Building using Docker

The Windows build process has been automated using a Docker container, see the freedv-gui Docker [README](docker/README_docker.md).

### Building LLVM MinGW (EXPERIMENTAL)

It is now possible to use the LLVM version of MinGW to build FreeDV. This allows
Windows releases are built using the LLVM version of MinGW. This allows
one to build FreeDV for ARM as well as for Intel Windows systems, including support
for 2020 mode (on systems fast enough to acceptably decode it).

#### Prerequisites
### Prerequisites

* CMake >= 3.25.0
* Linux (tested on Ubuntu 22.04)
* *NOTE: This does not currently work on macOS due to CMake using incorrect library suffixes.*
* NSIS for generating the installer (for example, `sudo apt install nsis` on Ubuntu)

#### Instructions
### Instructions

1. Download LLVM MinGW at https://github.com/mstorsjo/llvm-mingw/releases/tag/20220906.
1. Download LLVM MinGW at https://github.com/mstorsjo/llvm-mingw/releases/.
2. Decompress into your preferred location. For example: `tar xvf llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz` (The exact filename here will depend on the file downloaded in step (1). Note that for best results, you should use a build containing "ucrt" in the file name corresponding to the platform which you're building the Windows binary from.)
3. Add LLVM MinGW to your PATH: `export PATH=/path/to/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64/bin:$PATH`. (The folder containing the LLVM tools is typically named the same as the file downloaded in step (2) minus the extension.)
4. Create a build folder inside freedv-gui: `mkdir build_windows`
Expand All @@ -106,32 +100,11 @@ for 2020 mode (on systems fast enough to acceptably decode it).
6. Build FreeDV as normal: `make` (You can also add `-j[num]` to the end of this command to use multiple cores and shorten the build time.)
7. Create FreeDV installer: `make package`

#### Known Issues
### Known Issues

* NSIS-related issues:
* ARM installers will not properly register in Windows despite installing properly. You can still run the application manually by navigating to C:\Program Files\FreeDV \[version\]\ using File Explorer and double-clicking on `freedv.exe`.

### Testing Windows Build

Conveniently, it is possible to run Windows executables using Wine on Fedora:

Testing LPCNet:
```
$ cd ~/freedv-gui/LPCNet/build_win/src
$ WINEPATH=$HOME/freedv-gui/codec2/build_win/src';'$HOME/freedv-gui/build_win/_CPack_Packages/win64/NSIS/FreeDV-1.4.0-devel-win64/bin/ wine lpcnet_enc.exe --infile all.wav --outfile all.bit
$ WINEPATH=$HOME/freedv-gui/codec2/build_win/src';'$HOME/freedv-gui/build_win/_CPack_Packages/win64/NSIS/FreeDV-1.4.0-devel-win64/bin/ wine lpcnet_dec.exe --infile all.bin --outfile all_out.raw
$ cat all_out.raw | aplay -f S16_LE -r 16000
```

Testing FreeDV API:

```
$ cd freedv-gui/codec2/build_win/src
$ WINEPATH=$HOME/freedv-gui/LPCNet/build_win/src';'$HOME/freedv-gui/build_win/_CPack_Packages/win64/NSIS/FreeDV-1.4.0-devel-win64/bin/ wine freedv_rx 2020 ~/freedv-gui/wav/all_2020.wav out.raw
$ play -t .s16 -r 16000 -b 16 out.raw
```

## Building and installing on macOS

Using MacPorts, most of the appropriate dependencies can be installed by:
Expand Down
60 changes: 0 additions & 60 deletions build_windows.sh

This file was deleted.

32 changes: 0 additions & 32 deletions build_windows_old.sh

This file was deleted.

37 changes: 0 additions & 37 deletions docker/README_docker.md

This file was deleted.

22 changes: 0 additions & 22 deletions docker/docker-compose-win.yml

This file was deleted.

25 changes: 0 additions & 25 deletions docker/fdv_win_fedora/Dockerfile

This file was deleted.

43 changes: 0 additions & 43 deletions docker/fdv_win_fedora/entrypoint.sh

This file was deleted.

105 changes: 0 additions & 105 deletions docker/freedv_build_windows.sh

This file was deleted.

0 comments on commit 97ce4cc

Please sign in to comment.