X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugin_config;h=0ee88a45d0047d36eae528ee1535c7ca6e623f7c;hp=c4d3516df50cab3da512ffa1c0e9cda75b444c35;hb=04031cc2a664d2a6d9d2a37954c55cc68742d78c;hpb=0ac6a1397cf8ee19cf75f3fe893c27e9f4fc0ea5

diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config
index c4d3516d..0ee88a45 100644
--- a/cinelerra-5.1/plugin_config
+++ b/cinelerra-5.1/plugin_config
@@ -3,13 +3,11 @@ CFLAGS += -I../ -I$(CINELERRA) -I$(GUICAST) -I../colors -fPIC
 
 CFLAGS += $(static_incs)
 LFLAGS += $(static_libs)
-LDLINKER ?= g++ -shared
+LDLINKER ?= $(CXX) -shared
 $(shell mkdir -p $(OBJDIR))
 
 PLUGIN_DIR := $(BINDIR)/plugins
 OUTPUT_DIR = $(PLUGIN_DIR)/$($(PLUGIN))
-PLUGIN_PNGS = $(wildcard picon_*.png)
-OUTPUT_PNGS = $(foreach png,$(PLUGIN_PNGS), $(PLUGIN_DIR)/$(basename $(png))/$(PLUGIN).png)
 OUTPUT = $(OUTPUT_DIR)/$(PLUGIN).plugin
 OUTPUT_G = $(OBJDIR)/$(PLUGIN).debuginfo
 
@@ -18,7 +16,7 @@ $(shell echo $(LFLAGS) > $(OBJDIR)/l_flags)
 
 ifeq ($(OUTPUT_THEME),)
 
-$(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_PNGS) $(OUTPUT_BINS)
+$(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_BINS)
 	$(LDLINKER) -o $(OUTPUT) $(OBJS) $(OUTPUT_BINS) `cat $(OBJDIR)/l_flags`
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
@@ -41,10 +39,6 @@ endif
 $(OUTPUT_DIR):
 	mkdir -p $@
 
-$(PLUGIN_DIR)/%/$(PLUGIN).png:	%.png
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-	cp -a $< $@
-
 clean::
 	rm -f $(OUTPUT)
 	rm -rf $(OBJDIR)
@@ -53,7 +47,7 @@ wc:
 	cat *.C *.h | wc
 
 $(OBJDIR)/%.o:          %.C
-	$(CXX) `cat $(OBJDIR)/c_flags` '-DMSGQUAL="$*"' -c $< -o $@
+	$(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@
 
 val-%:
 	@echo $($(subst val-,,$@))