From 09a4da22d4d5cb9aeeda3f568fda0565919f2f7b Mon Sep 17 00:00:00 2001 From: rpolzer Date: Mon, 15 Sep 2008 07:04:39 +0000 Subject: [PATCH 1/1] should build radiant now (but not any of its plugins yet) git-svn-id: svn://svn.icculus.org/netradiant/trunk@15 61c419a2-8eb2-4b30-bcec-8cead039b335 --- Makefile | 141 +++++++++++++++++++++++++++++++++++++++++++++++ completebuild.sh | 20 +++---- 2 files changed, 151 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index b68839e0..de38ffca 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,12 @@ LDFLAGS_XML = `xml2-config --libs` CPPFLAGS_PNG = `libpng-config --cflags` LDFLAGS_PNG = `libpng-config --libs` +CPPFLAGS_GTK = `pkg-config gtk+-2.0 --cflags` +LDFLAGS_GTK = `pkg-config gtk+-2.0 --libs` + +CPPFLAGS_GTKGLEXT = `pkg-config gtkglext-1.0 --cflags` +LDFLAGS_GTKGLEXT = `pkg-config gtkglext-1.0 --libs` + # from qe3.cpp: const char* const EXECUTABLE_TYPE = # from qe3.cpp: #if defined(__linux__) || defined (__FreeBSD__) # from qe3.cpp: "x86" @@ -37,6 +43,7 @@ LDFLAGS_PNG = `libpng-config --libs` all: \ install/q3map2.$(EXE) \ install/q3data.$(EXE) \ + install/radiant.$(EXE) \ .PHONY: clean clean: @@ -200,3 +207,137 @@ install/q3data.$(EXE): \ libmathlib.$(A) \ libl_net.$(A) \ +install/radiant.$(EXE): LIBS := -lmhash +install/radiant.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude +install/radiant.$(EXE): LDFLAGS := $(LDFLAGS_COMMON) $(LDFLAGS_XML) $(LDFLAGS_GLIB) $(LDFLAGS_GTK) $(LDFLAGS_GTKGLEXT) +install/radiant.$(EXE): \ + 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) \ + +libcmdlib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs +libcmdlib.$(A): \ + libs/cmdlib/cmdlib.o \ + +libprofile.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +libprofile.$(A): \ + libs/profile/profile.o \ + libs/profile/file.o \ + +libgtkutil.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude +libgtkutil.$(A): \ + libs/gtkutil/accelerator.o \ + libs/gtkutil/button.o \ + libs/gtkutil/clipboard.o \ + libs/gtkutil/closure.o \ + libs/gtkutil/container.o \ + libs/gtkutil/cursor.o \ + libs/gtkutil/dialog.o \ + libs/gtkutil/entry.o \ + libs/gtkutil/frame.o \ + libs/gtkutil/filechooser.o \ + libs/gtkutil/glfont.o \ + libs/gtkutil/glwidget.o \ + libs/gtkutil/image.o \ + libs/gtkutil/idledraw.o \ + libs/gtkutil/menu.o \ + libs/gtkutil/messagebox.o \ + libs/gtkutil/nonmodal.o \ + libs/gtkutil/paned.o \ + libs/gtkutil/pointer.o \ + libs/gtkutil/toolbar.o \ + libs/gtkutil/widget.o \ + libs/gtkutil/window.o \ + libs/gtkutil/xorrectangle.o \ + +libxmllib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Ilibs -Iinclude +libxmllib.$(A): \ + libs/xml/ixml.o \ + libs/xml/xmlparser.o \ + libs/xml/xmlwriter.o \ + libs/xml/xmlelement.o \ + libs/xml/xmltextags.o \ + diff --git a/completebuild.sh b/completebuild.sh index 29319592..3c87568b 100644 --- a/completebuild.sh +++ b/completebuild.sh @@ -473,17 +473,17 @@ g++ -o build/debug/shaders.so $LDFLAGS_DYNAMICLIB `pkg-config glib-2.0 --libs` b 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 g++ -o build/debug/ufoaiplug.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/ufoaiplug/ufoai.os build/debug/contrib/ufoaiplug/ufoai_filters.os build/debug/contrib/ufoaiplug/ufoai_gtk.os build/debug/contrib/ufoaiplug/ufoai_level.os -Lbuild/debug/libs -Llibs g++ -o build/debug/vfspk3.so $LDFLAGS_DYNAMICLIB `pkg-config glib-2.0 --libs` build/debug/plugins/vfspk3/vfspk3.os build/debug/plugins/vfspk3/vfs.os build/debug/plugins/vfspk3/archive.os -Lbuild/debug -L. -mv "build/debug/h2data" "install/heretic2/h2data" -mv "build/debug/archivepak.so" "install/modules/archivepak.so" -mv "build/debug/archivewad.so" "install/modules/archivewad.so" +#? mv "build/debug/h2data" "install/heretic2/h2data" +#? mv "build/debug/archivepak.so" "install/modules/archivepak.so" +#? mv "build/debug/archivewad.so" "install/modules/archivewad.so" mv "build/debug/archivezip.so" "install/modules/archivezip.so" mv "build/debug/entity.so" "install/modules/entity.so" mv "build/debug/image.so" "install/modules/image.so" -mv "build/debug/imagehl.so" "install/modules/imagehl.so" +#? mv "build/debug/imagehl.so" "install/modules/imagehl.so" mv "build/debug/imagepng.so" "install/modules/imagepng.so" -mv "build/debug/imageq2.so" "install/modules/imageq2.so" +#? mv "build/debug/imageq2.so" "install/modules/imageq2.so" mv "build/debug/mapq3.so" "install/modules/mapq3.so" -mv "build/debug/mapxml.so" "install/modules/mapxml.so" +#? mv "build/debug/mapxml.so" "install/modules/mapxml.so" mv "build/debug/md3model.so" "install/modules/md3model.so" mv "build/debug/model.so" "install/modules/model.so" mv "build/debug/shaders.so" "install/modules/shaders.so" @@ -493,11 +493,11 @@ 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/ufoaiplug.so" "install/plugins/ufoaiplug.so" +#? mv "build/debug/quake2_tools/q2map" "install/q2map" ## mv "build/debug/q3data.x86" "install/q3data.x86" ## mv "build/debug/q3map2.x86" "install/q3map2.x86" -mv "build/debug/quake2_tools/qdata3" "install/qdata3" -mv "build/debug/radiant.x86" "install/radiant.x86" +#? mv "build/debug/quake2_tools/qdata3" "install/qdata3" +## mv "build/debug/radiant.x86" "install/radiant.x86" # TODO add install.sh's work -- 2.39.2