Merge pull request #663 from cosinekitty/sapphire_v2.4.4

Sapphire v2.4.4
This commit is contained in:
dreamer 2024-05-09 09:42:55 +02:00 committed by GitHub
commit da5c288dfd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View file

@ -2684,7 +2684,7 @@ $(BUILD_DIR)/repelzen/%.cpp.o: repelzen/%.cpp
$(BUILD_DIR)/Sapphire/%.cpp.o: Sapphire/%.cpp $(BUILD_DIR)/Sapphire/%.cpp.o: Sapphire/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -std=gnu++17 -c -o $@ \
$(foreach m,$(SAPPHIRE_CUSTOM),$(call custom_module_names,$(m),Sapphire)) \ $(foreach m,$(SAPPHIRE_CUSTOM),$(call custom_module_names,$(m),Sapphire)) \
-DpluginInstance=pluginInstance__sapphire -DpluginInstance=pluginInstance__sapphire

@ -1 +1 @@
Subproject commit d26e157140ef6283906a33675733ea35e4dd26ac Subproject commit 0bcc1f4a48a7a7d59013f5f4a12574f7453a5edf