Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
graphicsframework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
einsteinathome
graphicsframework
Commits
37cc6a78
Commit
37cc6a78
authored
5 years ago
by
Oliver Behnke
Browse files
Options
Downloads
Patches
Plain Diff
Fix up Freetype's configure (and remove cruft)
parent
4f739346
No related branches found
No related tags found
1 merge request
!2
Migrate from MinGW to mingw-w64
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
build.sh
+2
-8
2 additions, 8 deletions
build.sh
with
2 additions
and
8 deletions
build.sh
+
2
−
8
View file @
37cc6a78
...
@@ -521,21 +521,15 @@ build_freetype_mingw()
...
@@ -521,21 +521,15 @@ build_freetype_mingw()
echo
"Patching Freetype2..."
|
tee
-a
$LOGFILE
echo
"Patching Freetype2..."
|
tee
-a
$LOGFILE
cd
$ROOT
/3rdparty/freetype2/builds
||
failure
cd
$ROOT
/3rdparty/freetype2/builds
||
failure
# patch: deactivating invocation of apinames (would run win
32
binary on linux host)
# patch: deactivating invocation of apinames (would run win
dows
binary on linux host)
patch <
$ROOT
/patches/freetype2.exports.mk.patch
>>
$LOGFILE
2>&1
||
failure
patch <
$ROOT
/patches/freetype2.exports.mk.patch
>>
$LOGFILE
2>&1
||
failure
echo
"Building Freetype2 (this may take a while)..."
|
tee
-a
$LOGFILE
echo
"Building Freetype2 (this may take a while)..."
|
tee
-a
$LOGFILE
cd
$ROOT
/3rdparty/freetype2
||
failure
cd
$ROOT
/3rdparty/freetype2
||
failure
chmod
+x autogen.sh
>>
$LOGFILE
2>&1
||
failure
chmod
+x autogen.sh
>>
$LOGFILE
2>&1
||
failure
./autogen.sh
>>
$LOGFILE
2>&1
||
failure
./autogen.sh
>>
$LOGFILE
2>&1
||
failure
chmod
+x configure
>>
$LOGFILE
2>&1
||
failure
chmod
+x configure
>>
$LOGFILE
2>&1
||
failure
if
[
-f
"
$PREFIX
/
$TARGET_HOST
/bin/
$TARGET_HOST
-freetype-config"
]
;
then
FT_CONFIG
=
"
$PREFIX
/
$TARGET_HOST
/bin/
$TARGET_HOST
-freetype-config"
export
FT_CONFIG
echo
"Cross-compile FT_CONFIG:
$FT_CONFIG
"
>>
$LOGFILE
fi
cd
$ROOT
/build/freetype2
||
failure
cd
$ROOT
/build/freetype2
||
failure
# note: freetype (or sdl?) probably doesn't need *no* configure when static -> ansi build, see readme!
$ROOT
/3rdparty/freetype2/configure
--host
=
$TARGET_HOST
--build
=
$BUILD_HOST
--prefix
=
$PREFIX
--enable-freetype-config
--enable-shared
=
no
--enable-static
=
yes
--without-png
--without-zlib
--without-bzip2
>>
$LOGFILE
2>&1
||
failure
$ROOT
/3rdparty/freetype2/configure
--host
=
$TARGET_HOST
--build
=
$BUILD_HOST
--prefix
=
$PREFIX
--enable-shared
=
no
--enable-static
=
yes
--without-png
--without-zlib
--without-bzip2
>>
$LOGFILE
2>&1
||
failure
make
>>
$LOGFILE
2>&1
||
failure
make
>>
$LOGFILE
2>&1
||
failure
make
install
>>
$LOGFILE
2>&1
||
failure
make
install
>>
$LOGFILE
2>&1
||
failure
echo
"Successfully built and installed Freetype2!"
|
tee
-a
$LOGFILE
echo
"Successfully built and installed Freetype2!"
|
tee
-a
$LOGFILE
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment