Merge mozilla-central to mozilla-inbound

This commit is contained in:
Carsten "Tomcat" Book 2014-03-19 16:25:12 +01:00
commit 5b135da875
223 changed files with 25652 additions and 19659 deletions

View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>

View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>

View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="a9e08b91e9cd1f0930f16cfc49ec72f63575d5fe">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>

View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>

View File

@ -4,6 +4,6 @@
"branch": "",
"revision": ""
},
"revision": "ca4f67df676ef3ab0072b9e3fb97baee4d4bde36",
"revision": "91e5760ff948d3bef3959866c6a1744991560ef6",
"repo_path": "/integration/gaia-central"
}

View File

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

View File

@ -15,7 +15,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

View File

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="cb16958e41105d7c551d9941f522db97b8312538"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>

View File

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="2346ad9002062d70b6b27978c6b942f04192bf1b"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="db2ef2b61c70889533a0837fa3e053d24e95fdea"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

View File

@ -1169,19 +1169,19 @@
#include tab-shape.inc.svg
#ifndef XP_UNIX
<svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
<svg:path d="m 0,0 c .3,.25 .3,.75, 0,1 l 1,0 0,-1 z"/>
<svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse">
<svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
</svg:clipPath>
<svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
<svg:path d="m 0,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
<svg:path d="M -1,1 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
</svg:clipPath>
#endif
#ifdef XP_MACOSX
<svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
<svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
<svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse">
<svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
</svg:clipPath>
<svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
<svg:path d="m -3,-10 l -0.1,7.7 c 6.6,1.8 8.8,7.6 8.8,12.5 c 0,5 -1.9,11.5 -8.25,13.25 l 0.05,25.75 l 10000,0 l 0,-55 l -10000,-4.2 z"/>
<svg:path d="M -12,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
</svg:clipPath>
#endif
</svg:svg>

View File

@ -8,7 +8,7 @@
%filter substitution
%define forwardTransitionLength 150ms
%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-container
%define conditionalForwardWithUrlbarWidth 27
%define conditionalForwardWithUrlbarWidth 30
%define spaceAboveTabbar 9px
%define toolbarButtonPressed :hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"])
@ -451,7 +451,7 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
#restore-button {
-moz-box-orient: vertical;
height: 22px;
height: 24px;
padding: 0;
border: 0;
}
@ -1366,14 +1366,14 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-moz-margin-end: -7px;
position: relative;
z-index: 1;
width: 30px;
height: 30px;
width: 32px;
height: 32px;
padding: 4px 5px 4px 3px;
border-radius: 10000px;
}
#back-button:not(:-moz-lwtheme) {
height: 31px;
height: 33px;
padding: 4px 5px 5px 3px;
margin-bottom: -1px;
background: url(chrome://browser/skin/keyhole-circle.png) 0 0 no-repeat;
@ -1382,17 +1382,17 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
@media (min-resolution: 2dppx) {
#back-button:not(:-moz-lwtheme) {
background-image: url(chrome://browser/skin/keyhole-circle@2x.png);
background-size: 90px;
background-size: 96px;
}
}
#back-button:-moz-window-inactive:not(:-moz-lwtheme) {
background-position: -60px 0;
background-position: -64px 0;
}
#back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
#back-button[open="true"]:not(:-moz-lwtheme) {
background-position: -30px 0;
background-position: -32px 0;
}
/* Forward button styles */
@ -1400,6 +1400,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
#forward-button {
-moz-margin-start: 0;
-moz-margin-end: 0;
width: 32px;
clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
}
@ -1624,7 +1625,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-moz-appearance: none;
box-shadow: 0 1px rgba(255, 255, 255, 0.2), inset 0 1px hsla(0,0%,0%,.05);
margin: 0 4px;
padding: 0;
padding: 1px 0;
border: 1px solid;
border-color: #626262 #787878 #8c8c8c;
background-clip: padding-box;
@ -2823,10 +2824,18 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
cursor: default;
}
.tab-close-button.close-icon:not([selected=true]):not(:hover):-moz-lwtheme-brighttext {
-moz-image-region: rect(0, 64px, 16px, 48px);
}
@media (min-resolution: 2dppx) {
.tab-close-button > .toolbarbutton-icon {
width: 16px;
}
.tab-close-button.close-icon:not([selected=true]):not(:hover):-moz-lwtheme-brighttext {
-moz-image-region: rect(0, 128px, 32px, 96px);
}
}
.tabbrowser-arrowscrollbox > .scrollbutton-up,

View File

