Skip to content

Commit a67f08d

Browse files
committed
smb: enable for (some) apple builds
1 parent 9d8a49d commit a67f08d

File tree

3 files changed

+66
-0
lines changed

3 files changed

+66
-0
lines changed

deps/libsmb2/lib/compat.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,10 @@ int getlogin_r(char *buf, size_t size);
827827
#define EINVAL 22
828828
#endif
829829

830+
#ifndef typeof
831+
#define typeof __typeof__
832+
#endif
833+
830834
#ifdef __cplusplus
831835
}
832836
#endif

pkg/apple/BaseConfig.xcconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,24 @@ OTHER_CFLAGS = $(inherited) -DWANT_SUBCODE=1
9898
OTHER_CFLAGS = $(inherited) -D_7ZIP_ST
9999
OTHER_CFLAGS = $(inherited) -D__LIBRETRO__
100100

101+
OTHER_CFLAGS = $(inherited) "-D_U_=__attribute__((unused))"
102+
OTHER_CFLAGS = $(inherited) -DHAVE_TIME_H
103+
OTHER_CFLAGS = $(inherited) -DHAVE_FCNTL_H
104+
OTHER_CFLAGS = $(inherited) -DHAVE_UNISTD_H
105+
OTHER_CFLAGS = $(inherited) -DHAVE_STDLIB_H
106+
OTHER_CFLAGS = $(inherited) -DSTDC_HEADERS
107+
OTHER_CFLAGS = $(inherited) -DHAVE_STRING_H
108+
OTHER_CFLAGS = $(inherited) -DHAVE_LINGER
109+
OTHER_CFLAGS = $(inherited) -DHAVE_SYS_UIO_H
110+
OTHER_CFLAGS = $(inherited) -DHAVE_POLL_H
111+
OTHER_CFLAGS = $(inherited) -DHAVE_NETDB_H
112+
OTHER_CFLAGS = $(inherited) -DHAVE_NETINET_TCP_H
113+
OTHER_CFLAGS = $(inherited) -DHAVE_NETINET_IN_H
114+
OTHER_CFLAGS = $(inherited) -DHAVE_SYS_SOCKET_H
115+
OTHER_CFLAGS = $(inherited) -DHAVE_ARPA_INET_H
116+
OTHER_CFLAGS = $(inherited) -DHAVE_BUILTINSMBCLIENT
117+
OTHER_CFLAGS = $(inherited) -DHAVE_SMBCLIENT
118+
101119
OTHER_CFLAGS[arch=x86_64] = $(inherited) -DHAVE_SSE
102120
OTHER_CFLAGS[arch=arm64*] = $(inherited) -D__ARM_NEON__ -DHAVE_NEON
103121

@@ -164,6 +182,8 @@ HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/glslang/glslang/glslang/MachineIn
164182
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix
165183
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/glslang/glslang/glslang/Public
166184
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/libFLAC/include
185+
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/libsmb2/include
186+
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/libsmb2/include/smb2
167187
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/rcheevos/include
168188
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/stb
169189
HEADER_SEARCH_PATHS = $(inherited) $(DEPS_DIR)/zstd/lib

