From 98f9fba1aafd482872f74299902de397561e97c4 Mon Sep 17 00:00:00 2001 From: rpolzer Date: Mon, 15 Sep 2008 07:26:36 +0000 Subject: [PATCH] added the first plugin git-svn-id: svn://svn.icculus.org/netradiant/trunk@17 61c419a2-8eb2-4b30-bcec-8cead039b335 --- Makefile | 17 +++++++++++++++-- completebuild.sh | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d001cde8..85b542cb 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,12 @@ CFLAGS = -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -g3 -fPIC CXXFLAGS = $(CFLAGS) -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti CPPFLAGS_COMMON = -DPOSIX -DXWINDOWS -D_DEBUG -D_LINUX LDFLAGS_COMMON = +LDFLAGS_DLL = -fPIC -Wl,-fini,fini_stub -static-libgcc -ldl + EXE = x86 A = a -SO = so +DLL = so NETAPI = berkley -LDFLAGS_SO = -fPIC -Wl,-fini,fini_stub -static-libgcc -ldl -shared FIND ?= find RANLIB ?= ranlib @@ -44,6 +45,7 @@ all: \ install/q3map2.$(EXE) \ install/q3data.$(EXE) \ install/radiant.$(EXE) \ + install/modules/archivezip.$(DLL) \ .PHONY: clean clean: @@ -56,6 +58,9 @@ clean: $(AR) rc $@ $^ $(RANLIB) $@ +%.$(DLL): + $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS) + install/q3map2.$(EXE): LIBS := -lmhash install/q3map2.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude install/q3map2.$(EXE): LDFLAGS := $(LDFLAGS_COMMON) $(LDFLAGS_XML) $(LDFLAGS_GLIB) $(LDFLAGS_PNG) @@ -341,3 +346,11 @@ libxmllib.$(A): \ libs/xml/xmlelement.o \ libs/xml/xmltextags.o \ +install/modules/archivezip.$(DLL): LIBS := -lz +install/modules/archivezip.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/archivezip.$(DLL): \ + plugins/archivezip/plugin.o \ + plugins/archivezip/archive.o \ + plugins/archivezip/pkzip.o \ + plugins/archivezip/zlibstream.o \ + diff --git a/completebuild.sh b/completebuild.sh index 3c87568b..7a143aff 100644 --- a/completebuild.sh +++ b/completebuild.sh @@ -468,6 +468,8 @@ g++ -o build/debug/radiant/windowobservers.o $CFLAGS_RADIANT radiant/windowobser g++ -o build/debug/radiant/xmlstuff.o $CFLAGS_RADIANT radiant/xmlstuff.cpp g++ -o build/debug/radiant/xywindow.o $CFLAGS_RADIANT radiant/xywindow.cpp g++ -o build/debug/radiant.x86 -fPIC -Wl,-fini,fini_stub -L. -static-libgcc -ldl -lGL `pkg-config glib-2.0 --libs` `xml2-config --libs` `pkg-config gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l` -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 build/debug/radiant/autosave.o build/debug/radiant/brush.o build/debug/radiant/brushmanip.o build/debug/radiant/brushmodule.o build/debug/radiant/brushnode.o build/debug/radiant/brushtokens.o build/debug/radiant/brushxml.o build/debug/radiant/brush_primit.o build/debug/radiant/build.o build/debug/radiant/camwindow.o build/debug/radiant/clippertool.o build/debug/radiant/commands.o build/debug/radiant/console.o build/debug/radiant/csg.o build/debug/radiant/dialog.o build/debug/radiant/eclass.o build/debug/radiant/eclass_def.o build/debug/radiant/eclass_doom3.o build/debug/radiant/eclass_fgd.o build/debug/radiant/eclass_xml.o build/debug/radiant/entity.o build/debug/radiant/entityinspector.o build/debug/radiant/entitylist.o build/debug/radiant/environment.o build/debug/radiant/error.o build/debug/radiant/feedback.o build/debug/radiant/filetypes.o build/debug/radiant/filters.o build/debug/radiant/findtexturedialog.o build/debug/radiant/glwidget.o build/debug/radiant/grid.o build/debug/radiant/groupdialog.o build/debug/radiant/gtkdlgs.o build/debug/radiant/gtkmisc.o build/debug/radiant/help.o build/debug/radiant/image.o build/debug/radiant/main.o build/debug/radiant/mainframe.o build/debug/radiant/map.o build/debug/radiant/mru.o build/debug/radiant/nullmodel.o build/debug/radiant/parse.o build/debug/radiant/patch.o build/debug/radiant/patchdialog.o build/debug/radiant/patchmanip.o build/debug/radiant/patchmodule.o build/debug/radiant/plugin.o build/debug/radiant/pluginapi.o build/debug/radiant/pluginmanager.o build/debug/radiant/pluginmenu.o build/debug/radiant/plugintoolbar.o build/debug/radiant/points.o build/debug/radiant/preferencedictionary.o build/debug/radiant/preferences.o build/debug/radiant/qe3.o build/debug/radiant/qgl.o build/debug/radiant/referencecache.o build/debug/radiant/renderer.o build/debug/radiant/renderstate.o build/debug/radiant/scenegraph.o build/debug/radiant/stacktrace.o build/debug/radiant/select.o build/debug/radiant/selection.o build/debug/radiant/server.o build/debug/radiant/shaders.o build/debug/radiant/sockets.o build/debug/radiant/surfacedialog.o build/debug/radiant/texmanip.o build/debug/radiant/textures.o build/debug/radiant/texwindow.o build/debug/radiant/timer.o build/debug/radiant/treemodel.o build/debug/radiant/undo.o build/debug/radiant/url.o build/debug/radiant/view.o build/debug/radiant/watchbsp.o build/debug/radiant/winding.o build/debug/radiant/windowobservers.o build/debug/radiant/xmlstuff.o build/debug/radiant/xywindow.o -Lbuild/debug/libs -Llibs -lmathlib -lcmdlib -ll_net -lprofile -lgtkutil -lxmllib +g++ -o install/radiant.x86 radiant/autosave.o radiant/brush.o radiant/brushmanip.o radiant/brushmodule.o radiant/brushnode.o radiant/brushtokens.o radiant/brushxml.o radiant/brush_primit.o radiant/build.o radiant/camwindow.o radiant/clippertool.o radiant/commands.o radiant/console.o radiant/csg.o radiant/dialog.o radiant/eclass.o radiant/eclass_def.o radiant/eclass_doom3.o radiant/eclass_fgd.o radiant/eclass_xml.o radiant/entity.o radiant/entityinspector.o radiant/entitylist.o radiant/environment.o radiant/error.o radiant/feedback.o radiant/filetypes.o radiant/filters.o radiant/findtexturedialog.o radiant/glwidget.o radiant/grid.o radiant/groupdialog.o radiant/gtkdlgs.o radiant/gtkmisc.o radiant/help.o radiant/image.o radiant/main.o radiant/mainframe.o radiant/map.o radiant/mru.o radiant/nullmodel.o radiant/parse.o radiant/patch.o radiant/patchdialog.o radiant/patchmanip.o radiant/patchmodule.o radiant/plugin.o radiant/pluginapi.o radiant/pluginmanager.o radiant/pluginmenu.o radiant/plugintoolbar.o radiant/points.o radiant/preferencedictionary.o radiant/preferences.o radiant/qe3.o radiant/qgl.o radiant/referencecache.o radiant/renderer.o radiant/renderstate.o radiant/scenegraph.o radiant/stacktrace.o radiant/select.o radiant/selection.o radiant/server.o radiant/shaders.o radiant/sockets.o radiant/surfacedialog.o radiant/texmanip.o radiant/textures.o radiant/texwindow.o radiant/timer.o radiant/treemodel.o radiant/undo.o radiant/url.o radiant/view.o radiant/watchbsp.o radiant/winding.o radiant/windowobservers.o radiant/xmlstuff.o radiant/xywindow.o libmathlib.a libcmdlib.a libl_net.a libprofile.a libgtkutil.a libxmllib.a `xml2-config --libs` `pkg-config glib-2.0 --libs` `pkg-config gtk+-2.0 --libs` `pkg-config gtkglext-1.0 --libs` -lmhash + g++ -o build/debug/shaderplug.so $LDFLAGS_DYNAMICLIB `pkg-config glib-2.0 --libs` `pkg-config gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l` `xml2-config --libs` build/debug/contrib/shaderplug/shaderplug.os -Lbuild/debug/libs -Llibs -lxmllib g++ -o build/debug/shaders.so $LDFLAGS_DYNAMICLIB `pkg-config glib-2.0 --libs` build/debug/plugins/shaders/shaders.os build/debug/plugins/shaders/plugin.os -Lbuild/debug/libs -Llibs -lcmdlib g++ -o build/debug/sunplug.so $LDFLAGS_DYNAMICLIB `pkg-config glib-2.0 --libs` `pkg-config gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l` build/debug/contrib/sunplug/sunplug.os -Lbuild/debug/libs -Llibs -- 2.39.2