From 1163099735b90e76d04884740586b033a4c3a7e5 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sun, 12 Apr 2015 10:38:28 -0700 Subject: [PATCH] makefile: Fix MinGW build to properly reference the PCRE static link library and upgraded the windows-build version check --- makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 3c0c91df..1acdcb0f 100644 --- a/makefile +++ b/makefile @@ -751,9 +751,13 @@ else $(info .) else # Version check on windows-build - ifneq (,$(shell findstr LIBSTL_TTF ..\windows-build\Windows-Build_Versions.txt)) + WINDOWS_BUILD = $(shell findstr WINDOWS-BUILD ..\windows-build\Windows-Build_Versions.txt) + ifeq (,$(WINDOWS_BUILD)) + WINDOWS_BUILD = 00000000 + endif + ifneq (,$(shell if 20150412 GTR $(WINDOWS_BUILD) echo old-windows-build)) $(info .) - $(info windows-build components at: $(abspath ..\windows-build) + $(info windows-build components at: $(abspath ..\windows-build)) $(info .) $(info ***********************************************************************) $(info ***********************************************************************) @@ -768,7 +772,7 @@ else $(info .) endif ifeq (pcre,$(shell if exist ..\windows-build\PCRE\include\pcre.h echo pcre)) - OS_CCDEFS += -DHAVE_PCREPOSIX_H -I$(abspath ../windows-build/PCRE/include) + OS_CCDEFS += -DHAVE_PCREPOSIX_H -DPCRE_STATIC -I$(abspath ../windows-build/PCRE/include) OS_LDFLAGS += -lpcreposix -lpcre -L../windows-build/PCRE/lib/ $(info using libpcreposix: $(abspath ../windows-build/PCRE/lib/pcreposix.a) $(abspath ../windows-build/PCRE/include/pcreposix.h)) endif