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=68f2532a3d1f0af10693937c0be7d2eca642b555;hb=9058f65f71aafbeab023657be0f6b84b629b70c4;hpb=089f2be86316b88f72a6c359ab10e2b95539005b

diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config
index 68f2532a..0ee88a45 100644
--- a/cinelerra-5.1/plugin_config
+++ b/cinelerra-5.1/plugin_config
@@ -1,18 +1,13 @@
-TOPDIR ?= $(CURDIR)/..
-export TOPDIR
-include $(TOPDIR)/global_config
 
 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 $(foreach t,$(themes),$(t).png)) picon.png
-OUTPUT_PNGS = $(foreach png,$(PLUGIN_PNGS), $(PLUGIN_DIR)/$(basename $(png))/$(PLUGIN).png)
 OUTPUT = $(OUTPUT_DIR)/$(PLUGIN).plugin
 OUTPUT_G = $(OBJDIR)/$(PLUGIN).debuginfo
 
@@ -21,8 +16,8 @@ $(shell echo $(LFLAGS) > $(OBJDIR)/l_flags)
 
 ifeq ($(OUTPUT_THEME),)
 
-$(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_PNGS)
-	$(LDLINKER) -o $(OUTPUT) $(OBJS) `cat $(OBJDIR)/l_flags`
+$(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))
 
@@ -44,20 +39,15 @@ endif
 $(OUTPUT_DIR):
 	mkdir -p $@
 
-$(PLUGIN_DIR)/%/$(PLUGIN).png:	%.png
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-	cp -a $< $@
-
-clean:
-	find \( -name core -o -name '*.o' -o -name '*.a' \) -exec rm -f {} \;
+clean::
 	rm -f $(OUTPUT)
 	rm -rf $(OBJDIR)
 
 wc:
 	cat *.C *.h | wc
 
-$(OBJS):
-	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.C) -o $*.o
+$(OBJDIR)/%.o:          %.C
+	$(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@
 
 val-%:
 	@echo $($(subst val-,,$@))