Skip to content

smb: enable for macOS / iOS builds & fix some libretro-common include usage #18652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cscd98 wants to merge 1 commit into from
Closed

smb: enable for macOS / iOS builds & fix some libretro-common include usage #18652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deps/libsmb2/lib/compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,10 @@ int getlogin_r(char *buf, size_t size);
#define EINVAL 22
#endif

#ifndef typeof
#define typeof __typeof__
#endif

#ifdef __cplusplus
}
#endif
Expand Down
20 changes: 20 additions & 0 deletions pkg/apple/BaseConfig.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,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

Expand Down Expand Up @@ -164,6 +182,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
Expand Down
42 changes: 42 additions & 0 deletions pkg/apple/RetroArch.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Loading