PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'joshbuhler-jb_macBuildFixes' into dev 

Mac build fixes - Pull request 140
This commit is contained in:
wb2osz 2018-08-05 21:20:12 -04:00
parent 220e7dd1c4 f864874771
commit be705987e2
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -105,3 +105,5 @@ $RECYCLE.BIN/
# Windows shortcuts # Windows shortcuts
*.lnk *.lnk
/use_this_sdk
*.dSYM

27
Makefile.macosx
View File

@ -36,27 +36,6 @@ all : $(APPS) direwolf.conf
SYS_LIBS := SYS_LIBS :=
SYS_MIN := SYS_MIN :=
#SDK := $(shell find /Developer -maxdepth 1 -type d -name "SDKs")
#$(info $$SDK = ${SDK})
#ifeq (${SDK},/Developer/SDKs)
# SDK := $(shell find /Developer/SDKs -maxdepth 1 -type d -name "MacOSX10.8.sdk")
# ifeq (${SDK},/Developer/SDKs/MacOSX10.8.sdk)
# SYS_LIBS := -isystem /Developer/SDKs/MacOSX10.8.sdk
# SYS_MIN := -mmacosx-version-min=10.8
# else
# SDK := $(shell find /Developer/SDKs -maxdepth 1 -type d -name "MacOSX10.9.sdk")
# ifeq (${SDK},/Developer/SDKs/MacOSX10.9.sdk)
# SYS_LIBS := -isystem /Developer/SDKs/MacOSX10.9.sdk
# SYS_MIN := -mmacosx-version-min=10.9
# else
# SDK := $(shell find /Developer/SDKs -maxdepth 1 -type d -name "MacOSX10.10.sdk")
# ifeq (${SDK},/Developer/SDKs/MacOSX10.10.sdk)
# SYS_LIBS := -isystem /Developer/SDKs/MacOSX10.10.sdk
# SYS_MIN := -mmacosx-version-min=10.10
# endif
# endif
# endif
#endif
SYS_LIBS := $(shell ./search_sdks.sh) SYS_LIBS := $(shell ./search_sdks.sh)
EXTRA_CFLAGS := EXTRA_CFLAGS :=
@ -70,8 +49,12 @@ endif
# Change as required in support of the available libraries # Change as required in support of the available libraries
#CC := $(DARWIN_CC) -m64 $(SYS_LIBS) $(SYS_MIN) UNAME_M := $(shell uname -m)
ifeq (${UNAME_M},x86_64)
CC := $(DARWIN_CC) -m64 $(SYS_LIBS) $(SYS_MIN)
else
CC := $(DARWIN_CC) -m32 $(SYS_LIBS) $(SYS_MIN) CC := $(DARWIN_CC) -m32 $(SYS_LIBS) $(SYS_MIN)
endif
# _XOPEN_SOURCE=600 and _DEFAULT_SOURCE=1 are needed for glibc >= 2.24. # _XOPEN_SOURCE=600 and _DEFAULT_SOURCE=1 are needed for glibc >= 2.24.
# Explanation here: https://github.com/wb2osz/direwolf/issues/62 # Explanation here: https://github.com/wb2osz/direwolf/issues/62

2
direwolf.h
View File

@ -253,7 +253,7 @@ typedef pthread_mutex_t dw_mutex_t;
// but always using send/recv makes more sense. // but always using send/recv makes more sense.
// Need option to prevent a SIGPIPE signal on Linux. (added for 1.5 beta 2) // Need option to prevent a SIGPIPE signal on Linux. (added for 1.5 beta 2)
#if __WIN32__ #if __WIN32__ || __APPLE__
#define SOCK_SEND(s,data,size) send(s,data,size,0) #define SOCK_SEND(s,data,size) send(s,data,size,0)
#else #else
#define SOCK_SEND(s,data,size) send(s,data,size, MSG_NOSIGNAL) #define SOCK_SEND(s,data,size) send(s,data,size, MSG_NOSIGNAL)

2
search_sdks.sh
View File

@ -43,7 +43,7 @@ if [ $valid_flag -eq "0" ]; then
prompt="Select SDK to use:" prompt="Select SDK to use:"
loc1=( $(find /Applications/XCode.app -type d -name "MacOSX10.*.sdk") ) loc1=( $(find /Applications/Xcode.app -type l -name "MacOSX10.*.sdk") )
loc2=( $(find /Developer/SDKs -maxdepth 1 -type d -name "MacOSX10.*.sdk") ) loc2=( $(find /Developer/SDKs -maxdepth 1 -type d -name "MacOSX10.*.sdk") )
options=("${loc1[@]}" "${loc2[@]}") options=("${loc1[@]}" "${loc2[@]}")