From 416b4ec594a539e5259e95108766566299becb9b Mon Sep 17 00:00:00 2001 From: rpolzer Date: Mon, 15 Sep 2008 07:40:40 +0000 Subject: [PATCH] add entity and image plugins git-svn-id: svn://svn.icculus.org/netradiant/trunk@18 61c419a2-8eb2-4b30-bcec-8cead039b335 --- Makefile | 36 ++++++++++++++++++++++++++++++++++++ completebuild.sh | 6 +++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 85b542cb..8c3ca04d 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,8 @@ all: \ install/q3data.$(EXE) \ install/radiant.$(EXE) \ install/modules/archivezip.$(DLL) \ + install/modules/entity.$(DLL) \ + install/modules/image.$(DLL) \ .PHONY: clean clean: @@ -354,3 +356,37 @@ install/modules/archivezip.$(DLL): \ plugins/archivezip/pkzip.o \ plugins/archivezip/zlibstream.o \ +install/modules/entity.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/entity.$(DLL): \ + plugins/entity/plugin.o \ + plugins/entity/entity.o \ + plugins/entity/eclassmodel.o \ + plugins/entity/generic.o \ + plugins/entity/group.o \ + plugins/entity/light.o \ + plugins/entity/miscmodel.o \ + plugins/entity/doom3group.o \ + plugins/entity/skincache.o \ + plugins/entity/angle.o \ + plugins/entity/angles.o \ + plugins/entity/colour.o \ + plugins/entity/filters.o \ + plugins/entity/model.o \ + plugins/entity/namedentity.o \ + plugins/entity/origin.o \ + plugins/entity/scale.o \ + plugins/entity/targetable.o \ + plugins/entity/rotation.o \ + plugins/entity/modelskinkey.o \ + +install/modules/image.$(DLL): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs -Iinclude +install/modules/image.$(DLL): \ + plugins/image/bmp.o \ + plugins/image/jpeg.o \ + plugins/image/image.o \ + plugins/image/pcx.o \ + plugins/image/tga.o \ + plugins/image/dds.o \ + libjpeg6.$(A) \ + libddslib.$(A) \ + diff --git a/completebuild.sh b/completebuild.sh index 7a143aff..6736c07b 100644 --- a/completebuild.sh +++ b/completebuild.sh @@ -478,9 +478,9 @@ g++ -o build/debug/vfspk3.so $LDFLAGS_DYNAMICLIB `pkg-config glib-2.0 --libs` bu #? 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/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/imagepng.so" "install/modules/imagepng.so" #? mv "build/debug/imageq2.so" "install/modules/imageq2.so" -- 2.39.2