aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp6
-rw-r--r--tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h2
-rw-r--r--tools/codegenerator/Helper.groovy4
-rw-r--r--tools/darwin/Configurations/App-iOS.xcconfig2
-rwxr-xr-xtools/darwin/Support/Codesign.command5
-rw-r--r--tools/depends/configure.ac3
-rw-r--r--tools/depends/target/config-binaddons.site.in6
-rw-r--r--tools/depends/target/config.site.in6
-rw-r--r--tools/depends/target/curl/Makefile3
-rw-r--r--tools/depends/target/ffmpeg/Makefile3
-rw-r--r--tools/depends/target/gnutls/Makefile2
-rw-r--r--tools/depends/target/samba-gplv3/Makefile2
12 files changed, 34 insertions, 10 deletions
diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp
index 3d232d26f8..a4efd8af65 100644
--- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp
+++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp
@@ -163,7 +163,7 @@ void CWiiRemote::SetBluetoothAddress(const char *btaddr)
bacpy(&m_btaddr, &b);
}
-void CWiiRemote::SetSensativity(float DeadX, float DeadY, int NumSamples)
+void CWiiRemote::SetSensitivity(float DeadX, float DeadY, int NumSamples)
{
m_NumSamples = NumSamples;
@@ -742,8 +742,8 @@ int main(int argc, char **argv)
g_Ping = new CPacketHELO("WiiRemote", ICON_PNG, g_BluetoothIconPath.c_str());
g_WiiRemote.Initialize(my_addr, sockfd);
g_WiiRemote.SetBluetoothAddress(btaddr);
- g_WiiRemote.SetSensativity(DeadX, DeadY, NumSamples);
- g_WiiRemote.SetSensativity(DeadX, DeadY, NumSamples);
+ g_WiiRemote.SetSensitivity(DeadX, DeadY, NumSamples);
+ g_WiiRemote.SetSensitivity(DeadX, DeadY, NumSamples);
g_WiiRemote.SetJoystickMap(JoyMap);
if (g_AllowMouse)
g_WiiRemote.EnableMouseEmulation();
diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h
index 3a60479ca1..5dd7333fd3 100644
--- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h
+++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h
@@ -90,7 +90,7 @@ public:
bool Connect();
void SetBluetoothAddress(const char * btaddr);
- void SetSensativity(float DeadX, float DeadY, int Samples);
+ void SetSensitivity(float DeadX, float DeadY, int Samples);
void SetJoystickMap(const char *JoyMap);
private:
int m_NumSamples;
diff --git a/tools/codegenerator/Helper.groovy b/tools/codegenerator/Helper.groovy
index cf195a2dfe..2b474aeb16 100644
--- a/tools/codegenerator/Helper.groovy
+++ b/tools/codegenerator/Helper.groovy
@@ -43,7 +43,7 @@ public class Helper
public static String newline = System.getProperty("line.separator");
public static File curTemplateFile = null;
- public static void setTempateFile(File templateFile) { curTemplateFile = templateFile }
+ public static void setTemplateFile(File templateFile) { curTemplateFile = templateFile }
/**
* In order to use any of the typemap helper features, the Helper class needs to be initialized with
@@ -57,7 +57,7 @@ public class Helper
public static void setup(def template,List pclasses, Map poutTypemap, def defaultOutTypemap,
Map pinTypemap, def defaultInTypemap)
{
- setTempateFile(template.binding.templateFile)
+ setTemplateFile(template.binding.templateFile)
classes = pclasses ? pclasses : []
if (poutTypemap) outTypemap.putAll(poutTypemap)
if (defaultOutTypemap) defaultOutTypeConversion = defaultOutTypemap
diff --git a/tools/darwin/Configurations/App-iOS.xcconfig b/tools/darwin/Configurations/App-iOS.xcconfig
index b7145c3c04..b70faba9a7 100644
--- a/tools/darwin/Configurations/App-iOS.xcconfig
+++ b/tools/darwin/Configurations/App-iOS.xcconfig
@@ -23,7 +23,7 @@
PRODUCT_NAME = $(APP_NAME)
//build against latest
SDKROOT = iphoneos
-IPHONEOS_DEPLOYMENT_TARGET = 5.1
+IPHONEOS_DEPLOYMENT_TARGET = 6.0
ARCHS = armv7
VALID_ARCHS = armv7
diff --git a/tools/darwin/Support/Codesign.command b/tools/darwin/Support/Codesign.command
index ff09f12309..528f74a0be 100755
--- a/tools/darwin/Support/Codesign.command
+++ b/tools/darwin/Support/Codesign.command
@@ -28,8 +28,13 @@ if [ "${PLATFORM_NAME}" == "iphoneos" ] || [ "${PLATFORM_NAME}" == "appletvos" ]
# pull the CFBundleIdentifier out of the built xxx.app
BUNDLEID=`mdls -raw -name kMDItemCFBundleIdentifier ${CODESIGNING_FOLDER_PATH}`
+ if [ "${BUNDLEID}" == "(null)" ] ; then
+ BUNDLEID=`/usr/libexec/PlistBuddy -c 'Print CFBundleIdentifier' ${CODESIGNING_FOLDER_PATH}/Info.plist`
+ fi
+
echo "CFBundleIdentifier is ${BUNDLEID}"
+
# Prefer the expanded name, if available.
CODE_SIGN_IDENTITY_FOR_ITEMS="${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
if [ "${CODE_SIGN_IDENTITY_FOR_ITEMS}" = "" ] ; then
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index ac2ac3cf68..a947ec8e10 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -341,7 +341,7 @@ case $host in
found_sdk_version=[`$use_xcodebuild -showsdks | grep $target_platform | sort | tail -n 1 | awk '{ print $2}'`]
use_sdk="${use_sdk:-$found_sdk_version}"
sdk_name=$target_platform$use_sdk
- platform_min_version="$target_platform-version-min=5.1"
+ platform_min_version="$target_platform-version-min=6.0"
fi
case $use_sdk in
4.*);;
@@ -350,6 +350,7 @@ case $host in
7.*);;
8.*);;
9.*);;
+ 10.*);;
*)
AC_MSG_ERROR(error in configure of --with-sdk=$use_sdk)
;;
diff --git a/tools/depends/target/config-binaddons.site.in b/tools/depends/target/config-binaddons.site.in
index d71c378810..47b3fcecc4 100644
--- a/tools/depends/target/config-binaddons.site.in
+++ b/tools/depends/target/config-binaddons.site.in
@@ -128,6 +128,12 @@ fi
if test "@platform_os@" = "ios"; then
+ # Xcode 8 + 10.11, clock_gettime getentropy is present
+ # in 10.12 but will get wrongly detected if building on 10.11
+ ac_cv_search_clock_gettime=no
+ ac_cv_func_clock_gettime=no
+ ac_cv_func_getentropy=no
+
# tweaks for libffi (ios must use llvm-gcc-4.2)
if test "${PACKAGE_NAME}" = "libffi" ; then
case "@use_xcode@" in
diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in
index 8c7e68d47b..76a32a9b4b 100644
--- a/tools/depends/target/config.site.in
+++ b/tools/depends/target/config.site.in
@@ -150,6 +150,12 @@ fi
if test "@platform_os@" = "ios"; then
+ # Xcode 8 + 10.11, clock_gettime and getentropy is present
+ # in 10.12 but will get wrongly detected if building on 10.11
+ ac_cv_search_clock_gettime=no
+ ac_cv_func_clock_gettime=no
+ ac_cv_func_getentropy=no
+
# tweaks for libffi (ios must use llvm-gcc-4.2)
if test "${PACKAGE_NAME}" = "libffi" ; then
case "@use_xcode@" in
diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile
index 11d85b9ef6..1d1dff194f 100644
--- a/tools/depends/target/curl/Makefile
+++ b/tools/depends/target/curl/Makefile
@@ -30,6 +30,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
ifeq (osx, $(findstring osx, $(OS)))
cd $(PLATFORM); patch -p1 < ../0001-HTTP-reset-expected-DL-UL-sizes-on-redirects.patch
endif
+ifeq (darwin, $(findstring darwin, $(HOST)))
+ cd $(PLATFORM); sed -ie "s/elif defined(HAVE_CLOCK_GETTIME_MONOTONIC)/#elif defined(HAVE_CLOCK_GETTIME_MONOTONIC_NOPE)/" lib/timeval.c
+endif
cd $(PLATFORM); $(CONFIGURE)
$(LIBDYLIB): $(PLATFORM)
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
index eaf9fc4931..6368b778b5 100644
--- a/tools/depends/target/ffmpeg/Makefile
+++ b/tools/depends/target/ffmpeg/Makefile
@@ -79,6 +79,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
cd $(PLATFORM);\
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure $(ffmpg_config)
+ifeq ($(OS), ios)
+ cd $(PLATFORM); sed -i -- 's/HAVE_CLOCK_GETTIME 1/HAVE_CLOCK_GETTIME 0/g' config.h
+endif
build: $(PLATFORM)
$(MAKE) -C $(PLATFORM)
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile
index 1a7c2431c8..69efb3a5a1 100644
--- a/tools/depends/target/gnutls/Makefile
+++ b/tools/depends/target/gnutls/Makefile
@@ -33,7 +33,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); patch -p0 < ../size-max.patch
cd $(PLATFORM); $(CONFIGURE)
-ifeq ($(OS),osx)
+ifeq (darwin, $(findstring darwin, $(HOST)))
cd $(PLATFORM); sed -ie "s/HAVE_GETENTROPY/HAVE_GETENTROPY_NOPE/" config.h
endif
diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile
index f5d84bac76..e15987d9c4 100644
--- a/tools/depends/target/samba-gplv3/Makefile
+++ b/tools/depends/target/samba-gplv3/Makefile
@@ -55,7 +55,7 @@ endif
ifeq ($(TARGET_PLATFORM),appletvos)
cd $(PLATFORM); patch -p0 < ../no_fork_and_exec.patch
endif
-ifeq ($(OS),osx)
+ifeq (darwin, $(findstring darwin, $(HOST)))
sed -ie "s|ifndef HAVE_CLOCK_GETTIME|if !defined(HAVE_CLOCK_GETTIME) \&\& !defined(CLOCK_REALTIME)|" "$(PLATFORM)/lib/replace/system/time.h"
endif
cd $(PLATFORM)/source3; $(CONFIGURE)
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-23 14:01:21 +0000