smb: enable for apple builds

Author: cscd98

.github/workflows/MacOS.yml

@@ -20,7 +20,11 @@ jobs:
     - name: Compile RA
       run: |
         set -o pipefail
-        xcodebuild -workspace pkg/apple/RetroArch.xcworkspace -scheme RetroArch -config Release -xcconfig pkg/apple/GitHubCI.xcconfig -derivedDataPath build | xcpretty --color
+        xcodebuild -workspace pkg/apple/RetroArch.xcworkspace \
+                  -scheme RetroArch \
+                  -configuration Release \
+                  -xcconfig pkg/apple/GitHubCI.xcconfig \
+                  -derivedDataPath build
 
     - name: Get short SHA
       id: slug

deps/libsmb2/lib/alloc.c

@@ -66,6 +66,10 @@
 #include <libsmb2.h>
 #include "libsmb2-private.h"
 
+#ifndef typeof
+#define typeof __typeof__
+#endif
+
 #define container_of(ptr, type, member) ({                      \
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)(void *)( (char *)__mptr - offsetof(type,member) );})

deps/libsmb2/lib/dcerpc.c

@@ -67,6 +67,10 @@
 #include "libsmb2-raw.h"
 #include "libsmb2-private.h"
 
+#ifndef typeof
+#define typeof __typeof__
+#endif
+
 #define container_of(ptr, type, member) ({                      \
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)(void *)( (char *)__mptr - offsetof(type,member) );})

pkg/apple/BaseConfig.xcconfig

@@ -5,6 +5,7 @@
 //
 
 OTHER_CFLAGS = $(inherited) -DFLAC__HAS_OGG=0
+OTHER_CFLAGS = $(inherited) -Wno-comma
 OTHER_CFLAGS = $(inherited) -DGLSLANG_OSINCLUDE_UNIX
 OTHER_CFLAGS = $(inherited) -DHAVE_7ZIP
 OTHER_CFLAGS = $(inherited) -DHAVE_ACCESSIBILITY
@@ -98,6 +99,24 @@ OTHER_CFLAGS = $(inherited) -DWANT_SUBCODE=1
 OTHER_CFLAGS = $(inherited) -D_7ZIP_ST
 OTHER_CFLAGS = $(inherited) -D__LIBRETRO__
 
+OTHER_CFLAGS = $(inherited) "-D_U_=__attribute__((unused))"
+OTHER_CFLAGS = $(inherited) -DHAVE_TIME_H
+OTHER_CFLAGS = $(inherited) -DHAVE_FCNTL_H
+OTHER_CFLAGS = $(inherited) -DHAVE_UNISTD_H
+OTHER_CFLAGS = $(inherited) -DHAVE_STDLIB_H
+OTHER_CFLAGS = $(inherited) -DSTDC_HEADERS
+OTHER_CFLAGS = $(inherited) -DHAVE_STRING_H
+OTHER_CFLAGS = $(inherited) -DHAVE_LINGER
+OTHER_CFLAGS = $(inherited) -DHAVE_SYS_UIO_H
+OTHER_CFLAGS = $(inherited) -DHAVE_POLL_H
+OTHER_CFLAGS = $(inherited) -DHAVE_NETDB_H
+OTHER_CFLAGS = $(inherited) -DHAVE_NETINET_TCP_H
+OTHER_CFLAGS = $(inherited) -DHAVE_NETINET_IN_H
+OTHER_CFLAGS = $(inherited) -DHAVE_SYS_SOCKET_H
+OTHER_CFLAGS = $(inherited) -DHAVE_ARPA_INET_H
+OTHER_CFLAGS = $(inherited) -DHAVE_BUILTINSMBCLIENT
+OTHER_CFLAGS = $(inherited) -DHAVE_SMBCLIENT
+
 OTHER_CFLAGS[arch=x86_64] = $(inherited) -DHAVE_SSE
 OTHER_CFLAGS[arch=arm64*] = $(inherited) -D__ARM_NEON__ -DHAVE_NEON
 
@@ -164,6 +183,8 @@ HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/glslang/glslang/glslang/MachineIn
 HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix
 HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/glslang/glslang/glslang/Public
 HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/libFLAC/include
+HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/libsmb2/include
+HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/libsmb2/include/smb2
 HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/rcheevos/include
 HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/stb
 HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/zstd/lib

pkg/apple/RetroArch.xcodeproj/project.pbxproj

@@ -414,6 +414,8 @@
 					"$(SRCROOT)/../../libretro-common/include/compat/zlib",
 					"$(SRCROOT)/../../deps/discord-rpc/include",
 					"$(SRCROOT)/../../deps/libFLAC/include",
