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
Oliver Behnke
graphicsframework
Commits
a881b6b0
Commit
a881b6b0
authored
16 years ago
by
Oliver Bock
Committed by
Oliver Bock
16 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Patch no longer required (included upstream)
parent
9faec1c2
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.sh
+0
-3
0 additions, 3 deletions
build.sh
patches/CMakeLists.txt.liboglft.patch
+0
-11
0 additions, 11 deletions
patches/CMakeLists.txt.liboglft.patch
with
0 additions
and
14 deletions
build.sh
+
0
−
3
View file @
a881b6b0
...
...
@@ -245,9 +245,6 @@ build_generic()
FREETYPE2_INCLUDE_DIR
=
"
$ROOT
/install/include"
FREETYPE2_LIBRARIES
=
"
$ROOT
/install/lib/libfreetype.a"
patch CMakeLists.txt <
$ROOT
/patches/CMakeLists.txt.oglft.patch
>>
$LOGFILE
2>&1
||
failure
# patch: build static lib instead of shared
cd
$ROOT
/3rdparty/oglft/liboglft
||
failure
patch CMakeLists.txt <
$ROOT
/patches/CMakeLists.txt.liboglft.patch
>>
$LOGFILE
2>&1
||
failure
echo
"Building OGLFT..."
|
tee
-a
$LOGFILE
cd
$ROOT
/build/oglft
||
failure
# TODO: do we wanna create universal binaries on mac? If so, add -DCMAKE_OSX_ARCHITECTURES=ppc;i386
...
...
This diff is collapsed.
Click to expand it.
patches/CMakeLists.txt.liboglft.patch
deleted
100644 → 0
+
0
−
11
View file @
9faec1c2
--- CMakeLists.txt
+++ CMakeLists.txt 2008-05-19 11:42:02.000000000 +0200
@@ -20,7 +20,7 @@
add_definitions( -DOGLFT_BUILD )
endif( WIN32 )
-add_library( oglft SHARED ${sources} )
+add_library( oglft STATIC ${sources} )
target_link_libraries(
oglft
${FREETYPE2_LIBRARIES}
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