Skip to content

Commit

Permalink
Finish converting to meson build system.
Browse files Browse the repository at this point in the history
  • Loading branch information
wojciech-graj committed Mar 27, 2023
1 parent 536777e commit 7ccd0de
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 95 deletions.
83 changes: 0 additions & 83 deletions Makefile

This file was deleted.

12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ View and propagate the full CelesTrak satellite catalog in realtime.

### Linux

The following packages have to be installed prior to compilation: `gcc pkg-config gtk+-3.0 cglm libcurl epoxy`. On Debian-based systems, run the following command to install them:
The following packages have to be installed prior to compilation: `gcc pkg-config gtk+-3.0 cglm libcurl epoxy meson`. On Debian-based systems, run the following command to install them:
```
apt-get install gcc pkg-config libgtk-3-dev libcglm-dev libcurl4-openssl-dev libepoxy-dev
apt-get install gcc pkg-config libgtk-3-dev libcglm-dev libcurl4-openssl-dev libepoxy-dev meson
```
The makefile automatically checks that the above dependencies are satisfied.

To compile, simply:
To compile:
```
make
meson builddir
meson compile -C builddir
```
To run the program:
```
Expand All @@ -27,7 +27,7 @@ To run the program:

Windows binaries are provided with github releases. These releases provide the executable `bin/orbvis.exe`, which cannot be moved from the directory structure, but a shortcut can be created and used.

To compile for windows, MSYS2 is used. First verify that all required packages are installed by calling `util/wininit.sh`, then compile with `util/winbuild.sh`. This creates the `release` directory containing windows binaries and all other required files.
If you wish to compile for windows yourself, use MSYS2. First verify that all required packages are installed by calling `util/wininit.sh`, then compile with `util/winbuild.sh`. This creates the `release` directory containing windows binaries and all other required files.

## License

Expand Down
1 change: 0 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ deps = [
dependency('libcurl'),
dependency('epoxy'),
cc.find_library('m', required : false),
cc.find_library('dl', required : false),
]

subdir('src')
Expand Down
6 changes: 2 additions & 4 deletions util/winbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
BIN_NAME=orbvis.exe
MINGW_PATH=/c/msys64/mingw64

rm -rf release
make clean
make -j8 windows
meson setup builddir
meson compile -C builddir
mkdir -p release/bin
cd release/bin
mv ../../$BIN_NAME $BIN_NAME
Expand All @@ -28,4 +27,3 @@ cd ../..
cp ../util/README_WIN.txt README.txt
cp ../LICENSE LICENSE.txt
cd ..
make clean
2 changes: 1 addition & 1 deletion util/wininit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

pacman -Syu
pacman -S mingw-w64-x86_64-toolchain
pacman -S mingw-w64-x86_64-curl mingw-w64-x86_64-cglm mingw-w64-x86_64-gtk3 mingw-w64-x86_64-libepoxy make vim
pacman -S mingw-w64-x86_64-curl mingw-w64-x86_64-cglm mingw-w64-x86_64-gtk3 mingw-w64-x86_64-libepoxy mingw-w64-x86_64-meson vim

0 comments on commit 7ccd0de

Please sign in to comment.