+					"$(SRCROOT)/../../deps/libsmb2/include",
+					"$(SRCROOT)/../../deps/libsmb2/include/smb2",
 					"$(SRCROOT)/../../deps/rcheevos/include",
 					"$(SRCROOT)/../../deps/7zip",
 					"$(SRCROOT)/../../deps/stb",
@@ -457,6 +459,8 @@
 					"$(SRCROOT)/../../libretro-common/include/compat/zlib",
 					"$(SRCROOT)/../../deps/discord-rpc/include",
 					"$(SRCROOT)/../../deps/libFLAC/include",
+					"$(SRCROOT)/../../deps/libsmb2/include",
+					"$(SRCROOT)/../../deps/libsmb2/include/smb2",
 					"$(SRCROOT)/../../deps/rcheevos/include",
 					"$(SRCROOT)/../../deps/7zip",
 					"$(SRCROOT)/../../deps/stb",
@@ -503,6 +507,8 @@
 					"$(SRCROOT)/../../libretro-common/include/compat/zlib",
 					"$(SRCROOT)/../../deps/discord-rpc/include",
 					"$(SRCROOT)/../../deps/libFLAC/include",
+					"$(SRCROOT)/../../deps/libsmb2/include",
+					"$(SRCROOT)/../../deps/libsmb2/include/smb2",
 					"$(SRCROOT)/../../deps/rcheevos/include",
 					"$(SRCROOT)/../../deps/7zip",
 					"$(SRCROOT)/../../deps/stb",
@@ -543,6 +549,8 @@
 					"$(SRCROOT)/../../libretro-common/include/compat/zlib",
 					"$(SRCROOT)/../../deps/discord-rpc/include",
 					"$(SRCROOT)/../../deps/libFLAC/include",
+					"$(SRCROOT)/../../deps/libsmb2/include",
+					"$(SRCROOT)/../../deps/libsmb2/include/smb2",
 					"$(SRCROOT)/../../deps/rcheevos/include",
 					"$(SRCROOT)/../../deps/7zip",
 					"$(SRCROOT)/../../deps/stb",
@@ -575,6 +583,23 @@
 					"-DHAVE_ACCESSIBILITY",
 					"-DHAVE_SSL",
 					"-DHAVE_BUILTINMBEDTLS",
+					"-D_U_=__attribute__((unused))"
+					"-DHAVE_TIME_H",
+					"-DHAVE_FCNTL_H",
+					"-DHAVE_UNISTD_H",
+					"-DHAVE_STDLIB_H",
+					"-DSTDC_HEADERS"
+					"-DHAVE_STRING_H",
+					"-DHAVE_LINGER",
+					"-DHAVE_SYS_UIO_H",
+					"-DHAVE_POLL_H",
+					"-DHAVE_NETDB_H",
+					"-DHAVE_NETINET_TCP_H",
+					"-DHAVE_NETINET_IN_H",
+					"-DHAVE_SYS_SOCKET_H",
+					"-DHAVE_ARPA_INET_H",
+					"-DHAVE_BUILTINSMBCLIENT",
+					"-DHAVE_HAVE_SMBCLIENT",
 					"-DHAVE_COMMAND",
 					"-DHAVE_NETWORK_CMD",
 					"-DHAVE_GRIFFIN",
@@ -662,6 +687,23 @@
 					"-DHAVE_ACCESSIBILITY",
 					"-DHAVE_SSL",
 					"-DHAVE_BUILTINMBEDTLS",
+					"-D_U_=__attribute__((unused))"
+					"-DHAVE_TIME_H",
+					"-DHAVE_FCNTL_H",
+					"-DHAVE_UNISTD_H",
+					"-DHAVE_STDLIB_H",
+					"-DSTDC_HEADERS"
+					"-DHAVE_STRING_H",
+					"-DHAVE_LINGER",
+					"-DHAVE_SYS_UIO_H",
+					"-DHAVE_POLL_H",
+					"-DHAVE_NETDB_H",
+					"-DHAVE_NETINET_TCP_H",
+					"-DHAVE_NETINET_IN_H",
+					"-DHAVE_SYS_SOCKET_H",
+					"-DHAVE_ARPA_INET_H",
+					"-DHAVE_BUILTINSMBCLIENT",
+					"-DHAVE_HAVE_SMBCLIENT",
 					"-DHAVE_COMMAND",
 					"-DHAVE_NETWORK_CMD",
 					"-DHAVE_GRIFFIN",