vera/vmap
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge contrib with plugins. Add LICENSE for prtview.

Browse source
This commit is contained in:
Marco Cawthorne 2021-06-02 14:10:27 +02:00
parent af91433555
commit cf3454caba
31 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -4,7 +4,6 @@ all:
cd radiant && $(MAKE) cd radiant && $(MAKE)
cd plugins && $(MAKE) cd plugins && $(MAKE)
cd tools && $(MAKE) cd tools && $(MAKE)
cd contrib && $(MAKE)
clean: clean:
-rm -rf ./build -rm -rf ./build
@ -12,4 +11,3 @@ clean:
cd radiant && $(MAKE) clean cd radiant && $(MAKE) clean
cd plugins && $(MAKE) clean cd plugins && $(MAKE) clean
cd tools && $(MAKE) clean cd tools && $(MAKE) clean
cd contrib && $(MAKE) clean

8
contrib/Makefile
View file

@ -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

BIN
contrib/prtview/PrtView.aps
View file

Binary file not shown.

0
LICENSE-GPL → docs/LICENSE-GPL
View file

0
LICENSE-LGPL → docs/LICENSE-LGPL
View file

4
plugins/Makefile
View file

@ -8,6 +8,8 @@ all:
cd model && $(MAKE) cd model && $(MAKE)
cd shaders && $(MAKE) cd shaders && $(MAKE)
cd vfspk3 && $(MAKE) cd vfspk3 && $(MAKE)
cd brushexport && $(MAKE)
cd prtview && $(MAKE)
clean: clean:
-rm -rf ../build/plugins -rm -rf ../build/plugins
cd archivezip && $(MAKE) clean cd archivezip && $(MAKE) clean
@ -18,3 +20,5 @@ clean:
cd model && $(MAKE) clean cd model && $(MAKE) clean
cd shaders && $(MAKE) clean cd shaders && $(MAKE) clean
cd vfspk3 && $(MAKE) clean cd vfspk3 && $(MAKE) clean
cd brushexport && $(MAKE) clean
cd prtview && $(MAKE) clean

0
contrib/brushexport/Makefile → plugins/brushexport/Makefile
View file

0
contrib/brushexport/callbacks.cpp → plugins/brushexport/callbacks.cpp
View file

0
contrib/brushexport/callbacks.h → plugins/brushexport/callbacks.h
View file

0
contrib/brushexport/export.cpp → plugins/brushexport/export.cpp
View file

0
contrib/brushexport/export.h → plugins/brushexport/export.h
View file

0
contrib/brushexport/interface.cpp → plugins/brushexport/interface.cpp
View file

0
contrib/brushexport/plugin.cpp → plugins/brushexport/plugin.cpp
View file

0
contrib/brushexport/plugin.h → plugins/brushexport/plugin.h
View file

0
contrib/brushexport/support.cpp → plugins/brushexport/support.cpp
View file

0
contrib/brushexport/support.h → plugins/brushexport/support.h
View file

0
contrib/prtview/AboutDialog.cpp → plugins/prtview/AboutDialog.cpp
View file

0
contrib/prtview/AboutDialog.h → plugins/prtview/AboutDialog.h
View file

0
contrib/prtview/ConfigDialog.cpp → plugins/prtview/ConfigDialog.cpp
View file

0
contrib/prtview/ConfigDialog.h → plugins/prtview/ConfigDialog.h
View file

1
plugins/prtview/LICENSE Normal file
View file

@ -0,0 +1 @@

0
contrib/prtview/LoadPortalFileDialog.cpp → plugins/prtview/LoadPortalFileDialog.cpp
View file

0
contrib/prtview/LoadPortalFileDialog.h → plugins/prtview/LoadPortalFileDialog.h
View file

0
contrib/prtview/Makefile → plugins/prtview/Makefile
View file

0
contrib/prtview/PrtView.txt → plugins/prtview/PrtView.txt
View file

0
contrib/prtview/portals.cpp → plugins/prtview/portals.cpp
View file

0
contrib/prtview/portals.h → plugins/prtview/portals.h
View file

0
contrib/prtview/prtview.cpp → plugins/prtview/prtview.cpp
View file

0
contrib/prtview/prtview.h → plugins/prtview/prtview.h
View file

2
radiant/Makefile
View file

@ -28,7 +28,7 @@ WS_LIBS= ../libs/libcmdlib.a \
../libs/libxmllib.a ../libs/libxmllib.a
WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION) -DPOSIX -DXWINDOWS 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 $< DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $<

2
tools/Makefile
View file

@ -12,7 +12,7 @@ WS_VERSION= -DWorldSpawn_VERSION="1" -DWorldSpawn_MAJOR_VERSION="0" -DWorldSpawn
GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0) GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
GLIB_LDFLAGS=$(shell pkg-config --libs 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_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 $< DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<