@ -44,6 +44,7 @@ browser.jar:
skin/classic/browser/identity-icons-https-mixed-display@2x.png
skin/classic/browser/Info.png
skin/classic/browser/keyhole-circle.png
skin/classic/browser/keyhole-circle@2x.png
skin/classic/browser/KUI-background.png
skin/classic/browser/subtle-pattern.png
skin/classic/browser/menu-back.png
@ -418,8 +419,6 @@ browser.jar:
skin/classic/browser/syncProgress-horizontalbar.png
skin/classic/browser/syncProgress-horizontalbar@2x.png
#endif
skin/classic/browser/lion/keyhole-circle.png (keyhole-circle-lion.png)
skin/classic/browser/keyhole-circle@2x.png (keyhole-circle-lion@2x.png)
skin/classic/browser/Toolbar-background-noise.png (Toolbar-background-noise.png)
skin/classic/browser/lion/toolbarbutton-dropmarker.png (toolbarbutton-dropmarker-lion.png)
skin/classic/browser/toolbarbutton-dropmarker@2x.png (toolbarbutton-dropmarker-lion@2x.png)
@ -442,7 +441,6 @@ browser.jar:
skin/classic/browser/devtools/tooltip/arrow-vertical-light.png (../shared/devtools/tooltip/arrow-vertical-light.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
% override chrome://browser/skin/keyhole-circle.png chrome://browser/skin/lion/keyhole-circle.png os=Darwin osversion>=10.7
% override chrome://browser/skin/toolbarbutton-dropmarker.png chrome://browser/skin/lion/toolbarbutton-dropmarker.png os=Darwin osversion>=10.7
% override chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png chrome://browser/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png os=Darwin osversion>=10.7
% override chrome://browser/skin/tabview/tabview.png chrome://browser/skin/lion/tabview/tabview.png os=Darwin osversion>=10.7

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@ -15,7 +15,7 @@
%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
%define forwardTransitionLength 150ms
%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-container
%define conditionalForwardWithUrlbarWidth 27
%define conditionalForwardWithUrlbarWidth 30
#menubar-items {
-moz-box-orient: vertical; /* for flex hack */
@ -819,10 +819,10 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
background-clip: padding-box !important;
/*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path) !important;
margin-left: -7px !important;
margin-left: -6px !important;
border-left-style: none !important;
border-radius: 0 !important;
padding-left: 7px !important;
padding-left: 9px !important;
padding-right: 3px !important;
}
@ -871,7 +871,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
border-radius: 10000px !important;
background-clip: padding-box !important;
background-color: hsla(210,25%,98%,.08) !important;
padding: 5px !important;
padding: 6px !important;
border-color: hsla(210,4%,10%,.25) !important;
transition-property: background-color, border-color !important;
transition-duration: 250ms !important;

View File

@ -8933,9 +8933,9 @@ if test "$MOZ_TREE_FREETYPE"; then
export CXXFLAGS="$CXXFLAGS $MOZ_DEBUG_FLAGS"
export LDFLAGS="$LDFLAGS $MOZ_DEBUG_LDFLAGS"
export LIBPNG_CFLAGS="$MOZ_PNG_CFLAGS"
export LIBPNG_LDFLAGS="$MOZ_PNG_LIBS"
export LIBPNG_LIBS="$MOZ_PNG_LIBS"
export CONFIG_FILES="unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config freetype2.pc:freetype2.in"
ac_configure_args="$ac_configure_args --host=$target --disable-shared --with-pic=yes"
ac_configure_args="$ac_configure_args --host=$target --disable-shared --with-pic=yes --with-png=yes"
if ! test -e modules; then
mkdir modules

View File

@ -529,42 +529,7 @@ TelephonyProvider.prototype = {
return;
}
let parentId = this._currentCalls[aClientId][aCallIndex].parentId;
if (parentId) {
this.resumeCall(aClientId, parentId);
return;
}
function onCdmaHoldCallSuccess() {
let call = this._currentCalls[aClientId][aCallIndex];
if (!call) {
return;
}
call.state = RIL.CALL_STATE_HOLDING;
this.notifyCallStateChanged(aClientId, call);
if (!call.childId) {
return;
}
let childCall = this._currentCalls[aClientId][call.childId];
childCall.state = RIL.CALL_STATE_ACTIVE;
this.notifyCallStateChanged(aClientId, childCall);
};
this._getClient(aClientId).sendWorkerMessage("holdCall", {
callIndex: aCallIndex
},(function(response) {
if (!response.success) {
return false;
}
if (response.isCdma) {
onCdmaHoldCallSuccess.call(this);
}
return false;
}).bind(this));
this._getClient(aClientId).sendWorkerMessage("holdCall", { callIndex: aCallIndex });
},
resumeCall: function(aClientId, aCallIndex) {
@ -575,43 +540,7 @@ TelephonyProvider.prototype = {
return;
}
let parentId = this._currentCalls[aClientId][aCallIndex].parentId;
if (parentId) {
this.holdCall(aClientId, parentId);
return;
}
function onCdmaResumeCallSuccess() {
let call = this._currentCalls[aClientId][aCallIndex];
if (!call) {
return;
}
call.state = RIL.CALL_STATE_ACTIVE;
this.notifyCallStateChanged(aClientId, call);
let childId = call.childId;
if (!childId) {
return;
}
let childCall = this._currentCalls[aClientId][childId];
childCall.state = RIL.CALL_STATE_HOLDING;
this.notifyCallStateChanged(aClientId, childCall);
};
this._getClient(aClientId).sendWorkerMessage("resumeCall", {
callIndex: aCallIndex
},(function(response) {
if (!response.success) {
return false;
}
if (response.isCdma) {
onCdmaResumeCallSuccess.call(this);
}
return false;
}).bind(this));
this._getClient(aClientId).sendWorkerMessage("resumeCall", { callIndex: aCallIndex });
},
conferenceCall: function(aClientId) {

View File

@ -303,6 +303,9 @@
android:permission="@ANDROID_PACKAGE_NAME@.permissions.FORMHISTORY_PROVIDER"
android:protectionLevel="signature"/>
<provider android:name="org.mozilla.gecko.GeckoProfilesProvider"
android:authorities="@ANDROID_PACKAGE_NAME@.profiles"/>
<provider android:name="org.mozilla.gecko.db.TabsProvider"
android:label="@string/sync_configure_engines_title_tabs"
android:authorities="@ANDROID_PACKAGE_NAME@.db.tabs"

View File

@ -48,6 +48,7 @@ import org.mozilla.gecko.prompts.Prompt;
import org.mozilla.gecko.sync.setup.SyncAccounts;
import org.mozilla.gecko.toolbar.AutocompleteHandler;
import org.mozilla.gecko.toolbar.BrowserToolbar;
import org.mozilla.gecko.toolbar.ToolbarProgressView;
import org.mozilla.gecko.util.Clipboard;
import org.mozilla.gecko.util.GamepadUtils;
import org.mozilla.gecko.util.HardwareUtils;
@ -130,6 +131,7 @@ abstract public class BrowserApp extends GeckoApp
public ViewFlipper mViewFlipper;
public ActionModeCompatView mActionBar;
private BrowserToolbar mBrowserToolbar;
private ToolbarProgressView mProgressView;
private HomePager mHomePager;
private TabsPanel mTabsPanel;
private ViewGroup mHomePagerContainer;
@ -455,6 +457,8 @@ abstract public class BrowserApp extends GeckoApp
mActionBar = (ActionModeCompatView) findViewById(R.id.actionbar);
mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
mProgressView = (ToolbarProgressView) findViewById(R.id.progress);
mBrowserToolbar.setProgressBar(mProgressView);
if (Intent.ACTION_VIEW.equals(intent.getAction())) {
// Show the target URL immediately in the toolbar.
mBrowserToolbar.setTitle(intent.getDataString());
@ -878,7 +882,9 @@ abstract public class BrowserApp extends GeckoApp
final int marginTop = Math.round(aMetrics.marginTop);
ThreadUtils.postToUiThread(new Runnable() {
public void run() {
ViewHelper.setTranslationY(toolbarLayout, marginTop - toolbarLayout.getHeight());
final float translationY = marginTop - toolbarLayout.getHeight();
ViewHelper.setTranslationY(toolbarLayout, translationY);
ViewHelper.setTranslationY(mProgressView, translationY);
if (mDoorHangerPopup.isShowing()) {
mDoorHangerPopup.updatePopup();

View File

@ -0,0 +1,156 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko;
import java.io.File;
import java.util.Map;
import java.util.Map.Entry;
import org.mozilla.gecko.GeckoProfileDirectories.NoMozillaDirectoryException;
import org.mozilla.gecko.db.BrowserContract;
import android.content.ContentProvider;
import android.content.ContentValues;
import android.content.UriMatcher;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
import android.util.Log;
/**
* This is not a per-profile provider. This provider allows read-only,
* restricted access to certain attributes of Fennec profiles.
*/
public class GeckoProfilesProvider extends ContentProvider {
private static final String LOG_TAG = "GeckoProfilesProvider";
private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
private static final int PROFILES = 100;
private static final int PROFILES_NAME = 101;
private static final int PROFILES_DEFAULT = 200;
private static final String[] DEFAULT_ARGS = {
BrowserContract.Profiles.NAME,
BrowserContract.Profiles.PATH,
};
static {
URI_MATCHER.addURI(BrowserContract.PROFILES_AUTHORITY, "profiles", PROFILES);
URI_MATCHER.addURI(BrowserContract.PROFILES_AUTHORITY, "profiles/*", PROFILES_NAME);
URI_MATCHER.addURI(BrowserContract.PROFILES_AUTHORITY, "default", PROFILES_DEFAULT);
}
@Override
public String getType(Uri uri) {
return null;
}
@Override
public boolean onCreate() {
// Successfully loaded.
return true;
}
private String[] profileValues(final String name, final String path, int len, int nameIndex, int pathIndex) {
final String[] values = new String[len];
if (nameIndex >= 0) {
values[nameIndex] = name;
}
if (pathIndex >= 0) {
values[pathIndex] = path;
}
return values;
}
protected void addRowForProfile(final MatrixCursor cursor, final int len, final int nameIndex, final int pathIndex, final String name, final String path) {
if (path == null || name == null) {
return;
}
String[] values = new String[len];
if (nameIndex >= 0) {
values[nameIndex] = name;
}
if (pathIndex >= 0) {
values[pathIndex] = path;
}
cursor.addRow(profileValues(name, path, len, nameIndex, pathIndex));
}
protected Cursor getCursorForProfiles(final String[] args, Map<String, String> profiles) {
// Compute the projection.
int nameIndex = -1;
int pathIndex = -1;
for (int i = 0; i < args.length; ++i) {
if (BrowserContract.Profiles.NAME.equals(args[i])) {
nameIndex = i;
} else if (BrowserContract.Profiles.PATH.equals(args[i])) {
pathIndex = i;
}
}
final MatrixCursor cursor = new MatrixCursor(args);
for (Entry<String, String> entry : profiles.entrySet()) {
addRowForProfile(cursor, args.length, nameIndex, pathIndex, entry.getKey(), entry.getValue());
}
return cursor;
}
@Override
public Cursor query(Uri uri, String[] projection, String selection,
String[] selectionArgs, String sortOrder) {
final String[] args = (projection == null) ? DEFAULT_ARGS : projection;
final File mozillaDir;
try {
mozillaDir = GeckoProfileDirectories.getMozillaDirectory(getContext());
} catch (NoMozillaDirectoryException e) {
Log.d(LOG_TAG, "No Mozilla directory; cannot query for profiles. Assuming there are none.");
return new MatrixCursor(projection);
}
final Map<String, String> matchingProfiles;
final int match = URI_MATCHER.match(uri);
switch (match) {
case PROFILES:
// Return all profiles.
matchingProfiles = GeckoProfileDirectories.getAllProfiles(mozillaDir);
break;
case PROFILES_NAME:
// Return data about the specified profile.
final String name = uri.getLastPathSegment();
matchingProfiles = GeckoProfileDirectories.getProfilesNamed(mozillaDir,
name);
break;
case PROFILES_DEFAULT:
matchingProfiles = GeckoProfileDirectories.getDefaultProfile(mozillaDir);
break;
default:
throw new UnsupportedOperationException("Unknown query URI " + uri);
}
return getCursorForProfiles(args, matchingProfiles);
}
@Override
public Uri insert(Uri uri, ContentValues values) {
throw new IllegalStateException("Inserts not supported.");
}
@Override
public int delete(Uri uri, String selection, String[] selectionArgs) {
throw new IllegalStateException("Deletes not supported.");
}
@Override
public int update(Uri uri, ContentValues values, String selection,
String[] selectionArgs) {
throw new IllegalStateException("Updates not supported.");
}
}

View File

@ -27,6 +27,9 @@ public class BrowserContract {
public static final String HOME_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".db.home";
public static final Uri HOME_AUTHORITY_URI = Uri.parse("content://" + HOME_AUTHORITY);
public static final String PROFILES_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".profiles";
public static final Uri PROFILES_AUTHORITY_URI = Uri.parse("content://" + PROFILES_AUTHORITY);
public static final String READING_LIST_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".db.readinglist";
public static final Uri READING_LIST_AUTHORITY_URI = Uri.parse("content://" + READING_LIST_AUTHORITY);
@ -125,6 +128,12 @@ public class BrowserContract {
public static final String DATA = "data";
}
public static final class Profiles {
private Profiles() {}
public static final String NAME = "name";
public static final String PATH = "path";
}
@RobocopTarget
public static final class Bookmarks implements CommonColumns, URLColumns, FaviconColumns, SyncColumns {
private Bookmarks() {}

View File

@ -66,6 +66,14 @@ public abstract class SQLiteBridgeContentProvider extends ContentProvider {
shutdown();
}
/**
* Return true of the query is from Firefox Sync.
* @param uri query URI
*/
public static boolean isCallerSync(Uri uri) {
String isSync = uri.getQueryParameter(BrowserContract.PARAM_IS_SYNC);
return !TextUtils.isEmpty(isSync);
}
private SQLiteBridge getDB(Context context, final String databasePath) {
SQLiteBridge bridge = null;
@ -327,7 +335,8 @@ public abstract class SQLiteBridgeContentProvider extends ContentProvider {
}
if (rowsAdded > 0) {
mContext.getContentResolver().notifyChange(uri, null);
final boolean shouldSyncToNetwork = !isCallerSync(uri);
mContext.getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return rowsAdded;

View File

@ -107,6 +107,15 @@ public class TabsProvider extends ContentProvider {
}
}
/**
* Return true of the query is from Firefox Sync.
* @param uri query URI
*/
public static boolean isCallerSync(Uri uri) {
String isSync = uri.getQueryParameter(BrowserContract.PARAM_IS_SYNC);
return !TextUtils.isEmpty(isSync);
}
final class TabsDatabaseHelper extends SQLiteOpenHelper {
public TabsDatabaseHelper(Context context, String databasePath) {
super(context, databasePath, null, DATABASE_VERSION);
@ -297,8 +306,10 @@ public class TabsProvider extends ContentProvider {
deleted = deleteInTransaction(uri, selection, selectionArgs);
}
if (deleted > 0)
getContext().getContentResolver().notifyChange(uri, null);
if (deleted > 0) {
final boolean shouldSyncToNetwork = !isCallerSync(uri);
getContext().getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return deleted;
}
@ -365,8 +376,10 @@ public class TabsProvider extends ContentProvider {
result = insertInTransaction(uri, values);
}
if (result != null)
getContext().getContentResolver().notifyChange(uri, null);
if (result != null) {
final boolean shouldSyncToNetwork = !isCallerSync(uri);
getContext().getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return result;
}
@ -425,8 +438,10 @@ public class TabsProvider extends ContentProvider {
updated = updateInTransaction(uri, values, selection, selectionArgs);
}
if (updated > 0)
getContext().getContentResolver().notifyChange(uri, null);
if (updated > 0) {
final boolean shouldSyncToNetwork = !isCallerSync(uri);
getContext().getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return updated;
}
@ -577,8 +592,10 @@ public class TabsProvider extends ContentProvider {
db.endTransaction();
}
if (successes > 0)
mContext.getContentResolver().notifyChange(uri, null);
if (successes > 0) {
final boolean shouldSyncToNetwork = !isCallerSync(uri);
mContext.getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return successes;
}

View File

@ -353,7 +353,8 @@ public abstract class TransactionalProvider<T extends SQLiteOpenHelper> extends
}
if (deleted > 0) {
getContext().getContentResolver().notifyChange(uri, null);
final boolean shouldSyncToNetwork = !isCallerSync(uri);
getContext().getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return deleted;
@ -377,7 +378,8 @@ public abstract class TransactionalProvider<T extends SQLiteOpenHelper> extends
}
if (result != null) {
getContext().getContentResolver().notifyChange(uri, null);
final boolean shouldSyncToNetwork = !isCallerSync(uri);
getContext().getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return result;
@ -401,7 +403,8 @@ public abstract class TransactionalProvider<T extends SQLiteOpenHelper> extends
}
if (updated > 0) {
getContext().getContentResolver().notifyChange(uri, null);
final boolean shouldSyncToNetwork = !isCallerSync(uri);
getContext().getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return updated;
@ -434,7 +437,8 @@ public abstract class TransactionalProvider<T extends SQLiteOpenHelper> extends
}
if (successes > 0) {
mContext.getContentResolver().notifyChange(uri, null);
final boolean shouldSyncToNetwork = !isCallerSync(uri);
mContext.getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return successes;

View File

@ -44,7 +44,7 @@ public class HomeBanner extends LinearLayout
// Used to detect for upwards scroll to push banner all the way up
private boolean mSnapBannerToTop;
// Tracks whether or not the banner should be shown.
// Tracks whether or not the banner should be shown on the current panel.
private boolean mActive = false;
// The user is currently swiping between HomePager pages
@ -59,6 +59,9 @@ public class HomeBanner extends LinearLayout
private final EllipsisTextView mTextView;
private final ImageView mIconView;
// The height of the banner view.
private final float mHeight;
// Listener that gets called when the banner is dismissed from the close button.
private OnDismissListener mOnDismissListener;
@ -77,6 +80,11 @@ public class HomeBanner extends LinearLayout
mTextView = (EllipsisTextView) findViewById(R.id.text);
mIconView = (ImageView) findViewById(R.id.icon);
mHeight = getResources().getDimensionPixelSize(R.dimen.home_banner_height);
// Disable the banner until a message is set.
setEnabled(false);
}
@Override
@ -93,23 +101,17 @@ public class HomeBanner extends LinearLayout
closeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
HomeBanner.this.setVisibility(View.GONE);
HomeBanner.this.dismiss();
// Send the current message id back to JS.
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HomeBanner:Dismiss", (String) getTag()));
if (mOnDismissListener != null) {
mOnDismissListener.onDismiss();
}
}
});
setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// Hide the banner. This does not remove the message from the rotation, so it may appear
// again if the JS onclick handler doesn't choose to remove it.
HomeBanner.this.setVisibility(View.GONE);
HomeBanner.this.dismiss();
// Send the current message id back to JS.
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HomeBanner:Click", (String) getTag()));
@ -145,6 +147,18 @@ public class HomeBanner extends LinearLayout
mOnDismissListener = listener;
}
/**
* Hides and disables the banner.
*/
private void dismiss() {
setVisibility(View.GONE);
setEnabled(false);
if (mOnDismissListener != null) {
mOnDismissListener.onDismiss();
}
}
/**
* Sends a message to gecko to request a new banner message. UI is updated in handleMessage.
*/
@ -158,16 +172,15 @@ public class HomeBanner extends LinearLayout
final String text = message.optString("text");
final String iconURI = message.optString("iconURI");
// Don't update the banner if the message doesn't have valid id and text.
if (TextUtils.isEmpty(id) || TextUtils.isEmpty(text)) {
return;
}
// Update the banner message on the UI thread.
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
// Hide the banner if the message doesn't have valid id and text.
if (TextUtils.isEmpty(id) || TextUtils.isEmpty(text)) {
setVisibility(View.GONE);
return;
}
// Store the current message id to pass back to JS in the view's OnClickListener.
setTag(id);
mTextView.setOriginalText(Html.fromHtml(text));
@ -184,9 +197,11 @@ public class HomeBanner extends LinearLayout
}
});
setVisibility(View.VISIBLE);
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HomeBanner:Shown", id));
// Enable the banner after a message is set.
setEnabled(true);
// Animate the banner if it is currently active.
if (mActive) {
animateUp();
@ -203,8 +218,8 @@ public class HomeBanner extends LinearLayout
mActive = active;
// Don't animate if the banner isn't visible.
if (getVisibility() != View.VISIBLE) {
// Don't animate if the banner isn't enabled.
if (!isEnabled()) {
return;
}
@ -215,34 +230,59 @@ public class HomeBanner extends LinearLayout
}
}
private void ensureVisible() {
// The banner visibility is set to GONE after it is animated off screen,
// so we need to make it visible again.
if (getVisibility() == View.GONE) {
// Translate the banner off screen before setting it to VISIBLE.
ViewHelper.setTranslationY(this, mHeight);
setVisibility(View.VISIBLE);
}
}
private void animateUp() {
// Don't try to animate if the banner is already translated, or if the user swiped
// the banner down previously to hide it.
if (ViewHelper.getTranslationY(this) == 0 || mUserSwipedDown) {
// Don't try to animate if the user swiped the banner down previously to hide it.
if (mUserSwipedDown) {
return;
}
ensureVisible();
final PropertyAnimator animator = new PropertyAnimator(100);
animator.attach(this, Property.TRANSLATION_Y, 0);
animator.start();
}
private void animateDown() {
// Don't try to animate if the banner is already translated.
if (ViewHelper.getTranslationY(this) == getHeight()) {
if (ViewHelper.getTranslationY(this) == mHeight) {
// Hide the banner to avoid intercepting clicks on pre-honeycomb devices.
setVisibility(View.GONE);
return;
}
final PropertyAnimator animator = new PropertyAnimator(100);
animator.attach(this, Property.TRANSLATION_Y, getHeight());
animator.attach(this, Property.TRANSLATION_Y, mHeight);
animator.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
@Override
public void onPropertyAnimationStart() {
}
@Override
public void onPropertyAnimationEnd() {
// Hide the banner to avoid intercepting clicks on pre-honeycomb devices.
setVisibility(View.GONE);
}
});
animator.start();
}
public void handleHomeTouch(MotionEvent event) {
if (!mActive || getVisibility() == GONE || mScrollingPages) {
if (!mActive || !isEnabled() || mScrollingPages) {
return;
}
ensureVisible();
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: {
// Track the beginning of the touch
@ -255,19 +295,18 @@ public class HomeBanner extends LinearLayout
final float delta = mTouchY - curY;
mSnapBannerToTop = delta <= 0.0f;
final float height = getHeight();
float newTranslationY = ViewHelper.getTranslationY(this) + delta;
// Clamp the values to be between 0 and height.
if (newTranslationY < 0.0f) {
newTranslationY = 0.0f;
} else if (newTranslationY > height) {
newTranslationY = height;
} else if (newTranslationY > mHeight) {
newTranslationY = mHeight;
}
// Don't change this value if it wasn't a significant movement
if (delta >= 10 || delta <= -10) {
mUserSwipedDown = newTranslationY == height;
mUserSwipedDown = (newTranslationY == mHeight);
}
ViewHelper.setTranslationY(this, newTranslationY);
@ -278,15 +317,11 @@ public class HomeBanner extends LinearLayout
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: {
mTouchY = -1;
final float y = ViewHelper.getTranslationY(this);
final float height = getHeight();
if (y > 0.0f && y < height) {
if (mSnapBannerToTop) {
animateUp();
} else {
animateDown();
mUserSwipedDown = true;
}
if (mSnapBannerToTop) {
animateUp();
} else {
animateDown();
mUserSwipedDown = true;
}
break;
}

View File

@ -166,6 +166,7 @@ gbjar.sources += [
'GeckoNetworkManager.java',
'GeckoProfile.java',
'GeckoProfileDirectories.java',
'GeckoProfilesProvider.java',
'GeckoScreenOrientation.java',
'GeckoSmsManager.java',
'GeckoThread.java',

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 426 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 572 B

View File

@ -105,12 +105,4 @@
android:background="@color/url_bar_shadow"
android:contentDescription="@null"/>
<org.mozilla.gecko.toolbar.ToolbarProgressView android:id="@+id/progress"
android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignBottom="@id/shadow"
android:src="@drawable/progress"
android:background="@null"
android:visibility="gone" />
</merge>

View File

@ -105,12 +105,4 @@
android:background="@color/url_bar_shadow"
android:contentDescription="@null"/>
<org.mozilla.gecko.toolbar.ToolbarProgressView android:id="@+id/progress"
android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignBottom="@id/shadow"
android:src="@drawable/progress"
android:background="@null"
android:visibility="gone" />
</merge>

View File

@ -40,8 +40,7 @@
android:layout="@layout/home_banner"
android:layout_width="fill_parent"
android:layout_height="@dimen/home_banner_height"
android:layout_gravity="bottom"
android:translationY="@dimen/home_banner_height"/>
android:layout_gravity="bottom"/>
</FrameLayout>
@ -103,6 +102,15 @@
</org.mozilla.gecko.widget.GeckoViewFlipper>
<org.mozilla.gecko.toolbar.ToolbarProgressView android:id="@+id/progress"
android:layout_width="fill_parent"
android:layout_height="14dp"
android:layout_marginTop="-8dp"
android:layout_below="@id/browser_actionbar"
android:src="@drawable/progress"
android:background="@null"
android:visibility="gone" />
</view>
<ViewStub android:id="@+id/toast_stub"

View File

@ -8,7 +8,7 @@ let Ci = Components.interfaces;
let Cu = Components.utils;
Components.utils.import("resource://gre/modules/SharedPreferences.jsm");
Components.utils.import("resource://gre/modules/commonjs/sdk/core/promise.js");
Components.utils.import("resource://gre/modules/Promise.jsm");
let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"].getService(Ci.nsIMessageListenerManager);
let deferred = 0;

View File

@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
Components.utils.import("resource://gre/modules/OrderedBroadcast.jsm");
Components.utils.import("resource://gre/modules/commonjs/sdk/core/promise.js");
Components.utils.import("resource://gre/modules/Promise.jsm");
let _observerId = 0;

View File

@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
Components.utils.import("resource://gre/modules/SharedPreferences.jsm");
Components.utils.import("resource://gre/modules/commonjs/sdk/core/promise.js");
Components.utils.import("resource://gre/modules/Promise.jsm");
let _observerId = 0;

View File

@ -208,8 +208,6 @@ public class BrowserToolbar extends GeckoRelativeLayout
mActionItemBar = (LinearLayout) findViewById(R.id.menu_items);
mHasSoftMenuButton = !HardwareUtils.hasMenuButton();
mProgressBar = (ToolbarProgressView) findViewById(R.id.progress);
// We use different layouts on phones and tablets, so adjust the focus
// order appropriately.
mFocusOrder = new ArrayList<View>();
@ -369,6 +367,10 @@ public class BrowserToolbar extends GeckoRelativeLayout
}
}
public void setProgressBar(ToolbarProgressView progressBar) {
mProgressBar = progressBar;
}
public void refresh() {
mUrlDisplayLayout.dismissSiteIdentityPopup();
}

View File

@ -20,12 +20,13 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Handler;
import android.os.Message;
import android.util.AttributeSet;
import android.util.Log;
import android.widget.ImageView;
import android.view.View;
import android.view.animation.Animation;
/**
* Progress view used for page loads.
@ -41,6 +42,8 @@ public class ToolbarProgressView extends ImageView {
private static final int STEPS = 10;
private static final int DELAY = 40;
private static final boolean PRE_HONEYCOMB = Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB;
private int mTargetProgress;
private int mIncrement;
private Rect mBounds;
@ -92,6 +95,27 @@ public class ToolbarProgressView extends ImageView {
};
}
@Override
public void setVisibility(int visibility) {
// On GB/Froyo, setting the visibility to GONE/HIDDEN alone does not
// work with translations. Calling clearAnimation acts as a workaround.
if (PRE_HONEYCOMB && visibility != VISIBLE) {
clearAnimation();
}
super.setVisibility(visibility);
}
@Override
public void setAnimation(Animation animation) {
// On GB/Froyo, setting the animation after hiding the view causes it
// to reappear. As a workaround, disallow setAnimation from being
// called if the view is not shown.
if (PRE_HONEYCOMB && isShown()) {
super.setAnimation(animation);
}
}
@Override
public void onLayout(boolean f, int l, int t, int r, int b) {
mBounds.left = 0;

View File

@ -0,0 +1,50 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.browser.tests;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import org.mozilla.gecko.db.BrowserContract;
import android.content.ContentResolver;
import android.database.Cursor;
import android.net.Uri;
import android.os.RemoteException;
public class TestGeckoProfilesProvider extends BrowserTestCase {
private static final String[] NAME_AND_PATH = new String[] { BrowserContract.Profiles.NAME, BrowserContract.Profiles.PATH };
/**
* Ensure that the default profile is found in the results from the provider.
*/
public void testQueryDefault() throws RemoteException {
final ContentResolver contentResolver = getActivity().getContentResolver();
final Uri uri = BrowserContract.PROFILES_AUTHORITY_URI.buildUpon().appendPath("profiles").build();
final Cursor c = contentResolver.query(uri, NAME_AND_PATH, null, null, null);
assertNotNull(c);
try {
assertTrue(c.moveToFirst());
assertTrue(c.getCount() > 0);
Map<String, String> profiles = new HashMap<String, String>();
while (!c.isAfterLast()) {
final String name = c.getString(0);
final String path = c.getString(1);
profiles.put(name, path);
c.moveToNext();
}
assertTrue(profiles.containsKey("default"));
final String path = profiles.get("default");
assertTrue(path.endsWith(".default")); // It's the right profile...
assertTrue(path.startsWith("/data/")); // ... in the 'data' dir...
assertTrue(path.contains("/mozilla/")); // ... in the 'mozilla' dir.
assertTrue(new File(path).exists());
} finally {
c.close();
}
}
}

View File

@ -1,6 +1,6 @@
# CMakeLists.txt
#
# Copyright 2013 by
# Copyright 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# Written by John Cary <cary@txcorp.com>
@ -41,7 +41,7 @@ project(freetype)
set(VERSION_MAJOR "2")
set(VERSION_MINOR "5")
set(VERSION_PATCH "2")
set(VERSION_PATCH "3")
set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
# Compiler definitions for building the library

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
# FreeType 2 top Jamfile.
#
# Copyright 2001-2011, 2013 by
# Copyright 2001-2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -195,7 +195,7 @@ rule RefDoc
actions RefDoc
{
python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.2 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.3 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
}
RefDoc refdoc ;

View File

@ -1,4 +1,4 @@
FreeType 2.5.2
FreeType 2.5.3
==============
Homepage: http://www.freetype.org
@ -16,7 +16,7 @@
the file `docs/LICENSE.TXT' for the available licenses.
The FreeType 2 API reference is located in `docs/reference'; use the
file `ft2-doc.html' as the top entry point. Additional
file `ft2-toc.html' as the top entry point. Additional
documentation is available as a separate package from our sites. Go
to
@ -24,9 +24,9 @@
and download one of the following files.
freetype-doc-2.5.2.tar.bz2
freetype-doc-2.5.2.tar.gz
ftdoc252.zip
freetype-doc-2.5.3.tar.bz2
freetype-doc-2.5.3.tar.gz
ftdoc253.zip
To view the documentation online, go to
@ -70,7 +70,7 @@
----------------------------------------------------------------------
Copyright 2006-2013 by
Copyright 2006-2014 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,

View File

@ -1,6 +1,4 @@
This directory contains freetype2 v2.5.2 downloaded from
This directory contains freetype2 v2.5.3 downloaded from
http://savannah.nongnu.org/download/freetype/
==== Patches ====
unimplemented-png-loading.patch: Bug 968626 - Fail gracefully on unimplemented PNG loading.
There are currently no local changes applied to the freetype tree.

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2004, 2006 by
# Copyright 1996-2000, 2003, 2004, 2006, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -45,12 +45,12 @@ ifeq ($(PLATFORM),ansi)
endif
# We also try to recognize Dos 7.x without Windows 9X launched.
# See builds/win32/detect.mk for explanations about the logic.
# See builds/windows/detect.mk for explanations about the logic.
#
ifeq ($(is_dos),)
ifdef winbootdir
#ifneq ($(OS),Windows_NT)
# If win32 is available, do not trigger this test.
# If windows is available, do not trigger this test.
ifndef windir
is_dos := $(findstring Windows,$(strip $(shell ver)))
endif
@ -124,7 +124,7 @@ ifeq ($(PLATFORM),dos)
CAT := type
# Setting COPY is a bit trickier. We can be running DJGPP on some
# Windows NT derivatives, like XP. See builds/win32/detect.mk for
# Windows NT derivatives, like XP. See builds/windows/detect.mk for
# explanations why we need hacking here.
#
ifeq ($(OS),Windows_NT)

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2006, 2008, 2013 by
# Copyright 1996-2006, 2008, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -126,6 +126,14 @@ INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
INCLUDE_FLAGS := $(INCLUDES:%=$I%)
ifdef DEVEL_DIR
# We assume that all library dependencies for FreeType are fulfilled for a
# development build, so we directly access the necessary include directory
# information using `pkg-config'.
INCLUDE_FLAGS += $(shell pkg-config --cflags libpng \
harfbuzz )
endif
# C flags used for the compilation of an object file. This must include at
# least the paths for the `base' and `builds/<system>' directories;

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2006, 2008 by
# Copyright 1996-2000, 2003, 2006, 2008, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -28,7 +28,7 @@ $(FTMODULE_H): $(MODULES_CFG)
$(FTMODULE_H_CREATE)
$(FTMODULE_H_DONE)
ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),)
ifneq ($(findstring $(PLATFORM),dos windows os2),)
OPEN_MODULE := @echo$(space)
CLOSE_MODULE := >> $(subst /,$(SEP),$(FTMODULE_H))
REMOVE_MODULE := @-$(DELETE) $(subst /,$(SEP),$(FTMODULE_H))

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012, 2013 by
# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012-2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -112,10 +112,10 @@ ifdef check_platform
include $(TOP_DIR)/builds/detect.mk
# This rule makes sense for Unix only to remove files created by a run
# of the configure script which hasn't been successful (so that no
# This rule makes sense for Unix only to remove files created by a run of
# the configure script which hasn't been successful (so that no
# `config.mk' has been created). It uses the built-in $(RM) command of
# GNU make. Similarly, `nul' is created if e.g. `make setup win32' has
# GNU make. Similarly, `nul' is created if e.g. `make setup windows' has
# been erroneously used.
#
# Note: This test is duplicated in `builds/unix/detect.mk'.

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2013-06-10'
timestamp='2014-02-12'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2013 Free Software Foundation, Inc.
Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
@ -1260,16 +1260,26 @@ EOF
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
# that puts up a graphical alert prompting to install
# developer tools. Any system running Mac OS X 10.7 or
# later (Darwin 11 and later) is required to have a 64-bit
# processor. This is not true of the ARM version of Darwin
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
@ -1361,154 +1371,6 @@ EOF
exit ;;
esac
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
I don't know.... */
printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
"4"
#else
""
#endif
); exit (0);
#endif
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
printf ("m68k-hp-bsd\n"); exit (0);
#endif
#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
if (version < 4)
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
else
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
printf ("ns32k-encore-mach\n"); exit (0);
#else
printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif
#if defined (__386BSD__)
printf ("i386-pc-bsd\n"); exit (0);
#endif
#if defined (sequent)
#if defined (i386)
printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif
#if defined (_SEQUENT_)
struct utsname un;
uname(&un);
if (strncmp(un.version, "V2", 2) == 0) {
printf ("i386-sequent-ptx2\n"); exit (0);
}
if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
printf ("i386-sequent-ptx1\n"); exit (0);
}
printf ("i386-sequent-ptx\n"); exit (0);
#endif
#if defined (vax)
# if !defined (ultrix)
# include <sys/param.h>
# if defined (BSD)
# if BSD == 43
printf ("vax-dec-bsd4.3\n"); exit (0);
# else
# if BSD == 199006
printf ("vax-dec-bsd4.3reno\n"); exit (0);
# else
printf ("vax-dec-bsd\n"); exit (0);
# endif
# endif
# else
printf ("vax-dec-bsd\n"); exit (0);
# endif
# else
printf ("vax-dec-ultrix\n"); exit (0);
# endif
#endif
#if defined (alliant) && defined (i860)
printf ("i860-alliant-bsd\n"); exit (0);
#endif
exit (1);
}
EOF
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
{ echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
if [ -x /usr/convex/getsysinfo ]
then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
exit ;;
c34*)
echo c34-convex-bsd
exit ;;
c38*)
echo c38-convex-bsd
exit ;;
c4*)
echo c4-convex-bsd
exit ;;
esac
fi
cat >&2 <<EOF
$0: unable to guess system type

