tboudreaux/GridFire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into feature/mixedPolytrope

Browse Source 
# Conflicts:
#	.gitignore
#	build-config/meson.build
#	meson.build
#	meson_options.txt
#	src/composition/public/composition.h
#	src/config/public/config.h
#	src/constants/public/const.h
#	src/meson.build
#	tests/composition_sandbox/comp.cpp
This commit is contained in:
Emily Boudreaux
2025-06-11 15:05:11 -04:00
parent 602a9a0409 87d407d0b6
commit 49350ca72b
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/meson.build
View File

@@ -19,7 +19,7 @@ dependencies = [
]
# Define the libnetwork library so it can be linked against by other parts of the build system
libnetwork = static_library('network',
libnetwork = library('network',
network_sources,
include_directories: include_directories('public'),
dependencies: dependencies,