Some MacOS improvements from Nic.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1550 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -19,9 +19,7 @@ uqm_requirements()
|
|||||||
;;
|
;;
|
||||||
Darwin)
|
Darwin)
|
||||||
have_program Rez || exit 1
|
have_program Rez || exit 1
|
||||||
have_program SetFile || exit 1
|
|
||||||
REZ="$PROG_Rez_FILE"
|
REZ="$PROG_Rez_FILE"
|
||||||
SETFILE="$PROG_SetFile_FILE"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@@ -228,7 +226,7 @@ uqm_process_config() {
|
|||||||
SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE ECHON DEBUG SOUNDMODULE HAVE_OPENGL \
|
SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE ECHON DEBUG SOUNDMODULE HAVE_OPENGL \
|
||||||
USE_ZIP_IO \
|
USE_ZIP_IO \
|
||||||
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
|
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
|
||||||
REZ SETFILE WINDRES"
|
REZ WINDRES"
|
||||||
SUBSTITUTE_FILES="build.vars"
|
SUBSTITUTE_FILES="build.vars"
|
||||||
substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES . "$BUILD_WORK"
|
substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES . "$BUILD_WORK"
|
||||||
|
|
||||||
@@ -260,10 +258,15 @@ uqm_post_build() {
|
|||||||
|
|
||||||
test -f "$TARGET_FILE" || return
|
test -f "$TARGET_FILE" || return
|
||||||
|
|
||||||
|
# If run from the command-line on OSX, the Window Manager
|
||||||
|
# will refuse to recognize the window unless the program has
|
||||||
|
# a resource fork; so we give it a small one here. When
|
||||||
|
# run from inside an application package, this step is useless
|
||||||
|
# (the cp command in the install step implicitly strips off
|
||||||
|
# the resource fork, in fact)
|
||||||
case "$OSNAME" in
|
case "$OSNAME" in
|
||||||
Darwin)
|
Darwin)
|
||||||
${REZ} ${RFORK} -o ${TARGET_FILE}
|
${REZ} ${RFORK} -o ${TARGET_FILE}
|
||||||
${SETFILE} -a C ${TARGET_FILE}
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,13 +106,6 @@ PROG_Rez_ACTION=""
|
|||||||
PROG_Rez_VERSION=''
|
PROG_Rez_VERSION=''
|
||||||
|
|
||||||
|
|
||||||
### SetFile (for MacOS X) only ###
|
|
||||||
PROG_SetFile_NAME="SetFile (Apple Developer Tools)"
|
|
||||||
PROG_SetFile_FILE="/Developer/Tools/SetFile"
|
|
||||||
PROG_SetFile_ACTION=""
|
|
||||||
PROG_SetFile_VERSION=''
|
|
||||||
|
|
||||||
|
|
||||||
### pkg-config ###
|
### pkg-config ###
|
||||||
PROG_pkgconfig_NAME="pkg-config"
|
PROG_pkgconfig_NAME="pkg-config"
|
||||||
PROG_pkgconfig_FILE="pkg-config"
|
PROG_pkgconfig_FILE="pkg-config"
|
||||||
@@ -229,6 +222,10 @@ case "$OSNAME" in
|
|||||||
LIB_vorbisfile_CFLAGS="-I/usr/local/include"
|
LIB_vorbisfile_CFLAGS="-I/usr/local/include"
|
||||||
LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis"
|
LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis"
|
||||||
;;
|
;;
|
||||||
|
Darwin)
|
||||||
|
LIB_vorbisfile_CFLAGS="-D__MACOSX__"
|
||||||
|
LIB_vorbisfile_LDFLAGS="-framework Ogg -framework Vorbis"
|
||||||
|
;;
|
||||||
QNX)
|
QNX)
|
||||||
LIB_vorbisfile_CFLAGS=""
|
LIB_vorbisfile_CFLAGS=""
|
||||||
LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm"
|
LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm"
|
||||||
|
|||||||
Reference in New Issue
Block a user