|
@@ -591,13 +591,12 @@ check_params() {
|
|
|
fi
|
|
|
|
|
|
detect_zlib
|
|
|
detect_png
|
|
|
detect_freetype
|
|
|
detect_fontconfig
|
|
|
detect_iconv
|
|
|
detect_pspconfig
|
|
|
detect_libtimidity
|
|
|
|
|
|
if [ "$with_direct_music" = "1" ] || [ "$with_direct_music" = "2" ]; then
|
|
|
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
|
|
|
if [ "$with_direct_music" = "2" ]; then
|
|
@@ -890,12 +889,16 @@ check_params() {
|
|
|
menu_dir="share/applications"
|
|
|
else
|
|
|
menu_dir=""
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
# "set_universal_binary_flags" needs to be before "detect_iconv"
|
|
|
set_universal_binary_flags
|
|
|
detect_iconv
|
|
|
|
|
|
if [ -n "$personal_dir" ]
|
|
|
then
|
|
|
log 1 "personal home directory... $personal_dir"
|
|
|
else
|
|
|
log 1 "personal home directory... none"
|
|
|
fi
|
|
@@ -1281,17 +1284,12 @@ make_cflags_and_ldflags() {
|
|
|
fi
|
|
|
|
|
|
if [ "$enable_osx_g5" != "0" ]; then
|
|
|
CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
|
|
|
fi
|
|
|
|
|
|
if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then
|
|
|
CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
|
|
|
LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk -mmacosx-version-min=10.4"
|
|
|
fi
|
|
|
|
|
|
if [ -n "$personal_dir" ]; then
|
|
|
CFLAGS="$CFLAGS -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\\\\\"$personal_dir\\\\\""
|
|
|
fi
|
|
|
|
|
|
if [ -n "$shared_dir" ]; then
|
|
|
CFLAGS="$CFLAGS -DWITH_SHARED_DIR -DSHARED_DIR=\\\\\"$shared_dir\\\\\""
|
|
@@ -1502,12 +1500,30 @@ check_lipo() {
|
|
|
$cc_host lipo.test.c -o lipo.test
|
|
|
check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test"
|
|
|
rm -f lipo.test.c lipo.test
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
set_universal_binary_flags() {
|
|
|
if [ -n "osx_target_version" ]; then
|
|
|
# if we don't speficy a target version then we presume 10.4
|
|
|
osx_target_version=10.4
|
|
|
fi
|
|
|
|
|
|
if [ "$osx_target_version" = "10.4" ]; then
|
|
|
osx_sysroot_version=10.4u
|
|
|
else
|
|
|
osx_sysroot_version="$osx_target_version"
|
|
|
fi
|
|
|
|
|
|
if [ "$with_osx_sysroot" = "3" ]; then
|
|
|
CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=$osx_target_version"
|
|
|
LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=$osx_target_version"
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
check_direct_music() {
|
|
|
echo "
|
|
|
#include <windows.h>
|
|
|
#include <dmksctrl.h>
|
|
|
#include <dmusici.h>
|
|
|
#include <dmusicc.h>
|
|
@@ -2226,31 +2242,23 @@ detect_cputype() {
|
|
|
if [ "$ret" = "0" ]; then cpu_type="64"; else cpu_type="32"; fi
|
|
|
log 1 "detecting cpu-type... $cpu_type bits"
|
|
|
rm -f tmp.64bit tmp.64bit.cpp
|
|
|
}
|
|
|
|
|
|
make_sed() {
|
|
|
T_CFLAGS="$CFLAGS"
|
|
|
|
|
|
# We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL
|
|
|
# We do this here, and not sooner, so universal builds also have this
|
|
|
# automatically correct
|
|
|
# FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where
|
|
|
# we use 1 byte per bool normally in C part. So convert that last one to 4
|
|
|
# bytes too, but only for PPC.
|
|
|
ppc=`$cc_host -dumpmachine | egrep "powerpc|ppc"`
|
|
|
if [ -n "$ppc" ]; then
|
|
|
T_CFLAGS="$CFLAGS -DFOUR_BYTE_BOOL"
|
|
|
osx_sysroot_version=10.4u
|
|
|
else
|
|
|
T_CFLAGS="$CFLAGS"
|
|
|
osx_sysroot_version=10.4u
|
|
|
fi
|
|
|
|
|
|
T_LDFLAGS="$LDFLAGS"
|
|
|
if [ "$with_osx_sysroot" = "3" ]; then
|
|
|
T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
|
|
|
T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=10.4"
|
|
|
T_CFLAGS="$T_CFLAGS -DFOUR_BYTE_BOOL"
|
|
|
fi
|
|
|
|
|
|
SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
|
|
|
|
|
|
# All the data needed to compile a single target
|
|
|
# Make sure if you compile multiple targets to
|