From: rpolzer Date: Mon, 15 Sep 2008 09:24:24 +0000 (+0000) Subject: now added all plugins that make sense for Q3 maps X-Git-Tag: svn-r421~391 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=c664bbb72a71ab2b406b76b642eea471cbbffdb2 now added all plugins that make sense for Q3 maps git-svn-id: svn://svn.icculus.org/netradiant/trunk@29 61c419a2-8eb2-4b30-bcec-8cead039b335 --- diff --git a/Makefile b/Makefile index a6ac6a25..0fc51a65 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ all: \ install/modules/shaders.$(DLL) \ install/modules/vfspk3.$(DLL) \ install/modules/bobtoolz.$(DLL) \ + install/modules/brushexport.$(DLL) \ install-data \ .PHONY: clean @@ -484,6 +485,36 @@ install/modules/bobtoolz.$(DLL): \ libcmdlib.$(A) \ libprofile.$(A) \ +install/modules/brushexport.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) +install/modules/brushexport.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +install/modules/brushexport.$(DLL): \ + contrib/brushexport/plugin.o \ + contrib/brushexport/interface.o \ + contrib/brushexport/callbacks.o \ + contrib/brushexport/support.o \ + contrib/brushexport/export.o \ + +install/modules/prtview.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) +install/modules/prtview.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +install/modules/prtview.$(DLL): \ + contrib/prtview/AboutDialog.o \ + contrib/prtview/ConfigDialog.o \ + contrib/prtview/LoadPortalFileDialog.o \ + contrib/prtview/portals.o \ + contrib/prtview/prtview.o \ + libprofile.$(A) \ + +install/modules/shaderplug.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_XML) +install/modules/shaderplug.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_XML) -Ilibs -Iinclude +install/modules/shaderplug.$(DLL): \ + contrib/shaderplug/shaderplug.o \ + libxmllib.$(A) \ + +install/modules/sunplug.$(DLL): LIBS := $(LIBS_GLIB) $(LIBS_GTK) +install/modules/sunplug.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude +install/modules/sunplug.$(DLL): \ + contrib/sunplug/sunplug.o \ + .PHONY: makeversion makeversion: set -ex; \ diff --git a/completebuild.sh b/completebuild.sh index a74481f7..e527b908 100644 --- a/completebuild.sh +++ b/completebuild.sh @@ -490,11 +490,11 @@ g++ -o build/debug/vfspk3.so $LDFLAGS_DYNAMICLIB `pkg-config glib-2.0 --libs` bu ## mv "build/debug/model.so" "install/modules/model.so" ## mv "build/debug/shaders.so" "install/modules/shaders.so" ## mv "build/debug/vfspk3.so" "install/modules/vfspk3.so" -mv "build/debug/bobtoolz.so" "install/plugins/bobtoolz.so" -mv "build/debug/brushexport.so" "install/plugins/brushexport.so" -mv "build/debug/prtview.so" "install/plugins/prtview.so" -mv "build/debug/shaderplug.so" "install/plugins/shaderplug.so" -mv "build/debug/sunplug.so" "install/plugins/sunplug.so" +## mv "build/debug/bobtoolz.so" "install/plugins/bobtoolz.so" +## mv "build/debug/brushexport.so" "install/plugins/brushexport.so" +## mv "build/debug/prtview.so" "install/plugins/prtview.so" +## mv "build/debug/shaderplug.so" "install/plugins/shaderplug.so" +## mv "build/debug/sunplug.so" "install/plugins/sunplug.so" #? mv "build/debug/ufoaiplug.so" "install/plugins/ufoaiplug.so" #? mv "build/debug/quake2_tools/q2map" "install/q2map" ## mv "build/debug/q3data.x86" "install/q3data.x86"