Skip to content

Commit

Permalink
Remove stupid condition that uses static library function
Browse files Browse the repository at this point in the history
  • Loading branch information
andy5995 committed Nov 13, 2024
1 parent 122466a commit bd414a2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ jobs:
platform: ['x64', 'x86']
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

# Install a 32-bit Python so building related stuff work.
- name: Setup x86 Python
Expand All @@ -55,14 +53,14 @@ jobs:
with:
arch: ${{matrix.platform}}
- name: Configure
run: meson setup builddir -Db_sanitize=none
run: meson setup builddir -Ddefault_library=static -Db_sanitize=none

- name: Build
run: meson compile -C builddir

- name: Test
run: |
meson test -t 2 -C builddir || cat builddir\meson-logs\testlog.txt
meson test -C builddir || cat builddir\meson-logs\testlog.txt
#MSYS2:
#runs-on: windows-latest
Expand Down
9 changes: 0 additions & 9 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,12 @@ conf.set('CANFIGGER_VERSION_PATCH', patch_version)
config_h = configure_file(output : 'config.h', configuration : conf)

src = ('canfigger.c')
if build_machine.system() != 'windows'
buildtarget = library(
meson.project_name(),
src,
version : meson.project_version(),
install: not meson.is_subproject(),
)
else
buildtarget = static_library(
meson.project_name(),
src,
install: not meson.is_subproject(),
# vs_module_defs: 'canfigger.def'
)
endif

# How to use in a superproject and other info
# https://mesonbuild.com/Subprojects.html
Expand Down

0 comments on commit bd414a2

Please sign in to comment.