Skip to content

Commit 0ea4e8d

Browse files
committed
Some linking fixes for Apple/Darwin
1 parent cd8e750 commit 0ea4e8d

2 files changed

Lines changed: 19 additions & 2 deletions

File tree

Makefile.common

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,20 +812,36 @@ endif
812812
ifeq ($(HAVE_COREAUDIO), 1)
813813
DEFINES += -DHAVE_COREAUDIO
814814
OBJ += audio/drivers/coreaudio.o
815+
ifeq ($(HAVE_MICROPHONE), 1)
816+
OBJ += audio/drivers/coreaudio_mic_macos.o
817+
endif
815818
HAVE_COREAUDIO_LIBS = 1
819+
LIBS += -framework AudioToolbox -framework AVFoundation -framework Accelerate
816820
endif
817821

818822
ifeq ($(HAVE_COREAUDIO3), 1)
819823
DEFINES += -DHAVE_COREAUDIO3
820824
OBJ += audio/drivers/coreaudio3.o
821825
HAVE_COREAUDIO_LIBS = 1
822-
LIBS += -framework AudioToolBox -framework AVFoundation
826+
LIBS += -framework AudioToolbox -framework AVFoundation
823827
endif
824828

825829
ifeq ($(HAVE_COREAUDIO_LIBS), 1)
826830
LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit
827831
endif
828832

833+
ifeq ($(HAVE_CORELOCATION), 1)
834+
DEFINES += -DHAVE_CORELOCATION
835+
OBJ += location/drivers/corelocation.o
836+
LIBS += -framework CoreLocation
837+
endif
838+
839+
ifeq ($(HAVE_COCOA), 1)
840+
OBJ += ui/drivers/cocoa/cocoa_common.o
841+
OBJ += ui/drivers/cocoa/RetroArchPlaylistManager.o
842+
LIBS += -framework Cocoa -framework AppKit -framework Foundation
843+
endif
844+
829845
ifeq ($(HAVE_CORETEXT), 1)
830846
OBJ += gfx/drivers_font_renderer/coretext.o
831847
endif

playlist.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
#ifndef _PLAYLIST_H__
1919
#define _PLAYLIST_H__
2020

21+
#include <boolean.h>
2122
#include <stddef.h>
2223

2324
#include <retro_common_api.h>
24-
#include <boolean.h>
25+
#include <retro_miscellaneous.h>
2526
#include <lists/string_list.h>
2627

2728
#include "core_info.h"

0 commit comments

Comments
 (0)