summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
author11rcombs <rodger.combs@gmail.com>2013-12-16 20:35:43 -0600
committerwm4 <wm4@nowhere>2013-12-17 08:44:21 +0100
commitad92c893a0cfed3dbb9eff7a5979c1e43c41c76f (patch)
tree49c1b7e3d71151f50ed2099bddb73a1e792dc4a5 /osdep
parent0112143fdaae0a6264d9e02355e9dc0ca4f7741c (diff)
downloadmpv-ad92c893a0cfed3dbb9eff7a5979c1e43c41c76f.tar.bz2
mpv-ad92c893a0cfed3dbb9eff7a5979c1e43c41c76f.tar.xz
Fix OSX build; remove all remaining mpvcore references
Diffstat (limited to 'osdep')
-rw-r--r--osdep/macosx_application.m6
-rw-r--r--osdep/macosx_events.m2
-rw-r--r--osdep/path-macosx.m2
3 files changed, 5 insertions, 5 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index 127eacd00d..ba801f412a 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -19,9 +19,9 @@
#include <pthread.h>
#include "talloc.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "common/msg.h"
+#include "input/input.h"
+#include "input/keycodes.h"
#include "osdep/macosx_application_objc.h"
#include "osdep/macosx_compat.h"
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index a7ca335736..56f1bd5397 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -26,7 +26,7 @@
#import <Cocoa/Cocoa.h>
#include "talloc.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
// doesn't make much sense, but needed to access keymap functionality
#include "video/out/vo.h"
diff --git a/osdep/path-macosx.m b/osdep/path-macosx.m
index 7446710ee5..d4c5020da1 100644
--- a/osdep/path-macosx.m
+++ b/osdep/path-macosx.m
@@ -17,7 +17,7 @@
*/
#import <Foundation/Foundation.h>
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "osdep/path.h"
char *mp_get_macosx_bundled_path(const char *file)