diff options
| author | Chris Reuter <chris@blit.ca> | 2014-02-07 13:16:28 -0500 |
|---|---|---|
| committer | Chris Reuter <chris@blit.ca> | 2014-02-07 14:17:17 -0500 |
| commit | 339b17aeff63478da582ac32031758ccbd38d09b (patch) | |
| tree | ae7b1f794cc853d7d2fdf4d82cddd5df2895d2b1 /windows | |
| parent | 0cb34fdb317afaf7034c836cbf6924740c42bffb (diff) | |
| download | libgd-339b17aeff63478da582ac32031758ccbd38d09b.tar.gz | |
Updated the MSys build files.
The Makefiles and scripts for building under MSYS had rotted a bit. This
change fixes those things.
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/msys/Makefile | 11 | ||||
| -rw-r--r-- | windows/msys/README.MSYS.md | 2 | ||||
| -rwxr-xr-x | windows/msys/run_tests.sh | 7 |
3 files changed, 11 insertions, 9 deletions
diff --git a/windows/msys/Makefile b/windows/msys/Makefile index 2a4440d..6f76226 100644 --- a/windows/msys/Makefile +++ b/windows/msys/Makefile @@ -11,9 +11,10 @@ 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 -# GnuWin32 libs are all installed in one place -GNUINC=-I/c/Progra~1/GnuWin32/include -GNULIB=-L/c/Progra~1/GnuWin32/lib +# GnuWin32 libs should all be installed in one place. +GNUDIR=/c/tools/GnuWin32 +GNUINC=-I$(GNUDIR)/include +GNULIB=-L$(GNUDIR)/lib # Various optional components. Comment-out the ones you don't have # and edit the paths and options as needed if you do. The default @@ -78,7 +79,7 @@ gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \ gdfonts.c gdfontt.c gdft.c gdhelpers.c gdkanji.c gdtables.c gdxpm.c \ wbmp.c gd_filter.c gd_nnquant.c gd_rotate.c gd_matrix.c \ gd_interpolation.c gd_crop.c webpimg.c gd_webp.c gd_tiff.c gd_tga.c \ -gd_bmp.c gd_xbm.c gd_color_match.c gd_version.c +gd_bmp.c gd_xbm.c gd_color_match.c gd_version.c gd_filename.c OBJ=$(SRC:.c=.o) @@ -93,7 +94,7 @@ clean: (cd ../../src; rm -f $(TARGET) $(OBJ) $(TARGET_A) deps.mk) check: all - bash run_tests.sh "$(INCLUDES)" + bash run_tests.sh "$(GNUDIR)/bin" "$(INCLUDES)" deps.mk: [ -f gd.h ] # Sanity check: we're in src/, right? diff --git a/windows/msys/README.MSYS.md b/windows/msys/README.MSYS.md index 8abdf08..3f343cf 100644 --- a/windows/msys/README.MSYS.md +++ b/windows/msys/README.MSYS.md @@ -16,7 +16,7 @@ use one of the other build systems (or add them yourself.) 2. Install LibJpeg, LibPng, LibTiff, Zlib and FreeType from <http://gnuwin32.sourceforge.net> and install them all in - <c:/Program Files/GnuWin32>. (You can get these libraries from other + `c:/tools/GnuWin32/`. (You can get these libraries from other places and/or install them in different locations, but you'll need to edit the Makefile accordingly if you do.) diff --git a/windows/msys/run_tests.sh b/windows/msys/run_tests.sh index be2b214..c193ebe 100755 --- a/windows/msys/run_tests.sh +++ b/windows/msys/run_tests.sh @@ -3,14 +3,15 @@ set -e # Parameters -CFLAGS_EXTRA=$1 # Extra C flags +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" LDFLAGS='-L../src -llibgd.3.0.1' -DLLPATH=../src:/c/Progra~1/GnuWin32/bin +DLLPATH=../src:$DLLPATH_EXTRA function run_gcc { if msg=`gcc $* 2>&1`; then @@ -23,7 +24,7 @@ function run_gcc { } # Switch to the working directory -PATH=$PATH:$DLLPATH +export PATH=$PATH:$DLLPATH cd ../../tests # Initial setup |