From 37f4c78f3b7cb59fae7939a698003d40ca6a4799 Mon Sep 17 00:00:00 2001 From: yannk Date: Fri, 17 Dec 2021 22:45:16 +0100 Subject: [PATCH] Removing configuration informations for Makefile and adding reading of them --- Makefile | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index d4bf6ac..2a0b8d0 100644 --- a/Makefile +++ b/Makefile @@ -1,45 +1,16 @@ # Variables definitions SHELL=/bin/bash -# executables used -export MAKESBSAR=sbscooker --quiet --output-name {inputName} --includes "/opt/Allegorithmic/Substance_Automation_Toolkit/resources/packages/" --includes "sbs/utilities/" -export GETPRESET=sbsmutator info --print-presets -export GETOUTPUT=sbsmutator info --print-outputs -export SBSRENDER=sbsrender +# Get Configuration informations from global or local config file +CONFIG_FILES=global-config.mk local-config.mk +include $(CONFIG_FILES) # sbsar files generation part -export SBS_DIR=sbs -export SBSAR_DIR=sbsar -## Auto definitions - do not change + export SBSFILES = $(wildcard $(SBS_DIR)/*.sbs) export SBSARDESTINATION = $(subst $(SBS_DIR)/, $(SBSAR_DIR)/, $(SBSFILES)) export SBSARFILES = $(SBSARDESTINATION:.sbs=.sbsar) -# texturesets files -export TEXTURESET_FOLDER := texturesets - -# texture names possible -export TEXTURES_NAMES := basecolor|normal|metallic|roughness|opacity|height - -# png files folders -export PNG1024_DIR := png_1024 -export PNG512_DIR := png_512 -export PNG256_DIR := png_256 - -# Blender related -export BLENDFILES_FOLDER := blenderfiles/master -export BLENDEREXEC := /home/yann/Documents/3D/blender_builds/daily/blender-3.1.0-alpha+daily.644eb68524b9/blender - -# Logo file -export LOGO := logo/YKtextures.png - -# Destination preview folder -export BUILD_FOLDER := build - -# Material list -export MATERIALLIST := material_list.json - - ### RECIPE PART ### all : previews subformats