View File

@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2013 Free Software Foundation, Inc.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2013-10-01'
timestamp='2014-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2013 Free Software Foundation, Inc.
Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
#
# Process this file with autoconf to produce a configure script.
#
# Copyright 2001-2013 by
# Copyright 2001-2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it
# fully.
AC_INIT([FreeType], [2.5.2], [freetype@nongnu.org], [freetype])
AC_INIT([FreeType], [2.5.3], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
version_info='17:1:11'
version_info='17:2:11'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
@ -34,6 +34,10 @@ AC_PROG_CC
AC_PROG_CPP
AC_SUBST(EXEEXT)
PKG_PROG_PKG_CONFIG([0.24])
LT_INIT(win32-dll)
# checks for native programs to generate building tool
@ -206,30 +210,68 @@ AC_CHECK_FUNCS([memcpy memmove])
# get compiler flags right
# we try to make the compiler work for C89-strict source.
# even if C compiler is GCC and C89 flags are available,
# some system headers (e.g. Android Bionic libc) is broken
# in C89 mode. we have to check the compilation finishes
# successfully.
#
# We try to make the compiler work for C89-strict source. Even if the
# C compiler is gcc and C89 flags are available, some system headers
# (e.g., Android Bionic libc) are broken in C89 mode. We have to check
# whether the compilation finishes successfully.
#
# Due to bugs in mingwrt 4.0.3 we don't use `-ansi' for MinGW.
#
# To avoid zillions of
#
# ISO C90 does not support 'long long'
#
# warnings, we disable `-pedantic' for gcc version < 4.6.
#
if test "x$GCC" = xyes; then
XX_CFLAGS="-Wall"
XX_ANSIFLAGS=""
for a in -pedantic -ansi
do
AC_MSG_CHECKING([gcc compiler flag ${a} to assure ANSI C works correctly])
orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([#include <stdio.h>],[{puts("");return 0;}])
],[
AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS])
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
],[
AC_MSG_RESULT([no])
])
CFLAGS="${orig_CFLAGS}"
done
case "$host" in
*-*-mingw*)
XX_ANSIFLAGS="-pedantic"
;;
*)
GCC_VERSION=`$CC -dumpversion`
GCC_MAJOR=`echo "$GCC_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
GCC_MINOR=`echo "$GCC_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
XX_PEDANTIC=-pedantic
if test $GCC_MAJOR -lt 4; then
XX_PEDANTIC=
else
if test $GCC_MAJOR -eq 4 -a $GCC_MINOR -lt 6; then
XX_PEDANTIC=
fi
fi
XX_ANSIFLAGS=""
for a in $XX_PEDANTIC -ansi
do
AC_MSG_CHECKING([gcc compiler flag ${a} to assure ANSI C works correctly])
orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([
#include <stdio.h>
],
[
{
puts( "" );
return 0;
}
])],
[AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS])
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
],
[AC_MSG_RESULT([no])])
CFLAGS="${orig_CFLAGS}"
done
;;
esac
else
case "$host" in
*-dec-osf*)
@ -247,62 +289,214 @@ AC_SUBST([XX_CFLAGS])
AC_SUBST([XX_ANSIFLAGS])
# All library tests below try `pkg-config' first. If that fails, a function
# from the library is tested in the traditional autoconf way (zlib, bzip2),
# or a config script is called (libpng).
#
# The `xxx_reqpriv' variables are for the `Requires.private' field in
# `freetype2.pc'. The `xxx_libpriv' variables are for the `Libs.private'
# field in `freetype2.pc' if pkg-config doesn't find a proper .pc file.
#
# The `xxx_libstaticconf' variables are for the `freetype-config' script.
#
# Note that a call to PKG_CHECK_MODULES(XXX, ...) sets and creates the
# output variables `XXX_CFLAGS' and `XXX_LIBS'. In case one or both are set
# for a library by the user, no entry for this library is added to
# `Requires.private'. Instead, it gets added to `Libs.private'
# check for system zlib
# don't quote AS_HELP_STRING!
AC_ARG_WITH([zlib],
AS_HELP_STRING([--without-zlib],
[use internal zlib instead of system-wide]))
if test x$with_zlib != xno && test -z "$LIBZ"; then
AC_CHECK_LIB([z],
[gzsetparams],
[AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])])
[AS_HELP_STRING([--with-zlib=@<:@yes|no|auto@:>@],
[use system zlib instead of internal library @<:@default=auto@:>@])],
[], [with_zlib=auto])
have_zlib=no
if test x"$with_zlib" = xyes -o x"$with_zlib" = xauto; then
zlib_pkg="zlib"
have_zlib_pkg=no
if test x"$ZLIB_CFLAGS" = x -a x"$ZLIB_LIBS" = x; then
PKG_CHECK_EXISTS([$zlib_pkg], [have_zlib_pkg=yes])
fi
PKG_CHECK_MODULES([ZLIB], [$zlib_pkg],
[have_zlib="yes (pkg-config)"], [:])
if test $have_zlib_pkg = yes; then
# we have zlib.pc
zlib_reqpriv="$zlib_pkg"
zlib_libpriv=
zlib_libstaticconf=`$PKG_CONFIG --static --libs "$zlib_pkg"`
else
zlib_reqpriv=
if test "$have_zlib" != no; then
# ZLIB_CFLAGS and ZLIB_LIBS are set by the user
zlib_libpriv="$ZLIB_LIBS"
zlib_libstaticconf="$ZLIB_LIBS"
have_zlib="yes (ZLIB_CFLAGS and ZLIB_LIBS)"
else
# fall back to standard autoconf test
AC_CHECK_LIB([z],
[gzsetparams],
[AC_CHECK_HEADER([zlib.h],
[have_zlib="yes (autoconf test)"
zlib_libpriv="-lz"
zlib_libstaticconf="$zlib_libpriv"
ZLIB_LIBS="$zlib_libpriv"])])
fi
fi
fi
if test x$with_zlib != xno && test -n "$LIBZ"; then
SYSTEM_ZLIB=yes
if test x"$with_zlib" = xyes -a "$have_zlib" = no; then
AC_MSG_ERROR([external zlib support requested but library not found])
fi
# check for system libbz2
# don't quote AS_HELP_STRING!
AC_ARG_WITH([bzip2],
AS_HELP_STRING([--without-bzip2],
[do not support bzip2 compressed fonts]))
if test x$with_bzip2 != xno && test -z "$LIBBZ2"; then
AC_CHECK_LIB([bz2],
[BZ2_bzDecompress],
[AC_CHECK_HEADER([bzlib.h], [LIBBZ2='-lbz2'])])
[AS_HELP_STRING([--with-bzip2=@<:@yes|no|auto@:>@],
[support bzip2 compressed fonts @<:@default=auto@:>@])],
[], [with_bzip2=auto])
have_bzip2=no
if test x"$with_bzip2" = xyes -o x"$with_bzip2" = xauto; then
bzip2_pkg="bzip2"
have_bzip2_pkg=no
if test x"$BZIP2_CFLAGS" = x -a x"$BZIP2_LIBS" = x; then
PKG_CHECK_EXISTS([$bzip2_pkg], [have_bzip2_pkg=yes])
fi
PKG_CHECK_MODULES([BZIP2], [$bzip2_pkg],
[have_bzip2="yes (pkg-config)"], [:])
if test $have_bzip2_pkg = yes; then
# we have bzip2.pc
bzip2_reqpriv="$bzip2_pkg"
bzip2_libpriv=
bzip2_libstaticconf=`$PKG_CONFIG --static --libs "$bzip2_pkg"`
else
bzip2_reqpriv=
if test "$have_bzip2" != no; then
# BZIP2_CFLAGS and BZIP2_LIBS are set by the user
bzip2_libpriv="$BZIP2_LIBS"
bzip2_libstaticconf="$BZIP2_LIBS"
have_bzip2="yes (BZIP2_CFLAGS and BZIP2_LIBS)"
else
# fall back to standard autoconf test
AC_CHECK_LIB([bz2],
[BZ2_bzDecompress],
[AC_CHECK_HEADER([bzlib.h],
[have_bzip2="yes (autoconf test)"
bzip2_libpriv="-lbz2"
bzip2_libstaticconf="$bzip2_libpriv"
BZIP2_LIBS="$bzip2_libpriv"])])
fi
fi
fi
if test x$with_bzip2 != xno && test -n "$LIBBZ2"; then
SYSTEM_LIBBZ2=yes
if test x"$with_bzip2" = xyes -a "$have_bzip2" = no; then
AC_MSG_ERROR([bzip2 support requested but library not found])
fi
# check for system libpng
HAVE_LIBPNG=no
AC_ARG_WITH([png],
AS_HELP_STRING([--without-png],
[do not support png compressed OpenType embedded bitmaps]))
if test x$with_png != xno; then
AC_MSG_CHECKING([for libpng])
if test -z "$LIBPNG_CFLAGS" -a -z "$LIBPNG_LDFLAGS"; then
if ! which libpng-config >/dev/null; then
AC_MSG_ERROR([`libpng-config' not found;
either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
or pass `--without-png' to the `configure' script.])
elif test ${cross_compiling} = yes; then
AC_MSG_ERROR([`libpng-config' should not be used in cross-building;
either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
or pass `--without-png' to the `configure' script.])
fi
LIBPNG="`libpng-config --libs`"
LIBPNG_CFLAGS="`libpng-config --cflags`"
LIBPNG_LDFLAGS="`libpng-config --ldflags`"
[AS_HELP_STRING([--with-png=@<:@yes|no|auto@:>@],
[support png compressed OpenType embedded bitmaps @<:@default=auto@:>@])],
[], [with_png=auto])
have_libpng=no
if test x"$with_png" = xyes -o x"$with_png" = xauto; then
libpng_pkg="libpng"
have_libpng_pkg=no
if test x"$LIBPNG_CFLAGS" = x -a x"$LIBPNG_LIBS" = x; then
PKG_CHECK_EXISTS([$libpng_pkg], [have_libpng_pkg=yes])
fi
HAVE_LIBPNG=yes
AC_MSG_RESULT([$LIBPNG_LDFLAGS])
PKG_CHECK_MODULES([LIBPNG], [$libpng_pkg],
[have_libpng="yes (pkg-config)"], [:])
if test $have_libpng_pkg = yes; then
# we have libpng.pc
libpng_reqpriv="$libpng_pkg"
libpng_libpriv=
libpng_libstaticconf=`$PKG_CONFIG --static --libs "$libpng_pkg"`
else
libpng_reqpriv=
if test "$have_libpng" != no; then
# LIBPNG_CFLAGS and LIBPNG_LIBS are set by the user
libpng_libpriv="$LIBPNG_LIBS"
libpng_libstaticconf="$LIBPNG_LIBS"
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
else
# fall back to config script.
AC_MSG_CHECKING([for libpng-config])
if which libpng-config > /dev/null; then
LIBPNG_CFLAGS=`libpng-config --cflags`
LIBPNG_LIBS=`libpng-config --ldflags`
libpng_libpriv=`libpng-config --static --ldflags`
libpng_libstaticconf="$libpng_libpriv"
have_libpng="yes (libpng-config)"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
fi
fi
fi
if test x"$with_png" = xyes -a "$have_libpng" = no; then
AC_MSG_ERROR([libpng support requested but library not found])
fi
# check for system libharfbuzz
AC_ARG_WITH([harfbuzz],
[AS_HELP_STRING([--with-harfbuzz=@<:@yes|no|auto@:>@],
[improve auto-hinting of OpenType fonts @<:@default=auto@:>@])],
[], [with_harfbuzz=auto])
have_harfbuzz=no
if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
harfbuzz_pkg="harfbuzz >= 0.9.19"
have_harfbuzz_pkg=no
if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
PKG_CHECK_EXISTS([$harfbuzz_pkg], [have_harfbuzz_pkg=yes])
fi
PKG_CHECK_MODULES([HARFBUZZ], [$harfbuzz_pkg],
[have_harfbuzz="yes (pkg-config)"], [:])
if test $have_harfbuzz_pkg = yes; then
# we have harfbuzz.pc
harfbuzz_reqpriv="$harfbuzz_pkg"
harfbuzz_libpriv=
harfbuzz_libstaticconf=`$PKG_CONFIG --static --libs "$harfbuzz_pkg"`
else
harfbuzz_reqpriv=
if test "$have_harfbuzz" != no; then
# HARFBUZZ_CFLAGS and HARFBUZZ_LIBS are set by the user
harfbuzz_libpriv="$HARFBUZZ_LIBS"
harfbuzz_libstaticconf="$HARFBUZZ_LIBS"
have_harfbuzz="yes (HARFBUZZ_CFLAGS and HARFBUZZ_LIBS)"
else
# since HarfBuzz is quite a new library we don't fall back to a
# different test; additionally, it has too many dependencies
:
fi
fi
fi
if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then
AC_MSG_ERROR([harfbuzz support requested but library not found])
fi
@ -354,15 +548,14 @@ set ${save_config_args}
ftmac_c="" # src/base/ftmac.c should not be included in makefiles by default
# don't quote AS_HELP_STRING!
AC_ARG_WITH([old-mac-fonts],
AS_HELP_STRING([--with-old-mac-fonts],
[allow Mac resource-based fonts to be used]))
if test x$with_old_mac_fonts = xyes; then
orig_LDFLAGS="${LDFLAGS}"
AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X])
FT2_EXTRA_LIBS="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices"
LDFLAGS="$LDFLAGS $FT2_EXTRA_LIBS"
ft2_extra_libs="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices"
LDFLAGS="$LDFLAGS $ft2_extra_libs"
AC_LINK_IFELSE([
AC_LANG_PROGRAM([
@ -448,7 +641,7 @@ if test x$with_old_mac_fonts = xyes; then
CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=0"
])],
[AC_MSG_RESULT([not found])
FT2_EXTRA_LIBS=""
ft2_extra_libs=""
LDFLAGS="${orig_LDFLAGS}"
CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"])
else
@ -668,7 +861,6 @@ fi
# Whether to use AppleTypeService since Mac OS X.
# don't quote AS_HELP_STRING!
AC_ARG_WITH([ats],
AS_HELP_STRING([--with-ats],
[use AppleTypeService, if available (default=yes)]))
@ -719,33 +911,93 @@ case "$CFLAGS" in
esac
AC_SUBST([ftmac_c])
AC_SUBST([LIBZ])
AC_SUBST([LIBBZ2])
AC_SUBST([LIBPNG])
AC_SUBST([FT2_EXTRA_LIBS])
AC_SUBST([SYSTEM_ZLIB])
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
$libpng_reqpriv, \
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
| sed -e 's/^ *//' \
-e 's/ *$//' \
-e 's/, */,/g' \
-e 's/,,*/,/g' \
-e 's/^,*//' \
-e 's/,*$//' \
-e 's/,/, /g'`
LT_INIT(win32-dll)
LIBS_PRIVATE="$zlib_libpriv \
$bzip2_libpriv \
$libpng_libpriv \
$harfbuzz_libpriv \
$ft2_extra_libs"
# beautify
LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
| sed -e 's/^ *//' \
-e 's/ *$//' \
-e 's/ */ /g'`
LIBS_CONFIG="-lfreetype \
$ZLIB_LIBS \
$BZIP2_LIBS \
$LIBPNG_LIBS \
$HARFBUZZ_LIBS \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
# on if necessary; also beautify
LIBS_CONFIG=`echo "$LIBS_CONFIG" \
| sed -e 's|-L */usr/lib64/* | |g' \
-e 's|-L */usr/lib/* | |g' \
-e 's/^ *//' \
-e 's/ *$//' \
-e 's/ */ /g'`
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libstaticconf \
$bzip2_libstaticconf \
$libpng_libstaticconf \
$harfbuzz_libstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
# on if necessary; also beautify
LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \
| sed -e 's|-L */usr/lib64/* | |g' \
-e 's|-L */usr/lib/* | |g' \
-e 's/^ *//' \
-e 's/ *$//' \
-e 's/ */ /g'`
AC_SUBST([ftmac_c])
AC_SUBST([REQUIRES_PRIVATE])
AC_SUBST([LIBS_PRIVATE])
AC_SUBST([LIBS_CONFIG])
AC_SUBST([LIBSSTATIC_CONFIG])
AC_SUBST([hardcode_libdir_flag_spec])
AC_SUBST([wl])
AC_SUBST([build_libtool_libs])
# changing LDFLAGS value should only be done after
# lt_cv_prog_compiler_static_works test
if test x$SYSTEM_ZLIB = xyes; then
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
LDFLAGS="$LDFLAGS $LIBZ"
if test "$have_zlib" != no; then
CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
fi
if test x$SYSTEM_LIBBZ2 = xyes; then
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
LDFLAGS="$LDFLAGS $LIBBZ2"
if test "$have_bzip2" != no; then
CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
fi
if test x$HAVE_LIBPNG = xyes; then
if test "$have_libpng" != no; then
CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
fi
if test "$have_harfbuzz" != no; then
CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"
LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"
fi
AC_SUBST([CFLAGS])
@ -773,4 +1025,13 @@ AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
AC_OUTPUT
AC_MSG_NOTICE([
Library configuration:
external zlib: $have_zlib
bzip2: $have_bzip2
libpng: $have_libpng
harfbuzz: $have_harfbuzz
])
# end of configure.raw

View File

@ -2,7 +2,7 @@
#
# Process this file with autoconf to produce a configure script.
#
# Copyright 2001-2013 by
# Copyright 2001-2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
version_info='17:1:11'
version_info='17:2:11'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
@ -34,6 +34,10 @@ AC_PROG_CC
AC_PROG_CPP
AC_SUBST(EXEEXT)
PKG_PROG_PKG_CONFIG([0.24])
LT_INIT(win32-dll)
# checks for native programs to generate building tool
@ -206,30 +210,68 @@ AC_CHECK_FUNCS([memcpy memmove])
# get compiler flags right
# we try to make the compiler work for C89-strict source.
# even if C compiler is GCC and C89 flags are available,
# some system headers (e.g. Android Bionic libc) is broken
# in C89 mode. we have to check the compilation finishes
# successfully.
#
# We try to make the compiler work for C89-strict source. Even if the
# C compiler is gcc and C89 flags are available, some system headers
# (e.g., Android Bionic libc) are broken in C89 mode. We have to check
# whether the compilation finishes successfully.
#
# Due to bugs in mingwrt 4.0.3 we don't use `-ansi' for MinGW.
#
# To avoid zillions of
#
# ISO C90 does not support 'long long'
#
# warnings, we disable `-pedantic' for gcc version < 4.6.
#
if test "x$GCC" = xyes; then
XX_CFLAGS="-Wall"
XX_ANSIFLAGS=""
for a in -pedantic -ansi
do
AC_MSG_CHECKING([gcc compiler flag ${a} to assure ANSI C works correctly])
orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([#include <stdio.h>],[{puts("");return 0;}])
],[
AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS])
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
],[
AC_MSG_RESULT([no])
])
CFLAGS="${orig_CFLAGS}"
done
case "$host" in
*-*-mingw*)
XX_ANSIFLAGS="-pedantic"
;;
*)
GCC_VERSION=`$CC -dumpversion`
GCC_MAJOR=`echo "$GCC_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
GCC_MINOR=`echo "$GCC_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
XX_PEDANTIC=-pedantic
if test $GCC_MAJOR -lt 4; then
XX_PEDANTIC=
else
if test $GCC_MAJOR -eq 4 -a $GCC_MINOR -lt 6; then
XX_PEDANTIC=
fi
fi
XX_ANSIFLAGS=""
for a in $XX_PEDANTIC -ansi
do
AC_MSG_CHECKING([gcc compiler flag ${a} to assure ANSI C works correctly])
orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([
#include <stdio.h>
],
[
{
puts( "" );
return 0;
}
])],
[AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS])
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
],
[AC_MSG_RESULT([no])])
CFLAGS="${orig_CFLAGS}"
done
;;
esac
else
case "$host" in
*-dec-osf*)
@ -247,62 +289,214 @@ AC_SUBST([XX_CFLAGS])
AC_SUBST([XX_ANSIFLAGS])
# All library tests below try `pkg-config' first. If that fails, a function
# from the library is tested in the traditional autoconf way (zlib, bzip2),
# or a config script is called (libpng).
#
# The `xxx_reqpriv' variables are for the `Requires.private' field in
# `freetype2.pc'. The `xxx_libpriv' variables are for the `Libs.private'
# field in `freetype2.pc' if pkg-config doesn't find a proper .pc file.
#
# The `xxx_libstaticconf' variables are for the `freetype-config' script.
#
# Note that a call to PKG_CHECK_MODULES(XXX, ...) sets and creates the
# output variables `XXX_CFLAGS' and `XXX_LIBS'. In case one or both are set
# for a library by the user, no entry for this library is added to
# `Requires.private'. Instead, it gets added to `Libs.private'
# check for system zlib
# don't quote AS_HELP_STRING!
AC_ARG_WITH([zlib],
AS_HELP_STRING([--without-zlib],
[use internal zlib instead of system-wide]))
if test x$with_zlib != xno && test -z "$LIBZ"; then
AC_CHECK_LIB([z],
[gzsetparams],
[AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])])
[AS_HELP_STRING([--with-zlib=@<:@yes|no|auto@:>@],
[use system zlib instead of internal library @<:@default=auto@:>@])],
[], [with_zlib=auto])
have_zlib=no
if test x"$with_zlib" = xyes -o x"$with_zlib" = xauto; then
zlib_pkg="zlib"
have_zlib_pkg=no
if test x"$ZLIB_CFLAGS" = x -a x"$ZLIB_LIBS" = x; then
PKG_CHECK_EXISTS([$zlib_pkg], [have_zlib_pkg=yes])
fi
PKG_CHECK_MODULES([ZLIB], [$zlib_pkg],
[have_zlib="yes (pkg-config)"], [:])
if test $have_zlib_pkg = yes; then
# we have zlib.pc
zlib_reqpriv="$zlib_pkg"
zlib_libpriv=
zlib_libstaticconf=`$PKG_CONFIG --static --libs "$zlib_pkg"`
else
zlib_reqpriv=
if test "$have_zlib" != no; then
# ZLIB_CFLAGS and ZLIB_LIBS are set by the user
zlib_libpriv="$ZLIB_LIBS"
zlib_libstaticconf="$ZLIB_LIBS"
have_zlib="yes (ZLIB_CFLAGS and ZLIB_LIBS)"
else
# fall back to standard autoconf test
AC_CHECK_LIB([z],
[gzsetparams],
[AC_CHECK_HEADER([zlib.h],
[have_zlib="yes (autoconf test)"
zlib_libpriv="-lz"
zlib_libstaticconf="$zlib_libpriv"
ZLIB_LIBS="$zlib_libpriv"])])
fi
fi
fi
if test x$with_zlib != xno && test -n "$LIBZ"; then
SYSTEM_ZLIB=yes
if test x"$with_zlib" = xyes -a "$have_zlib" = no; then
AC_MSG_ERROR([external zlib support requested but library not found])
fi
# check for system libbz2
# don't quote AS_HELP_STRING!
AC_ARG_WITH([bzip2],
AS_HELP_STRING([--without-bzip2],
[do not support bzip2 compressed fonts]))
if test x$with_bzip2 != xno && test -z "$LIBBZ2"; then
AC_CHECK_LIB([bz2],
[BZ2_bzDecompress],
[AC_CHECK_HEADER([bzlib.h], [LIBBZ2='-lbz2'])])
[AS_HELP_STRING([--with-bzip2=@<:@yes|no|auto@:>@],
[support bzip2 compressed fonts @<:@default=auto@:>@])],
[], [with_bzip2=auto])
have_bzip2=no
if test x"$with_bzip2" = xyes -o x"$with_bzip2" = xauto; then
bzip2_pkg="bzip2"
have_bzip2_pkg=no
if test x"$BZIP2_CFLAGS" = x -a x"$BZIP2_LIBS" = x; then
PKG_CHECK_EXISTS([$bzip2_pkg], [have_bzip2_pkg=yes])
fi
PKG_CHECK_MODULES([BZIP2], [$bzip2_pkg],
[have_bzip2="yes (pkg-config)"], [:])
if test $have_bzip2_pkg = yes; then
# we have bzip2.pc
bzip2_reqpriv="$bzip2_pkg"
bzip2_libpriv=
bzip2_libstaticconf=`$PKG_CONFIG --static --libs "$bzip2_pkg"`
else
bzip2_reqpriv=
if test "$have_bzip2" != no; then
# BZIP2_CFLAGS and BZIP2_LIBS are set by the user
bzip2_libpriv="$BZIP2_LIBS"
bzip2_libstaticconf="$BZIP2_LIBS"
have_bzip2="yes (BZIP2_CFLAGS and BZIP2_LIBS)"
else
# fall back to standard autoconf test
AC_CHECK_LIB([bz2],
[BZ2_bzDecompress],
[AC_CHECK_HEADER([bzlib.h],
[have_bzip2="yes (autoconf test)"
bzip2_libpriv="-lbz2"
bzip2_libstaticconf="$bzip2_libpriv"
BZIP2_LIBS="$bzip2_libpriv"])])
fi
fi
fi
if test x$with_bzip2 != xno && test -n "$LIBBZ2"; then
SYSTEM_LIBBZ2=yes
if test x"$with_bzip2" = xyes -a "$have_bzip2" = no; then
AC_MSG_ERROR([bzip2 support requested but library not found])
fi
# check for system libpng
HAVE_LIBPNG=no
AC_ARG_WITH([png],
AS_HELP_STRING([--without-png],
[do not support png compressed OpenType embedded bitmaps]))
if test x$with_png != xno; then
AC_MSG_CHECKING([for libpng])
if test -z "$LIBPNG_CFLAGS" -a -z "$LIBPNG_LDFLAGS"; then
if ! which libpng-config >/dev/null; then
AC_MSG_ERROR([`libpng-config' not found;
either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
or pass `--without-png' to the `configure' script.])
elif test ${cross_compiling} = yes; then
AC_MSG_ERROR([`libpng-config' should not be used in cross-building;
either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
or pass `--without-png' to the `configure' script.])
fi
LIBPNG="`libpng-config --libs`"
LIBPNG_CFLAGS="`libpng-config --cflags`"
LIBPNG_LDFLAGS="`libpng-config --ldflags`"
[AS_HELP_STRING([--with-png=@<:@yes|no|auto@:>@],
[support png compressed OpenType embedded bitmaps @<:@default=auto@:>@])],
[], [with_png=auto])
have_libpng=no
if test x"$with_png" = xyes -o x"$with_png" = xauto; then
libpng_pkg="libpng"
have_libpng_pkg=no
if test x"$LIBPNG_CFLAGS" = x -a x"$LIBPNG_LIBS" = x; then
PKG_CHECK_EXISTS([$libpng_pkg], [have_libpng_pkg=yes])
fi
HAVE_LIBPNG=yes
AC_MSG_RESULT([$LIBPNG_LDFLAGS])
PKG_CHECK_MODULES([LIBPNG], [$libpng_pkg],
[have_libpng="yes (pkg-config)"], [:])
if test $have_libpng_pkg = yes; then
# we have libpng.pc
libpng_reqpriv="$libpng_pkg"
libpng_libpriv=
libpng_libstaticconf=`$PKG_CONFIG --static --libs "$libpng_pkg"`
else
libpng_reqpriv=
if test "$have_libpng" != no; then
# LIBPNG_CFLAGS and LIBPNG_LIBS are set by the user
libpng_libpriv="$LIBPNG_LIBS"
libpng_libstaticconf="$LIBPNG_LIBS"
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
else
# fall back to config script.
AC_MSG_CHECKING([for libpng-config])
if which libpng-config > /dev/null; then
LIBPNG_CFLAGS=`libpng-config --cflags`
LIBPNG_LIBS=`libpng-config --ldflags`
libpng_libpriv=`libpng-config --static --ldflags`
libpng_libstaticconf="$libpng_libpriv"
have_libpng="yes (libpng-config)"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
fi
fi
fi
if test x"$with_png" = xyes -a "$have_libpng" = no; then
AC_MSG_ERROR([libpng support requested but library not found])
fi
# check for system libharfbuzz
AC_ARG_WITH([harfbuzz],
[AS_HELP_STRING([--with-harfbuzz=@<:@yes|no|auto@:>@],
[improve auto-hinting of OpenType fonts @<:@default=auto@:>@])],
[], [with_harfbuzz=auto])
have_harfbuzz=no
if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
harfbuzz_pkg="harfbuzz >= 0.9.19"
have_harfbuzz_pkg=no
if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
PKG_CHECK_EXISTS([$harfbuzz_pkg], [have_harfbuzz_pkg=yes])
fi
PKG_CHECK_MODULES([HARFBUZZ], [$harfbuzz_pkg],
[have_harfbuzz="yes (pkg-config)"], [:])
if test $have_harfbuzz_pkg = yes; then
# we have harfbuzz.pc
harfbuzz_reqpriv="$harfbuzz_pkg"
harfbuzz_libpriv=
harfbuzz_libstaticconf=`$PKG_CONFIG --static --libs "$harfbuzz_pkg"`
else
harfbuzz_reqpriv=
if test "$have_harfbuzz" != no; then
# HARFBUZZ_CFLAGS and HARFBUZZ_LIBS are set by the user
harfbuzz_libpriv="$HARFBUZZ_LIBS"
harfbuzz_libstaticconf="$HARFBUZZ_LIBS"
have_harfbuzz="yes (HARFBUZZ_CFLAGS and HARFBUZZ_LIBS)"
else
# since HarfBuzz is quite a new library we don't fall back to a
# different test; additionally, it has too many dependencies
:
fi
fi
fi
if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then
AC_MSG_ERROR([harfbuzz support requested but library not found])
fi
@ -354,15 +548,14 @@ set ${save_config_args}
ftmac_c="" # src/base/ftmac.c should not be included in makefiles by default
# don't quote AS_HELP_STRING!
AC_ARG_WITH([old-mac-fonts],
AS_HELP_STRING([--with-old-mac-fonts],
[allow Mac resource-based fonts to be used]))
if test x$with_old_mac_fonts = xyes; then
orig_LDFLAGS="${LDFLAGS}"
AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X])
FT2_EXTRA_LIBS="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices"
LDFLAGS="$LDFLAGS $FT2_EXTRA_LIBS"
ft2_extra_libs="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices"
LDFLAGS="$LDFLAGS $ft2_extra_libs"
AC_LINK_IFELSE([
AC_LANG_PROGRAM([
@ -448,7 +641,7 @@ if test x$with_old_mac_fonts = xyes; then
CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX=0"
])],
[AC_MSG_RESULT([not found])
FT2_EXTRA_LIBS=""
ft2_extra_libs=""
LDFLAGS="${orig_LDFLAGS}"
CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"])
else
@ -668,7 +861,6 @@ fi
# Whether to use AppleTypeService since Mac OS X.
# don't quote AS_HELP_STRING!
AC_ARG_WITH([ats],
AS_HELP_STRING([--with-ats],
[use AppleTypeService, if available (default=yes)]))
@ -719,33 +911,93 @@ case "$CFLAGS" in
esac
AC_SUBST([ftmac_c])
AC_SUBST([LIBZ])
AC_SUBST([LIBBZ2])
AC_SUBST([LIBPNG])
AC_SUBST([FT2_EXTRA_LIBS])
AC_SUBST([SYSTEM_ZLIB])
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
$libpng_reqpriv, \
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
| sed -e 's/^ *//' \
-e 's/ *$//' \
-e 's/, */,/g' \
-e 's/,,*/,/g' \
-e 's/^,*//' \
-e 's/,*$//' \
-e 's/,/, /g'`
LT_INIT(win32-dll)
LIBS_PRIVATE="$zlib_libpriv \
$bzip2_libpriv \
$libpng_libpriv \
$harfbuzz_libpriv \
$ft2_extra_libs"
# beautify
LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
| sed -e 's/^ *//' \
-e 's/ *$//' \
-e 's/ */ /g'`
LIBS_CONFIG="-lfreetype \
$ZLIB_LIBS \
$BZIP2_LIBS \
$LIBPNG_LIBS \
$HARFBUZZ_LIBS \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
# on if necessary; also beautify
LIBS_CONFIG=`echo "$LIBS_CONFIG" \
| sed -e 's|-L */usr/lib64/* | |g' \
-e 's|-L */usr/lib/* | |g' \
-e 's/^ *//' \
-e 's/ *$//' \
-e 's/ */ /g'`
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libstaticconf \
$bzip2_libstaticconf \
$libpng_libstaticconf \
$harfbuzz_libstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
# on if necessary; also beautify
LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \
| sed -e 's|-L */usr/lib64/* | |g' \
-e 's|-L */usr/lib/* | |g' \
-e 's/^ *//' \
-e 's/ *$//' \
-e 's/ */ /g'`
AC_SUBST([ftmac_c])
AC_SUBST([REQUIRES_PRIVATE])
AC_SUBST([LIBS_PRIVATE])
AC_SUBST([LIBS_CONFIG])
AC_SUBST([LIBSSTATIC_CONFIG])
AC_SUBST([hardcode_libdir_flag_spec])
AC_SUBST([wl])
AC_SUBST([build_libtool_libs])
# changing LDFLAGS value should only be done after
# lt_cv_prog_compiler_static_works test
if test x$SYSTEM_ZLIB = xyes; then
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
LDFLAGS="$LDFLAGS $LIBZ"
if test "$have_zlib" != no; then
CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
fi
if test x$SYSTEM_LIBBZ2 = xyes; then
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
LDFLAGS="$LDFLAGS $LIBBZ2"
if test "$have_bzip2" != no; then
CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
fi
if test x$HAVE_LIBPNG = xyes; then
if test "$have_libpng" != no; then
CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
fi
if test "$have_harfbuzz" != no; then
CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"
LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"
fi
AC_SUBST([CFLAGS])
@ -773,4 +1025,13 @@ AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
AC_OUTPUT
AC_MSG_NOTICE([
Library configuration:
external zlib: $have_zlib
bzip2: $have_bzip2
libpng: $have_libpng
harfbuzz: $have_harfbuzz
])
# end of configure.raw

View File

@ -1,6 +1,6 @@
#! /bin/sh
#
# Copyright 2000-2005, 2008, 2009, 2013 by
# Copyright 2000-2005, 2008, 2009, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -38,6 +38,8 @@ Options:
--libtool display library name for linking with libtool
--cflags display flags for compiling with the FreeType
library
--static make command line options display flags
for static linking
EOF
exit $1
}
@ -88,6 +90,9 @@ while test $# -gt 0 ; do
--libtool)
echo_libtool=yes
;;
--static)
show_static=yes
;;
*)
usage 1 1>&2
;;
@ -137,7 +142,11 @@ if test "$echo_cflags" = "yes" ; then
fi
if test "$echo_libs" = "yes" ; then
libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"
libs="%LIBS_CONFIG%"
staticlibs="%LIBSSTATIC_CONFIG%"
if test "$show_static" = "yes" ; then
libs="$staticlibs"
fi
if test "${SYSROOT}$libdir" != "/usr/lib" &&
test "${SYSROOT}$libdir" != "/usr/lib64"; then
echo -L${SYSROOT}$libdir $libs

View File

@ -4,9 +4,11 @@ libdir="%libdir%"
includedir="%includedir%/freetype2"
Name: FreeType 2
URL: http://freetype.org
Description: A free, high-quality, and portable font engine.
Version: %ft_version%
Requires:
Requires.private: %REQUIRES_PRIVATE%
Libs: -L${libdir} -lfreetype
Libs.private: %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%
Libs.private: %LIBS_PRIVATE%
Cflags: -I${includedir}

View File

@ -4,7 +4,7 @@
/* */
/* UNIX-specific configuration file (specification only). */
/* */
/* Copyright 1996-2004, 2006-2009, 2011, 2013 by */
/* Copyright 1996-2004, 2006-2009, 2011, 2013, 2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -419,7 +419,7 @@ FT_BEGIN_HEADER
__asm__ __volatile__ (
"smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */
"mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */
#ifdef __clang__
#if defined( __clang__ ) && defined( __thumb2__ )
"add.w %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
#else
"add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */

View File

@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2011-01-19.21; # UTC
scriptversion=2013-10-30.23; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@ -35,25 +35,21 @@ scriptversion=2011-01-19.21; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
tab=' '
nl='
'
IFS=" "" $nl"
IFS=" $tab$nl"
# set DOITPROG to echo to test this script
# Set DOITPROG to "echo" to test this script.
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
doit_exec=$doit
fi
doit_exec=${doit:-exec}
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
posix_glob='?'
initialize_posix_glob='
test "$posix_glob" != "?" || {
if (set -f) 2>/dev/null; then
posix_glob=
else
posix_glob=:
fi
}
'
posix_mkdir=
# Desired mode of installed file.
@ -137,40 +122,39 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
shift;;
shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
shift;;
case $mode in
*' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
shift;;
-o) chowncmd="$chownprog $2"
shift;;
shift;;
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
-T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
--) shift
break;;
--) shift
break;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
esac
@ -190,7 +174,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
# Protect names problematic for `test' and other utilities.
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@ -202,7 +186,7 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
# It's OK to call `install-sh -d' without argument.
# It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
@ -223,16 +207,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
u_plus_rw=
u_plus_rw=
else
u_plus_rw='% 200'
u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
u_plus_rw=
u_plus_rw=
else
u_plus_rw=,u+rw
u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@ -240,7 +224,7 @@ fi
for src
do
# Protect names problematic for `test' and other utilities.
# Protect names problematic for 'test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
@ -270,40 +254,14 @@ do
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstdir_status=0
else
# Prefer dirname, but fall back on a substitute if dirname fails.
dstdir=`
(dirname "$dst") 2>/dev/null ||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$dst" : 'X\(//\)[^/]' \| \
X"$dst" : 'X\(//\)$' \| \
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$dst" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
}
/^X\(\/\/\)[^/].*/{
s//\1/
q
}
/^X\(\/\/\)$/{
s//\1/
q
}
/^X\(\/\).*/{
s//\1/
q
}
s/.*/./; q'
`
dstdir=`dirname "$dst"`
test -d "$dstdir"
dstdir_status=$?
fi
@ -314,74 +272,74 @@ do
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
# Create intermediate dirs using mode 755 as modified by the umask.
# This is like FreeBSD 'install' as of 1997-10-28.
umask=`umask`
case $stripcmd.$umask in
# Optimize common cases.
*[2367][2367]) mkdir_umask=$umask;;
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
# Create intermediate dirs using mode 755 as modified by the umask.
# This is like FreeBSD 'install' as of 1997-10-28.
umask=`umask`
case $stripcmd.$umask in
# Optimize common cases.
*[2367][2367]) mkdir_umask=$umask;;
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
*[0-7])
mkdir_umask=`expr $umask + 22 \
- $umask % 100 % 40 + $umask % 20 \
- $umask % 10 % 4 + $umask % 2
`;;
*) mkdir_umask=$umask,go-w;;
esac
*[0-7])
mkdir_umask=`expr $umask + 22 \
- $umask % 100 % 40 + $umask % 20 \
- $umask % 10 % 4 + $umask % 2
`;;
*) mkdir_umask=$umask,go-w;;
esac
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
else
mkdir_mode=
fi
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
else
mkdir_mode=
fi
posix_mkdir=false
case $umask in
*[123567][0-7][0-7])
# POSIX mkdir -p sets u+wx bits regardless of umask, which
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
posix_mkdir=false
case $umask in
*[123567][0-7][0-7])
# POSIX mkdir -p sets u+wx bits regardless of umask, which
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
if (umask $mkdir_umask &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writeable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
if (umask $mkdir_umask &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
esac
if
$posix_mkdir && (
umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
@ -391,53 +349,51 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
/*) prefix='/';;
[-=\(\)!]*) prefix='./';;
*) prefix='';;
/*) prefix='/';;
[-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
$posix_glob set -f
set -f
set fnord $dstdir
shift
$posix_glob set +f
set +f
IFS=$oIFS
prefixes=
for d
do
test X"$d" = X && continue
test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
if $posix_mkdir; then
(umask=$mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
case $prefix in
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
if $posix_mkdir; then
(umask=$mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
case $prefix in
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
done
if test -n "$prefixes"; then
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
fi
fi
fi
@ -472,15 +428,12 @@ do
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
eval "$initialize_posix_glob" &&
$posix_glob set -f &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
$posix_glob set +f &&
set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
@ -493,24 +446,24 @@ do
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
test ! -f "$dst" ||
$doit $rmcmd -f "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
test ! -f "$dst" ||
$doit $rmcmd -f "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2002, 2003, 2006, 2013 by
# Copyright 1996-2000, 2002, 2003, 2006, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -33,7 +33,8 @@ install: $(PROJECT_LIBRARY)
$(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)$(includedir)/freetype2/config \
$(DESTDIR)$(bindir) \
$(DESTDIR)$(datadir)/aclocal
$(DESTDIR)$(datadir)/aclocal \
$(DESTDIR)$(mandir)/man1
$(LIBTOOL) --mode=install $(INSTALL) \
$(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
-for P in $(PUBLIC_H) ; do \
@ -58,6 +59,8 @@ install: $(PROJECT_LIBRARY)
$(DESTDIR)$(datadir)/aclocal/freetype2.m4
$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \
$(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
$(INSTALL_DATA) $(TOP_DIR)/docs/freetype-config.1 \
$(DESTDIR)$(mandir)/man1/freetype-config.1
uninstall:
@ -69,6 +72,7 @@ uninstall:
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
-$(DELETE) $(DESTDIR)$(mandir)/man1/freetype-config.1
check:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,199 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
# only at the first occurence in configure.ac, so if the first place
# it's called might be skipped (such as if it is within an "if", you
# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
# _PKG_SHORT_ERRORS_SUPPORTED
# -----------------------------
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi[]dnl
])# _PKG_SHORT_ERRORS_SUPPORTED
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
$3
fi[]dnl
])# PKG_CHECK_MODULES
# PKG_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable pkgconfigdir as the location where a module
# should install pkg-config .pc files. By default the directory is
# $libdir/pkgconfig, but the default can be changed by passing
# DIRECTORY. The user can override through the --with-pkgconfigdir
# parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([pkgconfigdir],
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
[with_pkgconfigdir=]pkg_default)
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_INSTALLDIR
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable noarch_pkgconfigdir as the location where a
# module should install arch-independent pkg-config .pc files. By
# default the directory is $datadir/pkgconfig, but the default can be
# changed by passing DIRECTORY. The user can override through the
# --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([noarch-pkgconfigdir],
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
[with_noarch_pkgconfigdir=]pkg_default)
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2002, 2004, 2006, 2008, 2013 by
# Copyright 1996-2000, 2002, 2004, 2006, 2008, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -34,15 +34,16 @@ INSTALL_PROGRAM := @INSTALL_PROGRAM@
INSTALL_SCRIPT := @INSTALL_SCRIPT@
MKINSTALLDIRS := $(BUILD_DIR)/mkinstalldirs
DISTCLEAN += $(OBJ_BUILD)/config.cache \
$(OBJ_BUILD)/config.log \
$(OBJ_BUILD)/config.status \
$(OBJ_BUILD)/unix-def.mk \
$(OBJ_BUILD)/unix-cc.mk \
$(OBJ_BUILD)/ftconfig.h \
$(OBJ_BUILD)/freetype-config \
$(OBJ_BUILD)/freetype2.pc \
$(LIBTOOL) \
CLEAN += $(OBJ_BUILD)/freetype-config \
$(OBJ_BUILD)/freetype2.pc
DISTCLEAN += $(OBJ_BUILD)/config.cache \
$(OBJ_BUILD)/config.log \
$(OBJ_BUILD)/config.status \
$(OBJ_BUILD)/unix-def.mk \
$(OBJ_BUILD)/unix-cc.mk \
$(OBJ_BUILD)/ftconfig.h \
$(LIBTOOL) \
$(OBJ_BUILD)/Makefile
@ -55,15 +56,16 @@ bindir := @bindir@
includedir := @includedir@
datarootdir := @datarootdir@
datadir := @datadir@
mandir := @mandir@
version_info := @version_info@
# Variables needed for `freetype-config' and `freetype.pc'.
#
FT2_EXTRA_LIBS := @FT2_EXTRA_LIBS@
LIBBZ2 := @LIBBZ2@
LIBZ := @LIBZ@
LIBPNG := @LIBPNG@
REQUIRES_PRIVATE := @REQUIRES_PRIVATE@
LIBS_PRIVATE := @LIBS_PRIVATE@
LIBS_CONFIG := @LIBS_CONFIG@
LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@
build_libtool_libs := @build_libtool_libs@
ft_version := @ft_version@
@ -100,17 +102,15 @@ NO_OUTPUT := 2> /dev/null
$(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
rm -f $@ $@.tmp
sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
-e 's|%LIBBZ2%|$(LIBBZ2)|' \
-e 's|%LIBZ%|$(LIBZ)|' \
-e 's|%LIBPNG%|$(LIBPNG)|' \
sed -e 's|%LIBS_CONFIG%|$(LIBS_CONFIG)|' \
-e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \
-e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
-e 's|%exec_prefix%|$(exec_prefix)|' \
-e 's|%ft_version%|$(ft_version)|' \
-e 's|%includedir%|$(includedir)|' \
-e 's|%libdir%|$(libdir)|' \
-e 's|%prefix%|$(prefix)|' \
$< \
-e 's|%exec_prefix%|$(exec_prefix)|' \
-e 's|%ft_version%|$(ft_version)|' \
-e 's|%includedir%|$(includedir)|' \
-e 's|%libdir%|$(libdir)|' \
-e 's|%prefix%|$(prefix)|' \
$< \
> $@.tmp
chmod +x $@.tmp
chmod a-w $@.tmp
@ -118,17 +118,15 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
$(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
rm -f $@ $@.tmp
sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
-e 's|%LIBBZ2%|$(LIBBZ2)|' \
-e 's|%LIBZ%|$(LIBZ)|' \
-e 's|%LIBPNG%|$(LIBPNG)|' \
sed -e 's|%REQUIRES_PRIVATE%|$(REQUIRES_PRIVATE)|' \
-e 's|%LIBS_PRIVATE%|$(LIBS_PRIVATE)|' \
-e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
-e 's|%exec_prefix%|$(exec_prefix)|' \
-e 's|%ft_version%|$(ft_version)|' \
-e 's|%includedir%|$(includedir)|' \
-e 's|%libdir%|$(libdir)|' \
-e 's|%prefix%|$(prefix)|' \
$< \
-e 's|%exec_prefix%|$(exec_prefix)|' \
-e 's|%ft_version%|$(ft_version)|' \
-e 's|%includedir%|$(includedir)|' \
-e 's|%libdir%|$(libdir)|' \
-e 's|%prefix%|$(prefix)|' \
$< \
> $@.tmp
chmod a-w $@.tmp
mv $@.tmp $@

View File

@ -21,7 +21,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -41,7 +41,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -61,7 +61,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -81,7 +81,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -101,7 +101,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -121,7 +121,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -141,7 +141,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -161,7 +161,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -181,7 +181,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -201,7 +201,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -221,7 +221,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -241,7 +241,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -261,7 +261,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -281,7 +281,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -301,7 +301,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -321,7 +321,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -341,7 +341,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -361,7 +361,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -381,7 +381,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -401,7 +401,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -421,7 +421,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -441,7 +441,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -461,7 +461,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -481,7 +481,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -501,7 +501,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -521,7 +521,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -541,7 +541,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -561,7 +561,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -581,7 +581,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -601,7 +601,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -621,7 +621,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -641,7 +641,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -661,7 +661,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -681,7 +681,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -701,7 +701,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -721,7 +721,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -741,7 +741,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -758,7 +758,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />

View File

@ -21,14 +21,14 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.5.2 sources:</p>
It compiles the following libraries from the FreeType 2.5.3 sources:</p>
<ul>
<pre>
freetype252.lib - release build; single threaded
freetype252_D.lib - debug build; single threaded
freetype252MT.lib - release build; multi-threaded
freetype252MT_D.lib - debug build; multi-threaded</pre>
freetype253.lib - release build; single threaded
freetype253_D.lib - debug build; single threaded
freetype253MT.lib - release build; multi-threaded
freetype253MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -88,7 +88,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -177,7 +177,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -266,7 +266,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -355,7 +355,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -444,7 +444,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -533,7 +533,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -621,7 +621,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -709,7 +709,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -797,7 +797,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -885,7 +885,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -973,7 +973,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1061,7 +1061,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1149,7 +1149,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1236,7 +1236,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1323,7 +1323,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1410,7 +1410,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1497,7 +1497,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1584,7 +1584,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1668,7 +1668,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1753,7 +1753,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1838,7 +1838,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1923,7 +1923,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2008,7 +2008,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2093,7 +2093,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2178,7 +2178,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2263,7 +2263,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2348,7 +2348,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2433,7 +2433,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2518,7 +2518,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2603,7 +2603,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2689,7 +2689,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2775,7 +2775,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2861,7 +2861,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2947,7 +2947,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3033,7 +3033,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3119,7 +3119,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3205,7 +3205,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3279,7 +3279,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool

View File

@ -21,14 +21,14 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.5.2 sources:</p>
It compiles the following libraries from the FreeType 2.5.3 sources:</p>
<ul>
<pre>
freetype252.lib - release build; single threaded
freetype252_D.lib - debug build; single threaded
freetype252MT.lib - release build; multi-threaded
freetype252MT_D.lib - debug build; multi-threaded</pre>
freetype253.lib - release build; single threaded
freetype253_D.lib - debug build; single threaded
freetype253MT.lib - release build; multi-threaded
freetype253MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2004, 2006, 2007 by
# Copyright 1996-2000, 2003, 2004, 2006, 2007, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -23,7 +23,7 @@ ifeq ($(PLATFORM),ansi)
#
ifeq ($(OS),Windows_NT)
PLATFORM := win32
PLATFORM := windows
else
@ -44,7 +44,8 @@ ifeq ($(PLATFORM),ansi)
#
# A better test is to check whether there are both the environment
# variables `winbootdir' and `windir'. The first indicates an
# underlying DOS 7.x, while the second is set only if win32 is available.
# underlying DOS 7.x, while the second is set only if windows is
# available.
#
# Note that on Windows NT, such an environment variable will not be seen
# from DOS-based tools like DJGPP's make; this is not actually a problem
@ -53,7 +54,7 @@ ifeq ($(PLATFORM),ansi)
ifdef winbootdir
ifdef windir
PLATFORM := win32
PLATFORM := windows
endif
endif
@ -62,7 +63,7 @@ ifeq ($(PLATFORM),ansi)
endif # test PLATFORM ansi
ifeq ($(PLATFORM),win32)
ifeq ($(PLATFORM),windows)
DELETE := del
CAT := type
@ -177,7 +178,7 @@ ifeq ($(PLATFORM),win32)
.PHONY: devel-gcc
endif
endif # test PLATFORM win32
endif # test PLATFORM windows
# EOF

View File

@ -16,7 +16,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype253.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -33,7 +33,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype253MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -50,7 +50,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype253ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -67,7 +67,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype253_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -84,7 +84,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype253ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
@ -101,7 +101,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype253MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />

View File

@ -11,14 +11,14 @@
<p>This directory contains project files for Visual C++, named
<tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
compiles the following libraries from the FreeType 2.5.2 sources:</p>
compiles the following libraries from the FreeType 2.5.3 sources:</p>
<ul>
<pre>
freetype252.lib - release build; single threaded
freetype252_D.lib - debug build; single threaded
freetype252MT.lib - release build; multi-threaded
freetype252MT_D.lib - debug build; multi-threaded</pre>
freetype253.lib - release build; single threaded
freetype253_D.lib - debug build; single threaded
freetype253MT.lib - release build; multi-threaded
freetype253MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -70,7 +70,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype252.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -145,7 +145,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype252MT.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -220,7 +220,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype252ST.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -292,7 +292,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype252_D.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -365,7 +365,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype252ST_D.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -439,7 +439,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype252MT_D.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool

View File

@ -11,14 +11,14 @@
<p>This directory contains project files for Visual C++, named
<tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
compiles the following libraries from the FreeType 2.5.2 sources:</p>
compiles the following libraries from the FreeType 2.5.3 sources:</p>
<ul>
<pre>
freetype252.lib - release build; single threaded
freetype252_D.lib - debug build; single threaded
freetype252MT.lib - release build; multi-threaded
freetype252MT_D.lib - debug build; multi-threaded</pre>
freetype253.lib - release build; single threaded
freetype253_D.lib - debug build; single threaded
freetype253MT.lib - release build; multi-threaded
freetype253MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -179,18 +179,18 @@
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype252_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype252_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype252MT_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype252MT_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype252ST_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">freetype252ST_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype252</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype252</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype252MT</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype252MT</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype252ST</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">freetype252ST</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype253_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype253_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype253MT_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype253MT_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype253ST_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">freetype253ST_D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype253</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype253</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype253MT</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype253MT</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype253ST</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">freetype253ST</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>.\..\..\..\objs\win64\vc2010\</OutDir>

View File

@ -9,18 +9,19 @@
FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
</h1>
<p>This directory contains a project file for Visual C++ newer), named
<tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.
It compiles the following libraries from the FreeType 2.5.2 sources:</p>
<p>This directory contains a project file for Visual C++ (VS.NET&nbsp;2010
or newer), named <tt>freetype.vcxproj</tt>, and Visual Studio, called
<tt>freetype.sln</tt>. It compiles the following libraries from the
FreeType 2.5.3 sources:</p>
<ul>
<pre>
freetype252.lib - release build
freetype252_D.lib - debug build
freetype252ST.lib - release build; single threaded
freetype252ST_D.lib - debug build; single threaded
freetype252MT.lib - release build; multi-threaded
freetype252MT_D.lib - debug build; multi-threaded</pre>
freetype253.lib - release build
freetype253_D.lib - debug build
freetype253ST.lib - release build; single threaded
freetype253ST_D.lib - debug build; single threaded
freetype253MT.lib - release build; multi-threaded
freetype253MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Both Win32 and x64 builds are supported.</p>

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@ -78,7 +78,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@ -102,8 +102,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype252_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT_D.lib"
# ADD BASE LIB32 /nologo /out:"lib\freetype253_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@ -126,8 +126,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype252.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT.lib"
# ADD BASE LIB32 /nologo /out:"lib\freetype253.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@ -151,8 +151,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"
# ADD LIB32 /out:"..\..\..\objs\freetype252ST.lib"
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype253.lib"
# ADD LIB32 /out:"..\..\..\objs\freetype253ST.lib"
# SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -177,8 +177,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252ST_D.lib"
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype253_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253ST_D.lib"
!ENDIF

View File

@ -69,7 +69,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -144,7 +144,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -219,7 +219,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -291,7 +291,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -364,7 +364,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -438,7 +438,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool

View File

@ -11,14 +11,14 @@
<p>This directory contains project files for Visual C++, named
<tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
compiles the following libraries from the FreeType 2.5.2 sources:</p>
compiles the following libraries from the FreeType 2.5.3 sources:</p>
<ul>
<pre>
freetype252.lib - release build; single threaded
freetype252_D.lib - debug build; single threaded
freetype252MT.lib - release build; multi-threaded
freetype252MT_D.lib - debug build; multi-threaded</pre>
freetype253.lib - release build; single threaded
freetype253_D.lib - debug build; single threaded
freetype253MT.lib - release build; multi-threaded
freetype253MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@ -78,7 +78,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@ -102,8 +102,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype252_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT_D.lib"
# ADD BASE LIB32 /nologo /out:"lib\freetype253_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@ -126,8 +126,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype252.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT.lib"
# ADD BASE LIB32 /nologo /out:"lib\freetype253.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@ -151,8 +151,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"
# ADD LIB32 /out:"..\..\..\objs\freetype252ST.lib"
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype253.lib"
# ADD LIB32 /out:"..\..\..\objs\freetype253ST.lib"
# SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -177,8 +177,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252ST_D.lib"
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype253_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253ST_D.lib"
!ENDIF

View File

@ -87,7 +87,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -162,7 +162,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -237,7 +237,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -309,7 +309,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -382,7 +382,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -456,7 +456,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -534,7 +534,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -619,7 +619,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -704,7 +704,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -785,7 +785,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -867,7 +867,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -950,7 +950,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1036,7 +1036,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1121,7 +1121,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1206,7 +1206,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1287,7 +1287,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1369,7 +1369,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1452,7 +1452,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1538,7 +1538,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1623,7 +1623,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1708,7 +1708,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -1789,7 +1789,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1871,7 +1871,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -1954,7 +1954,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2040,7 +2040,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2125,7 +2125,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2210,7 +2210,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -2291,7 +2291,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2373,7 +2373,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2456,7 +2456,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2542,7 +2542,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2627,7 +2627,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2712,7 +2712,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -2793,7 +2793,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2875,7 +2875,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -2958,7 +2958,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3044,7 +3044,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252.lib"
OutputFile="..\..\..\objs\freetype253.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3129,7 +3129,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT.lib"
OutputFile="..\..\..\objs\freetype253MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3214,7 +3214,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST.lib"
OutputFile="..\..\..\objs\freetype253ST.lib"
/>
<Tool
Name="VCALinkTool"
@ -3295,7 +3295,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252_D.lib"
OutputFile="..\..\..\objs\freetype253_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3377,7 +3377,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252ST_D.lib"
OutputFile="..\..\..\objs\freetype253ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@ -3460,7 +3460,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype252MT_D.lib"
OutputFile="..\..\..\objs\freetype253MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool

View File

@ -21,14 +21,14 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.5.2 sources:</p>
It compiles the following libraries from the FreeType 2.5.3 sources:</p>
<ul>
<pre>
freetype252.lib - release build; single threaded
freetype252_D.lib - debug build; single threaded
freetype252MT.lib - release build; multi-threaded
freetype252MT_D.lib - debug build; multi-threaded</pre>
freetype253.lib - release build; single threaded
freetype253_D.lib - debug build; single threaded
freetype253MT.lib - release build; multi-threaded
freetype253MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005, 2006, 2013 by
# Copyright 1996-2000, 2003, 2005, 2006, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -17,7 +17,7 @@ DELETE := del
CAT := type
SEP := $(strip \ )
BUILD_DIR := $(TOP_DIR)/builds/windows
PLATFORM := win32
PLATFORM := windows
# The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !!
#

View File

@ -217,6 +217,19 @@ FT_BEGIN_HEADER
#define FT_CONFIG_OPTION_USE_PNG
/*************************************************************************/
/* */
/* HarfBuzz support. */
/* */
/* FreeType uses the HarfBuzz library to improve auto-hinting of */
/* OpenType fonts. If available, many glyphs not directly addressable */
/* by a font's character map will be hinted also. */
/* */
/* Define this macro if you want to enable this `feature'. */
/* */
#define FT_CONFIG_OPTION_USE_HARFBUZZ
/*************************************************************************/
/* */
/* Define to disable the use of file stream functions and types, FILE, */

View File

@ -1,4 +1,72 @@
CHANGES BETWEEN 2.5.2 and 2.5.3
I. IMPORTANT BUG FIXES
- A vulnerability was identified and fixed in the new CFF driver
(cf. http://savannah.nongnu.org/bugs/?41697; it doesn't have a
CVE number yet). All users should upgrade.
- More bug fixes related to correct positioning of composite
glyphs.
- Many fixes to better protect against malformed input.
II. IMPORTANT CHANGES
- FreeType can now use the HarfBuzz library to greatly improve the
auto-hinting of fonts that use OpenType features: Many glyphs
that are part of such features but don't have cmap entries are
now handled properly, for example small caps or superscripts.
Define the configuration macro FT_CONFIG_OPTION_USE_HARFBUZZ to
activate HarfBuzz support.
You need HarfBuzz version 0.9.19 or newer.
Note that HarfBuzz depends on FreeType; this currently causes a
chicken-and-egg problem that can be solved as follows in case
HarfBuzz is not yet installed on your system.
1. Compile and install FreeType without the configuration
macro FT_CONFIG_OPTION_USE_HARFBUZZ.
2. Compile and install HarfBuzz.
3. Define macro FT_CONFIG_OPTION_USE_HARFBUZZ, then compile
and install FreeType again.
With FreeType's `configure' script the procedure boils down to
configure, build, and install Freetype, then configure, compile,
and install HarfBuzz, then configure, compile, and install
FreeType again (after executing `make distclean').
- All libraries FreeType depends on are now checked using the
`pkg-config' configuration files first, followed by alternative
methods.
- The new value `auto' for the various `--with-XXX' library
options (for example `--with-harfbuzz=auto') makes the
`configure' script automatically link to the libraries it finds.
This is now the default.
- In case FreeType's `configure' script can't find a library, you
can pass environment variables to circumvent pkg-config, and
those variables have been harmonized as a consequence of the
changes mentioned above:
LIBZ -> removed; use LIBZ_CFLAGS and LIBZ_LIBS
LIBBZ2 -> removed; use BZIP2_CFLAGS and BZIP2_LIBS
LIBPNG_LDFLAGS -> LIBPNG_LIBS
`./configure --help' shows all available environment variables.
- The `freetype-config' script now understands option `--static'
to emit static linking information.
======================================================================
CHANGES BETWEEN 2.5.1 and 2.5.2
I. IMPORTANT BUG FIXES

View File

@ -1,26 +1,27 @@
This document contains instructions on how to cross-build the FreeType
library on Unix systems, for example, building binaries for Linux/MIPS
on FreeBSD/i386. Before reading this document, please consult
INSTALL.UNIX for required tools and the basic self-building procedure.
on FreeBSD/i386. Before reading this document, please consult the
file `INSTALL.UNIX' for required tools and the basic self-building
procedure.
1. Required Tools
-----------------
For self-building the FreeType library on a Unix system, GNU Make
3.80 or newer is required. INSTALL.UNIX contains hints how to
3.80 or newer is required. `INSTALL.UNIX' contains hints how to
check the installed `make'.
The GNU C compiler to cross-build the target system is required.
At present, using non-GNU cross compiler is not tested. The cross
Currently, using a non-GNU cross compiler is untested. The cross
compiler is expected to be installed with a system prefix. For
example, if your building system is FreeBSD/i386 and the target
system is Linux/MIPS, the cross compiler should be installed with
system is Linux/MIPS, the cross compiler should be installed with
the name `mips-ip22-linuxelf-gcc'.
A C compiler for a self-build is required also, to build a tool
that is executed during the building procedure. Non-GNU self
compilers are acceptable, but such a setup is not tested yet.
(`apinames') that is executed during the build procedure. Non-GNU
self compilers are acceptable, but such a setup is untested.
2. Configuration
@ -28,10 +29,10 @@ INSTALL.UNIX for required tools and the basic self-building procedure.
2.1. Building and target system
To configure for cross-build, the options `--host=<system>' and
`--build=<system>' must be passed to configure. For example, if
your building system is FreeBSD/i386 and the target system is
Linux/MIPS, say
To configure a cross-build, the options `--host=<system>' and
`--build=<system>' must be passed to the `configure' script.
For example, if your build system is FreeBSD/i386 and the target
system is Linux/MIPS, say
./configure \
--build=i386-unknown-freebsd \
@ -58,22 +59,63 @@ INSTALL.UNIX for required tools and the basic self-building procedure.
2.2. The prefix to install FreeType2
Setting `--prefix=<prefix>' properly is important. The prefix
to install FreeType2 is written into the freetype-config script
and freetype2.pc configuration file.
to install FreeType2 is written into the `freetype-config'
script and `freetype2.pc' configuration file.
If the built FreeType 2 library is used as a part of the
cross-building system, the prefix is expected to be different
from the self-building system. For example, configuration with
`--prefix=/usr/local' installs binaries into the system wide
`/usr/local' directory which then can't be executed. This
causes confusion in configuration of all applications which use
FreeType2. Instead, use a prefix to install the cross-build
into a separate system tree, for example,
`--prefix=/usr/local/mips-ip22-linux/'.
from the self-building system. For example, a configuration
with `--prefix=/usr/local' installs binaries into the
system-wide `/usr/local' directory, which then can't be executed
due to the incorrect architecture. This causes confusion in
configuration of all applications that use FreeType2. Instead,
use a prefix to install the cross-build into a separate system
tree, for example, `--prefix=/usr/local/mips-ip22-linux/'.
On the other hand, if the built FreeType2 is used as a part of
the target system, the prefix to install should reflect the file
system structure of the target system.
On the other hand, if the built FreeType 2 library is used as a
part of the target system, the prefix to install should reflect
the file system structure of the target system.
2.3. Library dependencies
FreeType normally depends on external libraries like `libpng' or
`libharfbuzz'. The easiest case is to deactivate all such
dependencies using the `--without-XXX' configuration options.
However, if you want to use those libraries, you should ensure
that they are available both on the target system and as
(cross-compiled) libraries on the build system.
FreeType uses `pkg-config' to find most of the libraries; the
other libraries it links to are expected in the standard system
directories. Since the default pkg-config's meta-information
files (like `harfbuzz.pc') of the build platform don't work, use
one of the two possible solutions below.
o Use pkg-config's meta-information files that are adjusted to
cross-compile and cross-link with the target platform's
libraries. Make sure those files are found before the build
system's default files. Example:
./configure \
--build=i386-unknown-freebsd \
--host=mips-ip22-linuxelf \
PKG_CONFIG_LIBDIR="/usr/local/mips-ip22-linux/lib/pkgconfig" \
[other options]
See the manpage of `pkg-config' for more details.
o Set variables like LIBPNG_LIBS as additional options to the
`configure' script, overriding the values `pkg-config' would
provide. `configure --help' shows the available environment
variables. Example:
./configure \
--build=i386-unknown-freebsd \
--host=mips-ip22-linuxelf \
LIBPNG_CFLAGS="-I/usr/local/mips-ip22-linux/include" \
LIBPNG_LIBS="-L/usr/local/mips-ip22-linux/lib -lpng12" \
[other options]
3. Building command
@ -121,7 +163,7 @@ INSTALL.UNIX for required tools and the basic self-building procedure.
----------------------------------------------------------------------
Copyright 2006, 2008, 2012 by suzuki toshiya
Copyright 2006, 2008, 2012, 2014 by suzuki toshiya
David Turner, Robert Wilhelm, and Werner Lemberg.

View File

@ -52,7 +52,7 @@ instructions in the file `INSTALL.UNIX' instead.
The following settings are used:
platform win32
platform windows
compiler gcc
configuration directory .\builds\windows
configuration rules .\builds\windows\w32-gcc.mk
@ -148,7 +148,7 @@ instructions in the file `INSTALL.UNIX' instead.
----------------------------------------------------------------------
Copyright 2003, 2004, 2005, 2006, 2008, 2013 by
Copyright 2003-2006, 2008, 2013, 2014 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,

View File

@ -81,9 +81,28 @@ or MSys on Win32:
make
make install
3.1 Interdependency with HarfBuzz
.................................
Note that there is a chicken-and-egg problem currently since the
HarfBuzz library (used by the auto-hinter to improve support of
OpenType fonts) depends on FreeType, which can be solved as
follows in case HarfBuzz is not yet installed on your system.
1. Call FreeType's `configure' script with option
`--without-harfbuzz', then compile and install FreeType.
2. Compile and install HarfBuzz.
3. Call FreeType's `configure' script without option
`--without-harfbuzz' (after executing `make distclean'), then
compile and install FreeType again.
----------------------------------------------------------------------
Copyright 2003-2007, 2013 by
Copyright 2003-2007, 2013, 2014 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,

View File

@ -52,6 +52,7 @@ on _most_ systems, but not all of them:
release libtool so
-------------------------------
2.5.3 17.2.11 6.11.2
2.5.2 17.1.11 6.11.1
2.5.1 17.0.11 6.11.0
2.5.0 16.2.10 6.10.2
@ -112,7 +113,7 @@ other release numbers.
------------------------------------------------------------------------
Copyright 2002-2013 by
Copyright 2002-2014 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,

View File

@ -0,0 +1,108 @@
.TH FREETYPE-CONFIG 1 "March 2014" "FreeType 2.5.3"
.
.
.SH NAME
.
freetype-config \- Get information about a libfreetype installation
.
.
.SH SYNOPSIS
.
.B freetype-config
.RI [ options ]
.
.
.SH DESCRIPTION
.
.B freetype-config
returns information needed for compiling and linking programs with the
FreeType library, such as linker flags and compilation parameters.
.
Alternatively, it can be used to query information about the
FreeType library version installed on the system, such as the
installation (directory path) prefix or the FreeType version number.
.
.PP
This program is part of the FreeType package.
.
.
.SH OPTIONS
.
There are two types of options: output/display selection options, and
path override options.
.
.
.SS Output selection options
.
Only one of the output selection options should be given at each program
invocation.
.
.TP
.B \-\-prefix
Return the prefix value of the installed FreeType library (the default
prefix will be `/usr' in most cases for distribution-installed
packages).
.
.TP
.B \-\-exec-prefix
Return the executable prefix value of the installed FreeType library
(will often be the same as the prefix value).
.
.TP
.B \-\-ftversion
Return the FreeType version number.
.
.TP
.B \-\-version
Return the `libtool version' of the FreeType library.
.
.TP
.B \-\-libtool
Return the library name for linking with libtool.
.
.TP
.B \-\-libs
Return compiler flags for linking with the installed FreeType library.
.
.TP
.B \-\-cflags
Return compiler flags for compiling against the installed FreeType library.
.
.TP
.B \-\-static
Make command line options display flags for static linking.
.
.
.SS Path override options
.
These affect any selected output option, except the libtool version
returned by `--version'.
.
.TP
.BI \-\-prefix= PREFIX
Override `--prefix' value with
.IR PREFIX .
.
.TP
.BI \-\-exec-prefix= EPREFIX
Override `--exec-prefix' value with
.IR EPREFIX .
.
.
.SH BUGS
In case the libraries FreeType links to are located in non-standard
directories, the output from option
.B \-\-libs
might be incomplete.
It is thus recommended to use the
.BR pkg-config (1)
interface instead, which is able to correctly resolve all dependencies.
.
.
.SH AUTHOR
.
This manual page was contributed by Nis Martensen <nis.martensen@web.de>,
with further refinements from the FreeType team.
.
.
.\" eof

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,16 +35,17 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
The auto-hinter
</h1></center>
<h2>Synopsis</h2>
<table align=center cellspacing=5 cellpadding=0 border=0>
<tr><td></td><td><a href="#glyph-to-script-map">glyph-to-script-map</a></td><td></td><td><a href="#fallback-script">fallback-script</a></td></tr>
<tr><td></td><td><a href="#glyph-to-script-map">glyph-to-script-map</a></td><td></td><td><a href="#default-script">default-script</a></td></tr>
<tr><td></td><td><a href="#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_XXX</a></td><td></td><td><a href="#increase-x-height">increase-x-height</a></td></tr>
<tr><td></td><td><a href="#FT_Prop_GlyphToScriptMap">FT_Prop_GlyphToScriptMap</a></td><td></td><td><a href="#FT_Prop_IncreaseXHeight">FT_Prop_IncreaseXHeight</a></td></tr>
<tr><td></td><td><a href="#fallback-script">fallback-script</a></td><td></td><td></td></tr>
</table><br><br>
<table align=center width="87%"><tr><td>
@ -250,7 +251,34 @@ Defined in FT_AUTOHINTER_H (ftautoh.h).
</td></tr></table><br>
<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
<p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
<p>It's important to use the right timing for changing this value: The creation of the glyph-to-script map that eventually uses the fallback script value gets triggered either by setting or reading a face-specific property like <a href="ft2-auto_hinter.html#glyph-to-script-map">glyph-to-script-map</a>, or by auto-hinting any glyph from that face. In particular, if you have already created an <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure but not loaded any glyph (using the auto-hinter), a change of the fallback glyph will affect this face.</p>
<p>It's important to use the right timing for changing this value: The creation of the glyph-to-script map that eventually uses the fallback script value gets triggered either by setting or reading a face-specific property like <a href="ft2-auto_hinter.html#glyph-to-script-map">glyph-to-script-map</a>, or by auto-hinting any glyph from that face. In particular, if you have already created an <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure but not loaded any glyph (using the auto-hinter), a change of the fallback script will affect this face.</p>
</td></tr></table>
</td></tr></table>
<hr width="75%">
<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<table align=center width="75%"><tr><td>
<h4><a name="default-script">default-script</a></h4>
<table align=center width="87%"><tr><td>
<p><b>Experimental</b> <b>only</b></p>
<p>If Freetype gets compiled with FT_CONFIG_OPTION_USE_HARFBUZZ to make the HarfBuzz library access OpenType features for getting better glyph coverages, this property sets the (auto-fitter) script to be used for the default (OpenType) script data of a font's GSUB table. Features for the default script are intended for all scripts not explicitly handled in GSUB; an example is a &lsquo;dlig&rsquo; feature, containing the combination of the characters &lsquo;T&rsquo;, &lsquo;E&rsquo;, and &lsquo;L&rsquo; to form a &lsquo;TEL&rsquo; ligature.</p>
<p>By default, this is <a href="ft2-auto_hinter.html#FT_AUTOHINTER_SCRIPT_XXX">FT_AUTOHINTER_SCRIPT_LATIN</a>. Using the &lsquo;default-script&rsquo; property, this default value can be changed.</p>
<pre class="colored">
FT_Library library;
FT_UInt default_script = FT_AUTOHINTER_SCRIPT_NONE;
FT_Init_FreeType( &amp;library );
FT_Property_Set( library, "autofitter",
"default-script", &amp;default_script );
</pre>
</td></tr></table><br>
<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
<p>This property can be used with <a href="ft2-module_management.html#FT_Property_Get">FT_Property_Get</a> also.</p>
<p>It's important to use the right timing for changing this value: The creation of the glyph-to-script map that eventually uses the default script value gets triggered either by setting or reading a face-specific property like <a href="ft2-auto_hinter.html#glyph-to-script-map">glyph-to-script-map</a>, or by auto-hinting any glyph from that face. In particular, if you have already created an <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure but not loaded any glyph (using the auto-hinter), a change of the default script will affect this face.</p>
</td></tr></table>
</td></tr></table>
<hr width="75%">

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
Base Interface
@ -2279,6 +2279,7 @@ Defined in FT_FREETYPE_H (freetype.h).
<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
<p>Although drivers may select the bitmap strike matching the request, you should not rely on this if you intend to select a particular bitmap strike. Use <a href="ft2-base_interface.html#FT_Select_Size">FT_Select_Size</a> instead in that case.</p>
<p>The relation between the requested size and the resulting glyph size is dependent entirely on how the size is defined in the source face. The font designer chooses the final size of each glyph relative to this size. For more information refer to &lsquo;<a href="http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html">http://www.freetype.org/freetype2/docs/glyphs/glyphs-2.html</a>&rsquo;</p>
<p>Don't use this function if you are using the FreeType cache API.</p>
</td></tr></table>
</td></tr></table>
<hr width="75%">
@ -2384,6 +2385,7 @@ Defined in FT_FREETYPE_H (freetype.h).
</td></tr></table>
<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
<p>You should not rely on the resulting glyphs matching, or being constrained, to this pixel size. Refer to <a href="ft2-base_interface.html#FT_Request_Size">FT_Request_Size</a> to understand how requested sizes relate to actual sizes.</p>
<p>Don't use this function if you are using the FreeType cache API.</p>
</td></tr></table>
</td></tr></table>
<hr width="75%">
@ -2839,6 +2841,9 @@ Defined in FT_FREETYPE_H (freetype.h).
<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>return</b></em></td></tr><tr><td>
<p>FreeType error code. 0&nbsp;means success.</p>
</td></tr></table>
<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
<p>To get meaningful results, font scaling values must be set with functions like <a href="ft2-base_interface.html#FT_Set_Char_Size">FT_Set_Char_Size</a> before calling FT_Render_Glyph.</p>
</td></tr></table>
</td></tr></table>
<hr width="75%">
<table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
Basic Data Types

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
BDF and PCF Files
@ -143,7 +143,7 @@ Defined in FT_BDF_H (ftbdf.h).
<p>The property type.</p>
</td></tr>
<tr valign=top><td><b>u.atom</b></td><td>
<p>The atom string, if type is <a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_ATOM</a>.</p>
<p>The atom string, if type is <a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_ATOM</a>. May be NULL, indicating an empty string.</p>
</td></tr>
<tr valign=top><td><b>u.integer</b></td><td>
<p>A signed integer, if type is <a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_INTEGER</a>.</p>

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
Bitmap Handling

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
BZIP2 Streams

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
Cache Sub-System

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
The CFF driver

View File

@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>FreeType-2.5.2 API Reference</title>
<title>FreeType-2.5.3 API Reference</title>
<style type="text/css">
body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
color: #000000;
@ -35,7 +35,7 @@
<table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
<td width="100%"></td>
<td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
<center><h1>FreeType-2.5.2 API Reference</h1></center>
<center><h1>FreeType-2.5.3 API Reference</h1></center>
<center><h1>
CID Fonts

Some files were not shown because too many files have changed in this diff Show More