Imported Upstream version 0.72.4

This commit is contained in:
TANIGUCHI Takaki
2012-04-08 21:33:59 +09:00
parent cef31abc8c
commit 2f23ea4b4a
1170 changed files with 116562 additions and 55295 deletions

View File

@@ -15,8 +15,7 @@ BZ2_INCL = $(CFG_BZ2_INCL)
BZ2_LFLAGS = $(CFG_BZ2_LFLAGS)
BZ2_LIBS = $(CFG_BZ2_LIBS)
PNG_INCL = $(CFG_PNG_INCL)
PNG_LFLAGS = $(CFG_PNG_LFLAGS)
PNG_CFLAGS = $(CFG_PNG_CFLAGS)
PNG_LIBS = $(CFG_PNG_LIBS)
SYS_OPTIONS = $(CFG_SYS_OPTIONS)
@@ -25,8 +24,8 @@ WITH_OPTIONS = $(CFG_WITH_OPTIONS)
EXE_SUFFIX = $(CFG_EXE_SUFFIX)
LOCATIONS = -DSRCDIR=\"$(SRCDIR)\" -DBINDIR=\"$(BINDIR)\" -DDOCDIR=\"$(DOCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
COPTS = $(CFLAGS) $(LOCATIONS) $(SYS_OPTIONS) $(HAVE_OPTIONS) $(WITH_OPTIONS) $(BZ2_INCL) $(PNG_INCL)
LOPTS = $(LDFLAGS) $(BZ2_LFLAGS) $(PNG_LFLAGS)
COPTS = $(CFLAGS) $(LOCATIONS) $(SYS_OPTIONS) $(HAVE_OPTIONS) $(WITH_OPTIONS) $(BZ2_INCL) $(PNG_CFLAGS)
LOPTS = $(LDFLAGS) $(BZ2_LFLAGS)
LIBS = $(EFENCE_LIBS) $(BZ2_LIBS) $(PNG_LIBS) -lm
@@ -49,7 +48,7 @@ OFILES = $(CFG_OFILES)
pngpack: $(OFILES)
@echo "Linking : pngpack";
@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
@if test $(CFG_SYS_OPTIONS) = -DSYS_MINGW; \
then $(CC) $(LOPTS) $(OFILES) $(LIBS) -lz --static -o pngpack; \
else $(CC) $(LOPTS) $(OFILES) $(LIBS) -o pngpack; \
fi
@@ -67,7 +66,7 @@ show:
@echo "EFENCE_LFLAGS= " $(EFENCE_LFLAGS)
@echo "EFENCE_LIBS = " $(EFENCE_LIBS)
@echo
@echo "PNG_LFLAGS = " $(PNG_LFLAGS)
@echo "PNG_CFLAGS = " $(PNG_CFLAGS)
@echo "PNG_LIBS = " $(PNG_LIBS)
@echo
@echo "SYS_OPTIONS = " $(SYS_OPTIONS)