add q3data

git-svn-id: svn://svn.icculus.org/netradiant/trunk@14 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-15 06:48:12 +00:00
parent 34146e4e53
commit 51409e5bd1
2 changed files with 33 additions and 4 deletions

View File

@ -34,7 +34,9 @@ LDFLAGS_PNG = `libpng-config --libs`
# from qe3.cpp: ; # from qe3.cpp: ;
.PHONY: all .PHONY: all
all: install/q3map2.$(EXE) all: \
install/q3map2.$(EXE) \
install/q3data.$(EXE) \
.PHONY: clean .PHONY: clean
clean: clean:
@ -171,3 +173,30 @@ libddslib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs
libddslib.$(A): \ libddslib.$(A): \
libs/ddslib/ddslib.o \ libs/ddslib/ddslib.o \
install/q3data.$(EXE): LIBS := -lmhash
install/q3data.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Itools/quake3/common -Ilibs -Iinclude
install/q3data.$(EXE): LDFLAGS := $(LDFLAGS_COMMON) $(LDFLAGS_XML) $(LDFLAGS_GLIB)
install/q3data.$(EXE): \
tools/quake3/common/aselib.o \
tools/quake3/common/bspfile.o \
tools/quake3/common/cmdlib.o \
tools/quake3/common/imagelib.o \
tools/quake3/common/inout.o \
tools/quake3/common/md4.o \
tools/quake3/common/scriplib.o \
tools/quake3/common/trilib.o \
tools/quake3/common/unzip.o \
tools/quake3/common/vfs.o \
tools/quake3/q3data/3dslib.o \
tools/quake3/q3data/compress.o \
tools/quake3/q3data/images.o \
tools/quake3/q3data/md3lib.o \
tools/quake3/q3data/models.o \
tools/quake3/q3data/p3dlib.o \
tools/quake3/q3data/polyset.o \
tools/quake3/q3data/q3data.o \
tools/quake3/q3data/stripper.o \
tools/quake3/q3data/video.o \
libmathlib.$(A) \
libl_net.$(A) \

View File

@ -19,7 +19,7 @@ CFLAGS_MAPXML="-c `xml2-config --cflags` `pkg-config glib-2.0 --cflags` -Ibuild
CFLAGS_XML="-c `pkg-config glib-2.0 --cflags` `xml2-config --cflags` -Ibuild/debug/include -Iinclude -Ibuild/debug/libs -Ilibs" CFLAGS_XML="-c `pkg-config glib-2.0 --cflags` `xml2-config --cflags` -Ibuild/debug/include -Iinclude -Ibuild/debug/libs -Ilibs"
CFLAGS_VFSPK3="-c `pkg-config glib-2.0 --cflags` -Ibuild/debug/libs -Ilibs -Ibuild/debug/include -Iinclude" CFLAGS_VFSPK3="-c `pkg-config glib-2.0 --cflags` -Ibuild/debug/libs -Ilibs -Ibuild/debug/include -Iinclude"
LDFLAG_DYNAMICLIB="-fPIC -Wl,-fini,fini_stub -L. -static-libgcc -ldl -shared" LDFLAG_DYNAMICLIB="-fPIC -Wl,-fini,fini_stub -static-libgcc -ldl -shared"
gcc() gcc()
{ {
@ -495,8 +495,8 @@ mv "build/debug/shaderplug.so" "install/plugins/shaderplug.so"
mv "build/debug/sunplug.so" "install/plugins/sunplug.so" mv "build/debug/sunplug.so" "install/plugins/sunplug.so"
mv "build/debug/ufoaiplug.so" "install/plugins/ufoaiplug.so" mv "build/debug/ufoaiplug.so" "install/plugins/ufoaiplug.so"
mv "build/debug/quake2_tools/q2map" "install/q2map" mv "build/debug/quake2_tools/q2map" "install/q2map"
mv "build/debug/q3data.x86" "install/q3data.x86" ## mv "build/debug/q3data.x86" "install/q3data.x86"
mv "build/debug/q3map2.x86" "install/q3map2.x86" ## mv "build/debug/q3map2.x86" "install/q3map2.x86"
mv "build/debug/quake2_tools/qdata3" "install/qdata3" mv "build/debug/quake2_tools/qdata3" "install/qdata3"
mv "build/debug/radiant.x86" "install/radiant.x86" mv "build/debug/radiant.x86" "install/radiant.x86"