Merge contrib with plugins. Add LICENSE for prtview.

2021-06-02 14:10:27 +02:00 · 2021-06-02 14:10:27 +02:00 · cf3454caba
commit cf3454caba
parent af91433555
31 changed files with 7 additions and 12 deletions
--- a/2
+++ b/2
@ -4,7 +4,6 @@ all:
 	cd radiant && $(MAKE)
 	cd plugins && $(MAKE)
 	cd tools && $(MAKE)
-	cd contrib && $(MAKE)

 clean:
 	-rm -rf ./build
@ -12,4 +11,3 @@ clean:
 	cd radiant && $(MAKE) clean
 	cd plugins && $(MAKE) clean
 	cd tools && $(MAKE) clean
-	cd contrib && $(MAKE) clean
--- a/contrib/Makefile
+++ b/contrib/Makefile
@ -1,8 +0,0 @@
-all:
-	mkdir -p ../build/plugins
-	cd brushexport && $(MAKE)
-	cd prtview && $(MAKE)
-clean:
-	-rm -rf ../build/plugins
-	cd brushexport && $(MAKE) clean
-	cd prtview && $(MAKE) clean
--- a/contrib/prtview/PrtView.aps
+++ b/contrib/prtview/PrtView.aps
--- a/docs/LICENSE-GPL
+++ b/docs/LICENSE-GPL
--- a/docs/LICENSE-LGPL
+++ b/docs/LICENSE-LGPL
--- a/plugins/Makefile
+++ b/plugins/Makefile
@ -8,6 +8,8 @@ all:
 	cd model && $(MAKE)
 	cd shaders && $(MAKE)
 	cd vfspk3 && $(MAKE)
+	cd brushexport && $(MAKE)
+	cd prtview && $(MAKE)
 clean:
 	-rm -rf ../build/plugins
 	cd archivezip && $(MAKE) clean
@ -18,3 +20,5 @@ clean:
 	cd model && $(MAKE) clean
 	cd shaders && $(MAKE) clean
 	cd vfspk3 && $(MAKE) clean
+	cd brushexport && $(MAKE) clean
+	cd prtview && $(MAKE) clean
--- a/plugins/brushexport/Makefile
+++ b/plugins/brushexport/Makefile
--- a/plugins/brushexport/callbacks.cpp
+++ b/plugins/brushexport/callbacks.cpp
--- a/plugins/brushexport/callbacks.h
+++ b/plugins/brushexport/callbacks.h
--- a/plugins/brushexport/export.cpp
+++ b/plugins/brushexport/export.cpp
--- a/plugins/brushexport/export.h
+++ b/plugins/brushexport/export.h
--- a/plugins/brushexport/interface.cpp
+++ b/plugins/brushexport/interface.cpp
--- a/plugins/brushexport/plugin.cpp
+++ b/plugins/brushexport/plugin.cpp
--- a/plugins/brushexport/plugin.h
+++ b/plugins/brushexport/plugin.h
--- a/plugins/brushexport/support.cpp
+++ b/plugins/brushexport/support.cpp
--- a/plugins/brushexport/support.h
+++ b/plugins/brushexport/support.h
--- a/plugins/prtview/AboutDialog.cpp
+++ b/plugins/prtview/AboutDialog.cpp
--- a/plugins/prtview/AboutDialog.h
+++ b/plugins/prtview/AboutDialog.h
--- a/plugins/prtview/ConfigDialog.cpp
+++ b/plugins/prtview/ConfigDialog.cpp
--- a/plugins/prtview/ConfigDialog.h
+++ b/plugins/prtview/ConfigDialog.h
--- a/plugins/prtview/LICENSE
+++ b/plugins/prtview/LICENSE
@ -0,0 +1 @@
+ 
--- a/plugins/prtview/LoadPortalFileDialog.cpp
+++ b/plugins/prtview/LoadPortalFileDialog.cpp
--- a/plugins/prtview/LoadPortalFileDialog.h
+++ b/plugins/prtview/LoadPortalFileDialog.h
--- a/plugins/prtview/Makefile
+++ b/plugins/prtview/Makefile
--- a/plugins/prtview/PrtView.txt
+++ b/plugins/prtview/PrtView.txt
--- a/plugins/prtview/portals.cpp
+++ b/plugins/prtview/portals.cpp
--- a/plugins/prtview/portals.h
+++ b/plugins/prtview/portals.h
--- a/plugins/prtview/prtview.cpp
+++ b/plugins/prtview/prtview.cpp
--- a/plugins/prtview/prtview.h
+++ b/plugins/prtview/prtview.h
--- a/radiant/Makefile
+++ b/radiant/Makefile
@ -28,7 +28,7 @@ WS_LIBS= ../libs/libcmdlib.a \
 ../libs/libxmllib.a

 WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION) -DPOSIX -DXWINDOWS
-WS_LDFLAGS=$(LDFLAGS) -ldl -lm $(GTK_LDFLAGS) -lX11 -lGL -lxml2 -lgdkglext-x11-1.0 -lgtkglext-x11-1.0 -L../lib $(WS_LIBS)
+WS_LDFLAGS=$(LDFLAGS) -lm $(GTK_LDFLAGS) -lX11 -lGL -lxml2 -lgdkglext-x11-1.0 -lgtkglext-x11-1.0 -L../lib $(WS_LIBS)

 DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $<

--- a/tools/Makefile
+++ b/tools/Makefile
@ -12,7 +12,7 @@ WS_VERSION= -DWorldSpawn_VERSION="1" -DWorldSpawn_MAJOR_VERSION="0" -DWorldSpawn
 GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
 GLIB_LDFLAGS=$(shell pkg-config --libs glib-2.0)
 VMAP_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../include  -I./common -I../libs -DPOSIX -Wno-narrowing $(WS_VERSION)
-VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -ldl -lm -lpthread -L../lib -lxml2 -ljpeg -lpng -lminizip $(LIBOBJS)
+VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -lm -lpthread -L../lib -lxml2 -ljpeg -lpng -lminizip $(LIBOBJS)

 DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<