htrdr

commit 7669e79a1db82627200fac5693229a6bd820b047
parent f927f5feb79cc1317d0fcd97fde8ac45d92b68d5
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Sun, 30 Mar 2025 11:35:23 +0200

Add missing dependencies

Add Star-Mesh as a dependency of the Planets library. It was used
internally but was mistakenly not considered a dependency.

Add htrdr-core as a dependency of all libraries. It was declared as a
dependency in their pkg-config file but not in their INCS and LIBS
macros.

Diffstat:
M
Makefile.atmosphere
 | 
4
++--
M
Makefile.combustion
 | 
4
++--
M
Makefile.planets
 | 
6
++++--
M
README.md
 | 
2
++
M
config.mk
 | 
35
+++++++++++++++++------------------
M
htrdr-planets.pc.in
 | 
1
+

6 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/Makefile.atmosphere b/Makefile.atmosphere
@@ -89,8 +89,8 @@ CMD_SRC = src/commands/htrdr_atmosphere_cmd.c
 CMD_OBJ = $(CMD_SRC:.c=.o)
 CMD_DEP = $(CMD_SRC:.c=.d)
 
-CFLAGS_CMD = $(CFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --cflags htrdr-core htrdr-atmosphere rsys)
-LDFLAGS_CMD = $(LDFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --libs htrdr-core htrdr-atmosphere rsys)
+CFLAGS_CMD = $(CFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --cflags htrdr-atmosphere)
+LDFLAGS_CMD = $(LDFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --libs htrdr-atmosphere)
 
 command: library $(CMD_DEP)
 	@$(MAKE) -fMakefile.atmosphere -f$(CMD_DEP) htrdr-atmosphere
diff --git a/Makefile.combustion b/Makefile.combustion
@@ -89,8 +89,8 @@ CMD_SRC = src/commands/htrdr_combustion_cmd.c
 CMD_OBJ = $(CMD_SRC:.c=.o)
 CMD_DEP = $(CMD_SRC:.c=.d)
 
-CFLAGS_CMD = $(CFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --cflags htrdr-core htrdr-combustion rsys)
-LDFLAGS_CMD = $(LDFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --libs htrdr-core htrdr-combustion rsys)
+CFLAGS_CMD = $(CFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --cflags htrdr-combustion)
+LDFLAGS_CMD = $(LDFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --libs htrdr-combustion)
 
 command: library $(CMD_DEP)
 	@$(MAKE) -fMakefile.combustion -f$(CMD_DEP) htrdr-combustion
diff --git a/Makefile.planets b/Makefile.planets
@@ -61,6 +61,7 @@ core:
 	$(PKG_CONFIG) --atleast-version $(S3D_VERSION) s3d
 	$(PKG_CONFIG) --atleast-version $(SBUF_VERSION) sbuf
 	$(PKG_CONFIG) --atleast-version $(SCAM_VERSION) scam
+	$(PKG_CONFIG) --atleast-version $(SMSH_VERSION) smsh
 	$(PKG_CONFIG) --atleast-version $(SSF_VERSION) ssf
 	$(PKG_CONFIG) --atleast-version $(SSP_VERSION) star-sp
 	$(PKG_CONFIG) --atleast-version $(SVX_VERSION) svx
@@ -91,8 +92,8 @@ CMD_SRC = src/commands/htrdr_planets_cmd.c
 CMD_OBJ = $(CMD_SRC:.c=.o)
 CMD_DEP = $(CMD_SRC:.c=.d)
 
-CFLAGS_CMD = $(CFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --cflags htrdr-core htrdr-planets rsys)
-LDFLAGS_CMD = $(LDFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --libs htrdr-core htrdr-planets rsys)
+CFLAGS_CMD = $(CFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --cflags htrdr-planets)
+LDFLAGS_CMD = $(LDFLAGS_EXE) $$($(PKG_CONFIG_LOCAL) --static --libs htrdr-planets)
 
 command: library $(CMD_DEP)
 	@$(MAKE) -fMakefile.planets -f$(CMD_DEP) htrdr-planets
@@ -148,6 +149,7 @@ htrdr-planets.pc: config.mk htrdr-planets.pc.in
 	    -e 's/@S3D_VERSION@/$(S3D_VERSION)/g' \
 	    -e 's/@SBUF_VERSION@/$(SBUF_VERSION)/g' \
 	    -e 's/@SCAM_VERSION@/$(SCAM_VERSION)/g' \
