build: Update lib.mk and cosmo.mk to new include structure

Forgot about these. Now they work again.

Author: vkoskiv

cosmo.mk

@@ -1,7 +1,15 @@
 CC_cosmo=cosmocc
 BIN_cosmo=c-ray.com
 OBJDIR_cosmo=bin/obj_cosmo
-OBJS_cosmo=$(patsubst %.c, $(OBJDIR_cosmo)/%.o, $(SRCS))
+
+OBJS_LIB_cosmo=$(SRCS_LIB:%.c=$(OBJDIR_cosmo)/%.o)
+$(OBJS_LIB_cosmo): CFLAGS += -I./src/lib/
+OBJS_DRIVER_cosmo=$(SRCS_DRIVER:%.c=$(OBJDIR_cosmo)/%.o)
+$(OBJS_DRIVER_cosmo): CFLAGS += -I./src/driver/
+OBJS_COMMON_cosmo=$(SRCS_COMMON:%.c=$(OBJDIR_cosmo)/%.o)
+$(OBJS_COMMON_cosmo): CFLAGS += -I./src/common/
+
+OBJS_cosmo := $(OBJS_LIB_cosmo) $(OBJS_DRIVER_cosmo) $(OBJS_COMMON_cosmo)
 
 cosmo: $(BINDIR)/$(BIN_cosmo)
 

lib.mk

@@ -3,25 +3,29 @@
 
 LIB=lib/libc-ray.so
 BIN_lib=lib/c-ray
-OBJDIR_lib=lib/obj_lib
-OBJDIR_driver=lib/obj_driver
-SRCS_lib=$(shell find src/lib src/common -name '*.c') generated/gitsha1.c
-OBJS_lib=$(patsubst %.c, $(OBJDIR_lib)/%.o, $(SRCS_lib))
-SRCS_driver=$(shell find src/driver src/common -name '*.c')
-OBJS_driver=$(patsubst %.c, $(OBJDIR_driver)/%.o, $(SRCS_driver))
-SRCS_pylib=$(shell find bindings/python/lib -name '*.py')
+OBJDIR_LIB=lib/obj_lib
+OBJDIR_DRIVER=lib/obj_driver
+OBJDIR_COMMON=lib/obj_common
+OBJS_LIB=$(patsubst %.c, $(OBJDIR_LIB)/%.o, $(SRCS_LIB))
+OBJS_DRIVER=$(patsubst %.c, $(OBJDIR_DRIVER)/%.o, $(SRCS_DRIVER))
+OBJS_COMMON=$(patsubst %.c, $(OBJDIR_COMMON)/%.o, $(SRCS_COMMON))
+SRCS_PYLIB=$(shell find bindings/python/lib -name '*.py')
+
+$(OBJS_LIB): CFLAGS += -I./src/lib/
+$(OBJS_DRIVER): CFLAGS += -I./src/driver/
+$(OBJS_COMMON): CFLAGS += -I./src/common/
 
 lib: $(BIN_lib)
 
-pylib: bindings/python/lib/cray_wrap.so $(SRCS_pylib)
+pylib: bindings/python/lib/cray_wrap.so $(SRCS_PYLIB)
 
 BLENDER_VERSION=$(shell blender --version | head -n1 | cut -d ' ' -f 2 | cut -c 1-3)
 BLENDER_ROOT=$(HOME)/.config/blender/$(BLENDER_VERSION)
 
 # Only copy .py files, which Blender seems to handle okay.
-blsync: $(SRCS_pylib)
+blsync: $(SRCS_PYLIB)
 	mkdir -p $(BLENDER_ROOT)/scripts/addons/c_ray
-	cp $(SRCS_pylib) $(BLENDER_ROOT)/scripts/addons/c_ray/
+	cp $(SRCS_PYLIB) $(BLENDER_ROOT)/scripts/addons/c_ray/
 	cp -r integrations/blender/* $(BLENDER_ROOT)/scripts/addons/c_ray/
 
 # Blender crashes if I swap out the .so, no idea why, so updating the library
@@ -31,32 +35,38 @@ fullblsync: pylib
 	cp -r bindings/python/lib/* $(BLENDER_ROOT)/scripts/addons/c_ray/
 	cp -r integrations/blender/* $(BLENDER_ROOT)/scripts/addons/c_ray/
 
-$(OBJDIR_driver)/%.o: %.c $(OBJDIR_driver)
+$(OBJDIR_DRIVER)/%.o: %.c $(OBJDIR_DRIVER)
 	@mkdir -p '$(@D)'
 	@echo "CC $<"
 	@$(CC) $(CFLAGS) -c $< -o $@
-$(OBJDIR_lib)/%.o: %.c $(OBJDIR_lib)
+$(OBJDIR_LIB)/%.o: %.c $(OBJDIR_LIB)
 	@mkdir -p '$(@D)'
 	@echo "CC -fPIC $<"
 	@$(CC) -DCR_BUILDING_LIB $(CFLAGS) -fvisibility=hidden -c -fPIC $< -o $@
-$(OBJDIR_lib):
+$(OBJDIR_COMMON)/%.o: %.c $(OBJDIR_COMMON)
+	@mkdir -p '$(@D)'
+	@echo "CC -fPIC $<"
+	@$(CC) -DCR_BUILDING_LIB $(CFLAGS) -fvisibility=hidden -c -fPIC $< -o $@
+$(OBJDIR_LIB):
+	mkdir -p $@
+$(OBJDIR_DRIVER):
 	mkdir -p $@
-$(OBJDIR_driver):
+$(OBJDIR_COMMON):
 	mkdir -p $@
 
 # FIXME: We're linking LDLIBS to the binary instead of .so because
 # transforms.o uses libm and lives under common/ because json_loader.c
 # depends on it.
 
-$(LIB): $(OBJS_lib)
+$(LIB): $(OBJS_LIB) ${OBJS_COMMON}
 	@echo "LD -fPIC $@"
-	@$(CC) $(LDFLAGS) $(OBJS_lib) -shared -o $@
-$(BIN_lib): $(LIB) $(OBJS_driver) $(OBJDIR_driver)
+	@$(CC) $(LDFLAGS) $(OBJS_LIB) $(OBJS_COMMON) -shared -o $@
+$(BIN_lib): $(LIB) $(OBJS_DRIVER) $(OBJDIR_DRIVER) $(OBJS_COMMON)
 	@echo "LD $@"
-	@$(CC) $(LDFLAGS) $(OBJS_driver) $(LIB) -o $@ $(LDLIBS)
-bindings/python/lib/cray_wrap.so: $(OBJS_lib) bindings/python/cray_wrap.c bindings/python/py_types.c
+	@$(CC) $(LDFLAGS) $(OBJS_DRIVER) $(OBJS_COMMON) $(LIB) -o $@ $(LDLIBS)
+bindings/python/lib/cray_wrap.so: $(OBJS_LIB) bindings/python/cray_wrap.c bindings/python/py_types.c
 	@echo "Building CPython module"
-	@$(CC) -shared $(CFLAGS) -fPIC `pkg-config --cflags python3` bindings/python/cray_wrap.c bindings/python/py_types.c $(OBJS_lib) -o bindings/python/lib/cray_wrap.so $(LDLIBS)
+	@$(CC) -shared $(CFLAGS) -fPIC `pkg-config --cflags python3` bindings/python/cray_wrap.c bindings/python/py_types.c $(OBJS_LIB) -o bindings/python/lib/cray_wrap.so $(LDLIBS)
 
 clean_lib:
 	rm -rf lib/*