mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-10 07:11:41 +00:00
make pak get built with the rest of the system
This commit is contained in:
parent
1757030521
commit
568e7ecdb2
5 changed files with 23 additions and 28 deletions
|
@ -1804,6 +1804,13 @@ AC_SUBST(QFCC_LIBS)
|
|||
AC_SUBST(QFCC_DEPS)
|
||||
AC_SUBST(QFCC_INCS)
|
||||
|
||||
PAK_DEPS='$(top_builddir)/libs/util/libQFutil.la'
|
||||
PAK_LIBS="${QFCC_DEPS} ${WINMM}"
|
||||
PAK_INCS=""
|
||||
AC_SUBST(PAK_LIBS)
|
||||
AC_SUBST(PAK_DEPS)
|
||||
AC_SUBST(PAK_INCS)
|
||||
|
||||
AC_DEFINE_UNQUOTED(PATH_SEPARATOR, '/', [Define this to your operating system's path separator character])
|
||||
AC_DEFINE_UNQUOTED(CPP_NAME, "$CPP_NAME", [Define this to the command line for the C preprocessor])
|
||||
AC_DEFINE(USE_CPP, 1, [Define this if you want qfcc to use the C preprocessor])
|
||||
|
@ -1865,6 +1872,7 @@ AC_OUTPUT(
|
|||
nq/source/Makefile
|
||||
|
||||
tools/Makefile
|
||||
tools/pak/Makefile
|
||||
tools/qfcc/Makefile
|
||||
tools/qfcc/doc/Makefile
|
||||
tools/qfcc/doc/man/Makefile
|
||||
|
|
|
@ -1 +1 @@
|
|||
SUBDIRS=qfcc
|
||||
SUBDIRS=pak qfcc
|
||||
|
|
1
tools/pak/.gitignore
vendored
1
tools/pak/.gitignore
vendored
|
@ -4,5 +4,6 @@
|
|||
.deps
|
||||
.libs
|
||||
.vimrc
|
||||
Makefile
|
||||
Makefile.in
|
||||
pak
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
EXE=pak
|
||||
|
||||
MAKEDEPS=$(CC) -MM $(CPPFLAGS) $< | sed -e 's/$*\.o:*/$*\.o $@:/g' > $@
|
||||
|
||||
CFLAGS+=-Wall -Werror -g -O2
|
||||
CPPFLAGS+=
|
||||
#LDFLAGS=-static
|
||||
LIBS=
|
||||
vpath %.a
|
||||
|
||||
SRC=pak.c pakfile.c
|
||||
|
||||
%.d: %.c
|
||||
$(MAKEDEPS)
|
||||
|
||||
OBJ=$(patsubst %,%.o,$(basename $(SRC)))
|
||||
DEP=$(patsubst %.o,%.d,$(OBJ))
|
||||
|
||||
all: $(EXE)
|
||||
|
||||
$(EXE): $(OBJ) $(LIBS)
|
||||
$(CC) $(LDFLAGS) -o $@ $^ -lQFutil -lz -lm
|
||||
|
||||
clean:
|
||||
rm -f $(EXE) *.o *.d core
|
||||
|
||||
-include $(DEP)
|
13
tools/pak/Makefile.am
Normal file
13
tools/pak/Makefile.am
Normal file
|
@ -0,0 +1,13 @@
|
|||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
PAK_LIBS=@PAK_LIBS@
|
||||
PAK_DEPS=@PAK_DEPS@
|
||||
PAK_INCS=@PAK_INCS@
|
||||
|
||||
INCLUDES= -I$(top_srcdir)/include $(PAK_INCS)
|
||||
|
||||
bin_PROGRAMS= pak
|
||||
|
||||
pak_SOURCES= pak.c pakfile.c
|
||||
pak_LDADD= $(PAK_LIBS)
|
||||
pak_DEPENDENCIES= $(PAK_DEPS)
|
Loading…
Reference in a new issue