+	    -e 's/@SMSH_VERSION@/$(SMSH_VERSION)/g' \
 	    -e 's/@SSF_VERSION@/$(SSF_VERSION)/g' \
 	    -e 's/@SSP_VERSION@/$(SSP_VERSION)/g' \
 	    -e 's/@SVX_VERSION@/$(SVX_VERSION)/g' \
diff --git a/README.md b/README.md
@@ -83,6 +83,8 @@ that calculate the radiance are used for computing various quantities:
 - [Star Buffer](https://gitlab.com/meso-star/star-buffer)
   (optional; required by PLANETS)
 - [Star Camera](https://gitlab.com/meso-star/star-camera)
+- [Star Mesh](https://gitlab.com/meso-star/star-mesh)
+  (optional; required by PLANETS)
 - [Star Scattering Functions](https://gitlab.com/meso-star/star-sf)
 - [Star SamPling](https://gitlab.com/meso-star/star-sp)
 - [Star VoXel](https://gitlab.com/meso-star/star-vx)
diff --git a/config.mk b/config.mk
@@ -95,34 +95,33 @@ S3D_VERSION = 0.10
 SBUF_VERSION = 0.1
 SCAM_VERSION = 0.2
 SSF_VERSION = 0.9
+SMSH_VERSION = 0.1
 SSP_VERSION = 0.14
 SVX_VERSION = 0.3
 
 # Atmosphere
-ATMOSPHERE_INCS =\
- $$($(PKG_CONFIG) $(PCFLAGS) --cflags htsky rsys s3d scam ssf star-sp svx)
-ATMOSPHERE_LIBS =\
- $$($(PKG_CONFIG) $(PCFLAGS) --libs htsky rsys s3d scam ssf star-sp svx) -lm
+ATMOSPHERE_INCS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags\
+ htrdr-core htsky rsys s3d scam ssf star-sp svx)
+ATMOSPHERE_LIBS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --libs\
+ htrdr-core htsky rsys s3d scam ssf star-sp svx) -lm
 
 # Combustion
-COMBUSTION_INCS =\
- $$($(PKG_CONFIG) $(PCFLAGS) --cflags atrstm rsys s3d scam ssf star-sp svx)
-COMBUSTION_LIBS =\
- $$($(PKG_CONFIG) $(PCFLAGS) --libs atrstm rsys s3d scam ssf star-sp svx) -lm
+COMBUSTION_INCS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags\
+ atrstm htrdr-core rsys s3d scam ssf star-sp svx)
+COMBUSTION_LIBS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --libs\
+ atrstm htrdr-core rsys s3d scam ssf star-sp svx) -lm
 
 # Core
-CORE_INCS =\
- $$($(PKG_CONFIG) $(PCFLAGS) --cflags aw $(MPI_PC) mrumtl rsys s3d scam ssf star-sp)\
- -fopenmp
-CORE_LIBS =\
- $$($(PKG_CONFIG) $(PCFLAGS) --libs aw $(MPI_PC) mrumtl rsys s3d scam ssf star-sp)\
- -fopenmp -lm
+CORE_INCS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags\
+ aw $(MPI_PC) mrumtl rsys s3d scam ssf star-sp) -fopenmp
+CORE_LIBS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --libs\
+ aw $(MPI_PC) mrumtl rsys s3d scam ssf star-sp) -fopenmp -lm
 
 # Planets
-PLANETS_INCS = $$($(PKG_CONFIG) $(PCFLAGS) --cflags $(MPI_PC) \
- rnatm rngrd rsys s3d sbuf scam ssf star-sp svx)
-PLANETS_LIBS = $$($(PKG_CONFIG) $(PCFLAGS) --libs $(MPI_PC) \
- rnatm rngrd rsys s3d sbuf scam ssf star-sp svx) -lm
+PLANETS_INCS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags\
+ $(MPI_PC) htrdr-core rnatm rngrd rsys s3d sbuf scam smsh ssf star-sp svx)
+PLANETS_LIBS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --libs\
+ $(MPI_PC) htrdr-core rnatm rngrd rsys s3d sbuf scam smsh ssf star-sp svx) -lm
 
 ################################################################################
 # Compilation options
diff --git a/htrdr-planets.pc.in b/htrdr-planets.pc.in
@@ -7,6 +7,7 @@ Requires.private:\
  s3d >= @S3D_VERSION@,\
  sbuf >= @SBUF_VERSION@,\
  scam >= @SCAM_VERSION@,\
+ smsh >= @SMSH_VERSION@,\
  ssf >= @SSF_VERSION@,\
  star-sp >= @SSP_VERSION@,\
  svx >= @SVX_VERSION@