From cf3454caba0357e5091b2f906fc57be093261f0a Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 2 Jun 2021 14:10:27 +0200 Subject: [PATCH] Merge contrib with plugins. Add LICENSE for prtview. --- Makefile | 2 -- contrib/Makefile | 8 -------- contrib/prtview/PrtView.aps | Bin 21916 -> 0 bytes LICENSE-GPL => docs/LICENSE-GPL | 0 LICENSE-LGPL => docs/LICENSE-LGPL | 0 plugins/Makefile | 4 ++++ {contrib => plugins}/brushexport/Makefile | 0 {contrib => plugins}/brushexport/callbacks.cpp | 0 {contrib => plugins}/brushexport/callbacks.h | 0 {contrib => plugins}/brushexport/export.cpp | 0 {contrib => plugins}/brushexport/export.h | 0 {contrib => plugins}/brushexport/interface.cpp | 0 {contrib => plugins}/brushexport/plugin.cpp | 0 {contrib => plugins}/brushexport/plugin.h | 0 {contrib => plugins}/brushexport/support.cpp | 0 {contrib => plugins}/brushexport/support.h | 0 {contrib => plugins}/prtview/AboutDialog.cpp | 0 {contrib => plugins}/prtview/AboutDialog.h | 0 {contrib => plugins}/prtview/ConfigDialog.cpp | 0 {contrib => plugins}/prtview/ConfigDialog.h | 0 plugins/prtview/LICENSE | 1 + .../prtview/LoadPortalFileDialog.cpp | 0 .../prtview/LoadPortalFileDialog.h | 0 {contrib => plugins}/prtview/Makefile | 0 {contrib => plugins}/prtview/PrtView.txt | 0 {contrib => plugins}/prtview/portals.cpp | 0 {contrib => plugins}/prtview/portals.h | 0 {contrib => plugins}/prtview/prtview.cpp | 0 {contrib => plugins}/prtview/prtview.h | 0 radiant/Makefile | 2 +- tools/Makefile | 2 +- 31 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 contrib/Makefile delete mode 100644 contrib/prtview/PrtView.aps rename LICENSE-GPL => docs/LICENSE-GPL (100%) rename LICENSE-LGPL => docs/LICENSE-LGPL (100%) rename {contrib => plugins}/brushexport/Makefile (100%) rename {contrib => plugins}/brushexport/callbacks.cpp (100%) rename {contrib => plugins}/brushexport/callbacks.h (100%) rename {contrib => plugins}/brushexport/export.cpp (100%) rename {contrib => plugins}/brushexport/export.h (100%) rename {contrib => plugins}/brushexport/interface.cpp (100%) rename {contrib => plugins}/brushexport/plugin.cpp (100%) rename {contrib => plugins}/brushexport/plugin.h (100%) rename {contrib => plugins}/brushexport/support.cpp (100%) rename {contrib => plugins}/brushexport/support.h (100%) rename {contrib => plugins}/prtview/AboutDialog.cpp (100%) rename {contrib => plugins}/prtview/AboutDialog.h (100%) rename {contrib => plugins}/prtview/ConfigDialog.cpp (100%) rename {contrib => plugins}/prtview/ConfigDialog.h (100%) create mode 100644 plugins/prtview/LICENSE rename {contrib => plugins}/prtview/LoadPortalFileDialog.cpp (100%) rename {contrib => plugins}/prtview/LoadPortalFileDialog.h (100%) rename {contrib => plugins}/prtview/Makefile (100%) rename {contrib => plugins}/prtview/PrtView.txt (100%) rename {contrib => plugins}/prtview/portals.cpp (100%) rename {contrib => plugins}/prtview/portals.h (100%) rename {contrib => plugins}/prtview/prtview.cpp (100%) rename {contrib => plugins}/prtview/prtview.h (100%) diff --git a/Makefile b/Makefile index f708f3f..39f8a37 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/contrib/Makefile b/contrib/Makefile deleted file mode 100644 index 53451a3..0000000 --- a/contrib/Makefile +++ /dev/null @@ -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 diff --git a/contrib/prtview/PrtView.aps b/contrib/prtview/PrtView.aps deleted file mode 100644 index d86f060791a3bb3c138bcadf57243ffbdec5f624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21916 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 diff --git a/LICENSE-GPL b/docs/LICENSE-GPL similarity index 100% rename from LICENSE-GPL rename to docs/LICENSE-GPL diff --git a/LICENSE-LGPL b/docs/LICENSE-LGPL similarity index 100% rename from LICENSE-LGPL rename to docs/LICENSE-LGPL diff --git a/plugins/Makefile b/plugins/Makefile index fd93e87..ca34600 100644 --- 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 diff --git a/contrib/brushexport/Makefile b/plugins/brushexport/Makefile similarity index 100% rename from contrib/brushexport/Makefile rename to plugins/brushexport/Makefile diff --git a/contrib/brushexport/callbacks.cpp b/plugins/brushexport/callbacks.cpp similarity index 100% rename from contrib/brushexport/callbacks.cpp rename to plugins/brushexport/callbacks.cpp diff --git a/contrib/brushexport/callbacks.h b/plugins/brushexport/callbacks.h similarity index 100% rename from contrib/brushexport/callbacks.h rename to plugins/brushexport/callbacks.h diff --git a/contrib/brushexport/export.cpp b/plugins/brushexport/export.cpp similarity index 100% rename from contrib/brushexport/export.cpp rename to plugins/brushexport/export.cpp diff --git a/contrib/brushexport/export.h b/plugins/brushexport/export.h similarity index 100% rename from contrib/brushexport/export.h rename to plugins/brushexport/export.h diff --git a/contrib/brushexport/interface.cpp b/plugins/brushexport/interface.cpp similarity index 100% rename from contrib/brushexport/interface.cpp rename to plugins/brushexport/interface.cpp diff --git a/contrib/brushexport/plugin.cpp b/plugins/brushexport/plugin.cpp similarity index 100% rename from contrib/brushexport/plugin.cpp rename to plugins/brushexport/plugin.cpp diff --git a/contrib/brushexport/plugin.h b/plugins/brushexport/plugin.h similarity index 100% rename from contrib/brushexport/plugin.h rename to plugins/brushexport/plugin.h diff --git a/contrib/brushexport/support.cpp b/plugins/brushexport/support.cpp similarity index 100% rename from contrib/brushexport/support.cpp rename to plugins/brushexport/support.cpp diff --git a/contrib/brushexport/support.h b/plugins/brushexport/support.h similarity index 100% rename from contrib/brushexport/support.h rename to plugins/brushexport/support.h diff --git a/contrib/prtview/AboutDialog.cpp b/plugins/prtview/AboutDialog.cpp similarity index 100% rename from contrib/prtview/AboutDialog.cpp rename to plugins/prtview/AboutDialog.cpp diff --git a/contrib/prtview/AboutDialog.h b/plugins/prtview/AboutDialog.h similarity index 100% rename from contrib/prtview/AboutDialog.h rename to plugins/prtview/AboutDialog.h diff --git a/contrib/prtview/ConfigDialog.cpp b/plugins/prtview/ConfigDialog.cpp similarity index 100% rename from contrib/prtview/ConfigDialog.cpp rename to plugins/prtview/ConfigDialog.cpp diff --git a/contrib/prtview/ConfigDialog.h b/plugins/prtview/ConfigDialog.h similarity index 100% rename from contrib/prtview/ConfigDialog.h rename to plugins/prtview/ConfigDialog.h diff --git a/plugins/prtview/LICENSE b/plugins/prtview/LICENSE new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/plugins/prtview/LICENSE @@ -0,0 +1 @@ + diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/plugins/prtview/LoadPortalFileDialog.cpp similarity index 100% rename from contrib/prtview/LoadPortalFileDialog.cpp rename to plugins/prtview/LoadPortalFileDialog.cpp diff --git a/contrib/prtview/LoadPortalFileDialog.h b/plugins/prtview/LoadPortalFileDialog.h similarity index 100% rename from contrib/prtview/LoadPortalFileDialog.h rename to plugins/prtview/LoadPortalFileDialog.h diff --git a/contrib/prtview/Makefile b/plugins/prtview/Makefile similarity index 100% rename from contrib/prtview/Makefile rename to plugins/prtview/Makefile diff --git a/contrib/prtview/PrtView.txt b/plugins/prtview/PrtView.txt similarity index 100% rename from contrib/prtview/PrtView.txt rename to plugins/prtview/PrtView.txt diff --git a/contrib/prtview/portals.cpp b/plugins/prtview/portals.cpp similarity index 100% rename from contrib/prtview/portals.cpp rename to plugins/prtview/portals.cpp diff --git a/contrib/prtview/portals.h b/plugins/prtview/portals.h similarity index 100% rename from contrib/prtview/portals.h rename to plugins/prtview/portals.h diff --git a/contrib/prtview/prtview.cpp b/plugins/prtview/prtview.cpp similarity index 100% rename from contrib/prtview/prtview.cpp rename to plugins/prtview/prtview.cpp diff --git a/contrib/prtview/prtview.h b/plugins/prtview/prtview.h similarity index 100% rename from contrib/prtview/prtview.h rename to plugins/prtview/prtview.h diff --git a/radiant/Makefile b/radiant/Makefile index c2fa27d..b9474ac 100644 --- 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 $< diff --git a/tools/Makefile b/tools/Makefile index 8ab8992..13f8672 100644 --- 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 $<