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 d86f060..0000000 Binary files a/contrib/prtview/PrtView.aps and /dev/null differ 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 $<