walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge back @vlj's local patches of vcpkg

This commit is contained in:
Ebrahim Byagowi 2016-10-18 14:30:00 +03:30
parent 702d9f522d
commit 4631d84c2b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
win32/config-msvc.mak
View File

@ -12,7 +12,11 @@ HB_GLIB_LIBS = glib-2.0.lib
HB_GOBJECT_DEP_LIBS = gobject-2.0.lib $(HB_GLIB_LIBS) HB_GOBJECT_DEP_LIBS = gobject-2.0.lib $(HB_GLIB_LIBS)
# Freetype is needed for building FreeType support and hb-view # Freetype is needed for building FreeType support and hb-view
!if "$(CFG)" == "debug"
FREETYPE_LIB = freetyped.lib
!else
FREETYPE_LIB = freetype.lib FREETYPE_LIB = freetype.lib
!endif
# Cairo is needed for building hb-view # Cairo is needed for building hb-view
CAIRO_LIB = cairo.lib CAIRO_LIB = cairo.lib
@ -125,6 +129,9 @@ HB_DEFINES = $(HB_DEFINES) /DHAVE_CAIRO=1
# Enable freetype if desired # Enable freetype if desired
!if "$(FREETYPE)" == "1" !if "$(FREETYPE)" == "1"
!if "$(FREETYPE_DIR)" != ""
HB_CFLAGS = $(HB_CFLAGS) /I$(FREETYPE_DIR)
!endif
HB_DEFINES = $(HB_DEFINES) /DHAVE_FREETYPE=1 HB_DEFINES = $(HB_DEFINES) /DHAVE_FREETYPE=1
HB_SOURCES = $(HB_SOURCES) $(HB_FT_sources) HB_SOURCES = $(HB_SOURCES) $(HB_FT_sources)
HB_HEADERS = $(HB_HEADERS) $(HB_FT_headers) HB_HEADERS = $(HB_HEADERS) $(HB_FT_headers)

3
win32/detectenv-msvc.mak
View File

@ -130,6 +130,9 @@ LDFLAGS_ARCH = /machine:x86
CFLAGS = $(CFLAGS_ADD) /W3 /Zi /I.. /I..\src /I. /I$(PREFIX)\include CFLAGS = $(CFLAGS_ADD) /W3 /Zi /I.. /I..\src /I. /I$(PREFIX)\include
LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(PREFIX)\lib /DEBUG LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(PREFIX)\lib /DEBUG
!if "$(ADDITIONAL_LIB_DIR)" != ""
LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(ADDITIONAL_LIB_DIR)
!endif
!if "$(CFG)" == "debug" !if "$(CFG)" == "debug"
LDFLAGS = $(LDFLAGS_BASE) LDFLAGS = $(LDFLAGS_BASE)