diff options
Diffstat (limited to 'Build/source/libs/gd/libgd-src/windows/msys')
3 files changed, 16 insertions, 26 deletions
diff --git a/Build/source/libs/gd/libgd-src/windows/msys/Makefile b/Build/source/libs/gd/libgd-src/windows/msys/Makefile index 3b1ced42b64..d4acaafc324 100644 --- a/Build/source/libs/gd/libgd-src/windows/msys/Makefile +++ b/Build/source/libs/gd/libgd-src/windows/msys/Makefile @@ -1,4 +1,3 @@ - # Simple makefile for building and testing libgd under MSYS/MinGW on # Windows @@ -7,9 +6,10 @@ LIBVER=3.0.1 # Misc. config flags. -CDEFS=-DHAVE_ERRNO_H -DHAVE_ICONV -DHAVE_ICONV_H \ --DHAVE_ICONV_T_DEF -DHAVE_INTTYPES_H -DHAVE_LIMITS_H -DHAVE_STDDEF_H \ --DHAVE_STDINT_H -DHAVE_STDLIB_H -DHAVE_VISIBILITY -DICONV_CONST +CDEFS=-DHAVE_ICONV -DHAVE_ICONV_H \ +-DHAVE_ICONV_T_DEF -DHAVE_INTTYPES_H \ +-DHAVE_STDINT_H -DHAVE_VISIBILITY -DICONV_CONST \ +-DENABLE_GD_FORMATS=1 # GnuWin32 libs should all be installed in one place. GNUDIR=/c/tools/GnuWin32 @@ -131,13 +131,3 @@ $(TARGET): $(OBJ) $(OBJ) $(LIBS) include deps.mk - - - - - - - - - - diff --git a/Build/source/libs/gd/libgd-src/windows/msys/README.MSYS.md b/Build/source/libs/gd/libgd-src/windows/msys/README.MSYS.md index 601802dd8e0..e45adc64a3e 100644 --- a/Build/source/libs/gd/libgd-src/windows/msys/README.MSYS.md +++ b/Build/source/libs/gd/libgd-src/windows/msys/README.MSYS.md @@ -1,4 +1,3 @@ - # MSYS Fallback Makefile This is a simple, straightforward Makefile for building LibGD with @@ -49,6 +48,14 @@ use one of the other build systems (or add them yourself.) DLLs; it sweeps up all of the DLLs in the directories pointed to by *_DLLDIR Makefile variables. + Before type "make dist", please make sure you have installed + zip command in msys. Or you can try: + * If you use msys, you can install msys-zip(lib, docs, lic) + in MinGW Installation Manager/all package. + * If you use msys2, you can install msys/zip by pacman and running: + + pacman -S msys/zip + Alternately, you can copy the lib (in src/) to wherever it needs to go. @@ -59,7 +66,3 @@ use one of the other build systems (or add them yourself.) worth. * LibFontconfig: I couldn't find Windows binaries for it anywhere reputable. - - - - diff --git a/Build/source/libs/gd/libgd-src/windows/msys/run_tests.sh b/Build/source/libs/gd/libgd-src/windows/msys/run_tests.sh index 22de13c4036..f7c4b44cf51 100755 --- a/Build/source/libs/gd/libgd-src/windows/msys/run_tests.sh +++ b/Build/source/libs/gd/libgd-src/windows/msys/run_tests.sh @@ -5,11 +5,11 @@ set -e # Parameters DLLPATH_EXTRA=$1 # Path to supporting DLLs CFLAGS_EXTRA=$2 # Extra C flags - + LOG=run_tests.log -CFLAGS="-g -Igdtest/ -I. -I../src/ -D_WIN32 $CFLAGS_EXTRA" +CFLAGS="-g -Igdtest/ -I. -I../src/ -D_WIN32 -DHAVE_SYS_STAT_H $CFLAGS_EXTRA" LDFLAGS='-L../src -llibgd' DLLPATH=../src:$DLLPATH_EXTRA @@ -38,7 +38,7 @@ echo "Running tests:" count=0 failures=0 compile_failures=0 -for test in `find . -name \*.c | grep -v '^./gdtest'`; do +for test in `find . -name \*.c | grep -vE '^./(fontconfig|gdtest|gdhelpers|xpm)'`; do count=`expr $count + 1` exe=${test%.c}.exe @@ -49,7 +49,7 @@ for test in `find . -name \*.c | grep -v '^./gdtest'`; do compile_failures=`expr $compile_failures + 1` continue fi - + echo "Running $exe:" >> $LOG if $exe 2>&1 >> $LOG; then echo "PASS: $test" @@ -62,6 +62,3 @@ done echo "$failures failures and $compile_failures compile failures out of $count tests." echo "Error messages in $LOG" - - - |