pkg/apple/RetroArch.xcodeproj/project.pbxproj

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,8 @@
414414
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
415415
"$(SRCROOT)/../../deps/discord-rpc/include",
416416
"$(SRCROOT)/../../deps/libFLAC/include",
417+
"$(SRCROOT)/../../deps/libsmb2/include",
418+
"$(SRCROOT)/../../deps/libsmb2/include/smb2",
417419
"$(SRCROOT)/../../deps/rcheevos/include",
418420
"$(SRCROOT)/../../deps/7zip",
419421
"$(SRCROOT)/../../deps/stb",
@@ -457,6 +459,8 @@
457459
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
458460
"$(SRCROOT)/../../deps/discord-rpc/include",
459461
"$(SRCROOT)/../../deps/libFLAC/include",
462+
"$(SRCROOT)/../../deps/libsmb2/include",
463+
"$(SRCROOT)/../../deps/libsmb2/include/smb2",
460464
"$(SRCROOT)/../../deps/rcheevos/include",
461465
"$(SRCROOT)/../../deps/7zip",
462466
"$(SRCROOT)/../../deps/stb",
@@ -503,6 +507,8 @@
503507
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
504508
"$(SRCROOT)/../../deps/discord-rpc/include",
505509
"$(SRCROOT)/../../deps/libFLAC/include",
510+
"$(SRCROOT)/../../deps/libsmb2/include",
511+
"$(SRCROOT)/../../deps/libsmb2/include/smb2",
506512
"$(SRCROOT)/../../deps/rcheevos/include",
507513
"$(SRCROOT)/../../deps/7zip",
508514
"$(SRCROOT)/../../deps/stb",
@@ -543,6 +549,8 @@
543549
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
544550
"$(SRCROOT)/../../deps/discord-rpc/include",
545551
"$(SRCROOT)/../../deps/libFLAC/include",
552+
"$(SRCROOT)/../../deps/libsmb2/include",
553+
"$(SRCROOT)/../../deps/libsmb2/include/smb2",
546554
"$(SRCROOT)/../../deps/rcheevos/include",
547555
"$(SRCROOT)/../../deps/7zip",
548556
"$(SRCROOT)/../../deps/stb",
@@ -575,6 +583,23 @@
575583
"-DHAVE_ACCESSIBILITY",
576584
"-DHAVE_SSL",
577585
"-DHAVE_BUILTINMBEDTLS",
586+
"-D_U_=__attribute__((unused))"
587+
"-DHAVE_TIME_H",
588+
"-DHAVE_FCNTL_H",
589+
"-DHAVE_UNISTD_H",
590+
"-DHAVE_STDLIB_H",
591+
"-DSTDC_HEADERS"
592+
"-DHAVE_STRING_H",
593+
"-DHAVE_LINGER",
594+
"-DHAVE_SYS_UIO_H",
595+
"-DHAVE_POLL_H",
596+
"-DHAVE_NETDB_H",
597+
"-DHAVE_NETINET_TCP_H",
598+
"-DHAVE_NETINET_IN_H",
599+
"-DHAVE_SYS_SOCKET_H",
600+
"-DHAVE_ARPA_INET_H",
601+
"-DHAVE_BUILTINSMBCLIENT",
602+
"-DHAVE_HAVE_SMBCLIENT",
578603
"-DHAVE_COMMAND",
579604
"-DHAVE_NETWORK_CMD",
580605
"-DHAVE_GRIFFIN",
@@ -662,6 +687,23 @@
662687
"-DHAVE_ACCESSIBILITY",
663688
"-DHAVE_SSL",
664689
"-DHAVE_BUILTINMBEDTLS",
690+
"-D_U_=__attribute__((unused))"
691+
"-DHAVE_TIME_H",
692+
"-DHAVE_FCNTL_H",
693+
"-DHAVE_UNISTD_H",
694+
"-DHAVE_STDLIB_H",
695+
"-DSTDC_HEADERS"
696+
"-DHAVE_STRING_H",
697+
"-DHAVE_LINGER",
698+
"-DHAVE_SYS_UIO_H",
699+
"-DHAVE_POLL_H",
700+
"-DHAVE_NETDB_H",
701+
"-DHAVE_NETINET_TCP_H",
702+
"-DHAVE_NETINET_IN_H",
703+
"-DHAVE_SYS_SOCKET_H",
704+
"-DHAVE_ARPA_INET_H",
705+
"-DHAVE_BUILTINSMBCLIENT",
706+
"-DHAVE_HAVE_SMBCLIENT",
665707
"-DHAVE_COMMAND",
666708
"-DHAVE_NETWORK_CMD",
667709
"-DHAVE_GRIFFIN",

0 commit comments

Comments
 (0)