Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
7d7b6025
Commit
7d7b6025
authored
Nov 26, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: error out early if MacOSX SDK doesn't exist
parent
98ad3f3c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
contrib/bootstrap
contrib/bootstrap
+15
-0
contrib/src/main.mak
contrib/src/main.mak
+0
-1
No files found.
contrib/bootstrap
View file @
7d7b6025
...
@@ -137,6 +137,20 @@ add_make_enabled()
...
@@ -137,6 +137,20 @@ add_make_enabled()
done
done
}
}
check_macosx_sdk
()
{
[
-z
"
${
OSX_VERSION
}
"
]
&&
echo
"OSX_VERSION not specified, assuming 10.5"
&&
OSX_VERSION
=
10.5
SDK
=
"/Developer/SDKs/MacOSX
${
OSX_VERSION
}
.sdk"
if
[
!
-d
"
${
SDK
}
"
]
then
echo
"
***
${
SDK
}
does not exist, please install required SDK, or use export OSX_VERSION=10.6 ***
"
exit
1
fi
add_make
"OSX_VERSION ?=
${
OSX_VERSION
}
"
}
test
-z
"
$PREFIX
"
||
add_make
"PREFIX :=
$PREFIX
"
test
-z
"
$PREFIX
"
||
add_make
"PREFIX :=
$PREFIX
"
test
-z
"
$BUILD_DISCS
"
||
add_make_enabled
"BUILD_DISCS"
test
-z
"
$BUILD_DISCS
"
||
add_make_enabled
"BUILD_DISCS"
test
-z
"
$BUILD_ENCODERS
"
||
add_make_enabled
"BUILD_ENCODERS"
test
-z
"
$BUILD_ENCODERS
"
||
add_make_enabled
"BUILD_ENCODERS"
...
@@ -147,6 +161,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
...
@@ -147,6 +161,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
OS
=
"
${
HOST
#*-
}
"
# strip architecture
OS
=
"
${
HOST
#*-
}
"
# strip architecture
case
"
${
OS
}
"
in
case
"
${
OS
}
"
in
apple-darwin
*
)
apple-darwin
*
)
check_macosx_sdk
add_make_enabled
"HAVE_MACOSX"
"HAVE_DARWIN_OS"
"HAVE_BSD"
add_make_enabled
"HAVE_MACOSX"
"HAVE_DARWIN_OS"
"HAVE_BSD"
;;
;;
*
darwin
*
)
*
darwin
*
)
...
...
contrib/src/main.mak
View file @
7d7b6025
...
@@ -90,7 +90,6 @@ endif
...
@@ -90,7 +90,6 @@ endif
endif
endif
ifdef
HAVE_MACOSX
ifdef
HAVE_MACOSX
OSX_VERSION
?=
10.5
MACOSX_SDK
=
/Developer/SDKs/MacOSX
$(OSX_VERSION)
.sdk
MACOSX_SDK
=
/Developer/SDKs/MacOSX
$(OSX_VERSION)
.sdk
CC
=
gcc-4.2
CC
=
gcc-4.2
CXX
=
g++-4.2
CXX
=
g++-4.2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment