add webp to the build, generate tests list to run

3 files changed, 14 insertions, 13 deletions

diff --git a/windows/Makefile.vc b/windows/Makefile.vc
index a55b0b8..3dcfee0 100644
--- a/windows/Makefile.vc
+++ b/windows/Makefile.vc
@@ -89,12 +89,14 @@ LIB_OBJS= \
   $(LIBGD_OBJ_DIR)\gd_interpolation.obj \
   $(LIBGD_OBJ_DIR)\gd_matrix.obj \
   $(LIBGD_OBJ_DIR)\gd_rotate.obj \
-  $(LIBGD_OBJ_DIR)\gd_version.obj
+  $(LIBGD_OBJ_DIR)\gd_version.obj \
+  $(LIBGD_OBJ_DIR)\gd_crop.obj \
+  $(LIBGD_OBJ_DIR)\gd_webp.obj
 
 !include "Makefiletest.vc"
 
 LIBS=kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib Gdi32.Lib
-LIBS_GD=libjpeg_a.lib freetype_a.lib libpng_a.lib libiconv_a.lib  zlib_a.lib
+LIBS_GD=libjpeg_a.lib freetype_a.lib libpng_a.lib libiconv_a.lib  zlib_a.lib libwebp_a.lib
 
 INCLUDES=/Isrc /I$(WITH_DEVEL)\include -I$(WITH_DEVEL)\include\libpng16 -I$(WITH_DEVEL)\include\freetype /Itests /Itests\gdtest -I$(WITH_DEVEL)\include\
 
@@ -118,6 +120,7 @@ CFLAGS= $(CFLAGS) \
        /DHAVE_LIBFREETYPE=1\
        /DHAVE_LIBJPEG=1\
        /DHAVE_LIBPNG=1\
+	   /DHAVE_LIBWEBP=1\
        /DHAVE_LIBZ=1\
        $(INCLUDES)
 
@@ -134,7 +137,7 @@ TEST_MK=$(TDR)Maketests.vc
 !IF [if not exist $(TDR) mkdir $(TDR)]
 !ENDIF
 
-!IF [$(MAKEDIR)\windows\gentest.bat tests $(BUILD_DIR) "$(TEST_CFLAGS)" "$(TEST_LDFLAGS)" $(CC) $(LD) "$(TEST_MK)"] 
+!IF [$(MAKEDIR)\windows\gentest.bat tests $(BUILD_DIR) "$(TEST_CFLAGS)" "$(TEST_LDFLAGS)" $(CC) $(LD) "$(TEST_MK)" "$(TEST_LIST)"]
 !ENDIF
 
 TEST_OBJS=$(TEST_EXES:tests=obj)
@@ -213,3 +216,4 @@ $(TEST_LIST): $(TARGETDLL)
   if not exist $(TDR) mkdir $(TDR)
   copy $(TARGETDLL) $(TDR)$(GD_DLL)
   copy NUL $(TEST_LIST)
+  for %%F in ($(TEST_EXE)) do @echo %%F >> $(TEST_LIST)
diff --git a/windows/gentest.bat b/windows/gentest.bat
index da3b123..96b4414 100644
--- a/windows/gentest.bat
+++ b/windows/gentest.bat
@@ -7,12 +7,15 @@ set LDFLAGS=%~4
 set CC=%~5
 set LD=%~6
 set TESTMK=%~7
-
+set TESTLIST=%~8
 echo %*
 echo recieved !testsdir! !builddir! !CFLAGS! !LDFLAGS! !CC!
-copy NUL $(TEST_MK) > nul
+
+copy NUL !TESTMK! > nul
+copy NUL !TESTLIST! > nul
+
 for /D %%d in (!testsdir!/*) do (
-    for %%f in (!testsdir!/%%d/*.c) do (
+	if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do (
 		echo TEST_EXES=!builddir!\tests\%%d_%%~nf.exe ^$^(TEST_EXES^) >> !TESTMK!
 	)
 )
@@ -26,6 +29,7 @@ for /D %%d in (!testsdir!/*) do (
 for /D %%d in (!testsdir!/*) do (
     for %%f in (!testsdir!/%%d/*.c) do (
 		echo !builddir!\tests\%%d_%%~nf.exe: !builddir!\%%d_%%~nf.obj; !LD! !LDFLAGS! $** /out:$@ >> !TESTMK!
+		echo %%d_%%~nf.exe >> !TESTLIST!
 	)
 )
 ENDLOCAL
\ No newline at end of file
diff --git a/windows/run_tests.bat b/windows/run_tests.bat
index 7209a64..9e9c5e4 100644
--- a/windows/run_tests.bat
+++ b/windows/run_tests.bat
@@ -4,13 +4,6 @@ if [%PLATFORM%]==[] set PLATFORM=x86
 if [%PREFERREDTOOLARCHITECTURE%]==[x64] set PLATFORM=x64
 set PLATFORM=%PLATFORM:X=x%
 
-rem if exist build_msvc12_%PLATFORM%\tests (cd build_msvc12_%PLATFORM%\tests) else (
-rem   if exist ..\build_%PLATFORM%\tests (cd ..\build_msvc12_%PLATFORM%\tests) else (
-rem     echo unable to find test dir
-rem     exit /b 1
-rem   )
-rem )
-
 for /f %%T in (testlist.txt) do (
   set test=%%T
   set output=test: !test!....................................................................