Merge branch 'master' into divVerent/farplanedist-sky-fix

[xonotic/netradiant.git] / plugins / config.mk

diff --git a/plugins/config.mk b/plugins/config.mk
index f88a85a12c93fb802ce2723d2d37559c1887582f..8b97a39c7622b0481990de0e0b5caeba6cdc3e7e 100644 (file)
--- a/plugins/config.mk
+++ b/plugins/config.mk
@@ -1,32 +1,32 @@
-# Common configuration options for all plugins\r
-\r
-CC=gcc\r
-CXX=g++\r
-CFLAGS+=`gtk-config --cflags` -Wall -g -I../../include\r
-CPPFLAGS+=`gtk-config --cflags` -Wall -g -I../../include\r
-LDFLAGS+=`gtk-config --libs` -shared\r
-OUTDIR=$(RADIANT_DATA)plugins\r
-OBJS := $(patsubst %.cpp,%.o,$(filter %.cpp,$(SRC)))\r
-OBJS += $(patsubst %.c,%.o,$(filter %.c,$(SRC)))\r
-\r
-all: $(OUTPUT)\r
-\r
-$(OUTPUT): $(OBJS)\r
-       $(CXX) -o $(OUTPUT) $(OBJS) $(LDFLAGS)\r
-       @if [ -d $(OUTDIR) ]; then cp $(OUTPUT) $(OUTDIR); fi\r
-\r
-## Other targets\r
-.PHONY: clean\r
-\r
-clean:\r
-       rm -f *.o *.d $(OUTPUT) core\r
-\r
-## Dependencies\r
--include $(OBJS:.o=.d)\r
-\r
-%.d: %.cpp\r
-       @echo -n "$(@) " > $@\r
-       @if { !(eval $(CXX) -MM $(CPPFLAGS) -w $<) >> $@; }; then \\r
-         rm -f $@; exit 1; \\r
-       fi\r
-       @[ -s $@ ] || rm -f $@\r
+# Common configuration options for all plugins
+
+CC=gcc
+CXX=g++
+CFLAGS+=`gtk-config --cflags` -Wall -g -I../../include
+CPPFLAGS+=`gtk-config --cflags` -Wall -g -I../../include
+LDFLAGS+=`gtk-config --libs` -shared
+OUTDIR=$(RADIANT_DATA)plugins
+OBJS := $(patsubst %.cpp,%.o,$(filter %.cpp,$(SRC)))
+OBJS += $(patsubst %.c,%.o,$(filter %.c,$(SRC)))
+
+all: $(OUTPUT)
+
+$(OUTPUT): $(OBJS)
+       $(CXX) -o $(OUTPUT) $(OBJS) $(LDFLAGS)
+       @if [ -d $(OUTDIR) ]; then cp $(OUTPUT) $(OUTDIR); fi
+
+## Other targets
+.PHONY: clean
+
+clean:
+       rm -f *.o *.d $(OUTPUT) core
+
+## Dependencies
+-include $(OBJS:.o=.d)
+
+%.d: %.cpp
+       @echo -n "$(@) " > $@
+       @if { !(eval $(CXX) -MM $(CPPFLAGS) -w $<) >> $@; }; then \
+         rm -f $@; exit 1; \
+       fi
+       @[ -s $@ ] || rm -f $@