Skip to content

Commit

Permalink
makefile: Fix MinGW build to properly reference the PCRE static link …
Browse files Browse the repository at this point in the history
…library and upgraded the windows-build version check
  • Loading branch information
markpizz committed Apr 12, 2015
1 parent 674b8e0 commit 1163099
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions makefile
Expand Up @@ -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 ***********************************************************************)
Expand All @@ -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
Expand Down

0 comments on commit 1163099

Please sign in to comment.