star-3d

commit e872fee12fc8664c6b37b41b777867aed5334146
parent 3bdfe2cce44f80128ea1b89cc8e7764bdee07c04
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 21 Mar 2023 11:33:01 +0100

Upd POSIX Make to use Embree4 instead of Embree3

Diffstat:
M
Makefile
 | 
3
+--
M
config.mk
 | 
8
+++++---
M
make.sh
 | 
2
+-

3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -66,13 +66,12 @@ libs3d.so: $(OBJ)
 	@echo "Find packages"
 	@if ! $(PKG_CONFIG) --atleast-version $(RSYS_VERSION) rsys; then \
 		echo "rsys $(RSYS_VERSION) not found" >&2; exit 1; fi
-	@if ! $(PKG_CONFIG) --atleast-version $(EMBREE_VERSION) embree; then \
+	@if ! $(PKG_CONFIG) --atleast-version $(EMBREE_VERSION) embree4; then \
 		echo "embree $(EMBREE_VERSION) not found" >&2; exit 1; fi
 	@echo "config done" > .config
 
 .SUFFIXES: .c .d .o
 .c.d:
-	@echo "DEP $@"
 	@$(CC) $(CFLAGS) $(INCS) -MM -MT "$(@:.d=.o) $@" $< -MF $@
 
 .c.o:
diff --git a/config.mk b/config.mk
@@ -10,9 +10,9 @@ RSYS_VERSION=0.6
 RSYS_INC = $$($(PKG_CONFIG) --cflags rsys)
 RSYS_LIB = $$($(PKG_CONFIG) --libs rsys)
 
-EMBREE_VERSION=3.13
-EMBREE_INC = $$($(PKG_CONFIG) --cflags embree)
-EMBREE_LIB = $$($(PKG_CONFIG) --libs embree)
+EMBREE_VERSION=4.0
+EMBREE_INC = $$($(PKG_CONFIG) --cflags embree4)
+EMBREE_LIB = $$($(PKG_CONFIG) --libs embree4)
 
 INCS=$(RSYS_INC) $(EMBREE_INC)
 LIBS=$(RSYS_LIB) $(EMBREE_LIB)
@@ -25,6 +25,7 @@ CC = cc # Compiler
 CPPFLAGS = -DNDEBUG
 WFLAGS =\
  -Wall\
+ -Wcast-align\
  -Wconversion\
  -Wextra\
  -Wmissing-declarations\
@@ -33,4 +34,5 @@ WFLAGS =\
 
 CFLAGS = -O3 -std=c99 -pedantic -fPIC -fvisibility=hidden -fstrict-aliasing\
  -Wl,--no-undefined $(WFLAGS) $(CPPFLAGS) # Compiler options
+
 LDFLAGS = -shared # Linker options
diff --git a/make.sh b/make.sh
@@ -54,7 +54,7 @@ check()
   printf "%s " "${name}"
   if ./"${prog}" "$@" > /dev/null 2>&1; then
     printf "\e[1;32mOK\e[m\n"
-  else 
+  else
     printf "\e[1;31mError\e[m\n"
   fi
 }