diff options
| author | wm4 <wm4@nowhere> | 2015-05-02 18:47:57 +0200 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-07 10:45:33 +0900 |
| commit | 26e779c9aa74b84e50d4ca2ea14adf4bc1d961ac (patch) | |
| tree | 6f288a39aa5a38e1144c5e16cbe2b5337882bb6c /old-makefile | |
| parent | fe19db9cc08b96c813987e937bdc6f19a6d629f9 (diff) | |
| download | mpv-26e779c9aa74b84e50d4ca2ea14adf4bc1d961ac.tar.bz2 mpv-26e779c9aa74b84e50d4ca2ea14adf4bc1d961ac.tar.xz | |
build: move main-fn files to osdep
And split the Cocoa and Unix cases. Simplify the Cocoa case slightly by
calling mpv_main directly, instead of passing a function pointer. Also
add a comment explaining why Cocoa needs a special case at all.
(cherry picked from commit 1e7831070f6ae1af0a1a29b0d680ef2907bf8cf6)
Diffstat (limited to 'old-makefile')
| -rw-r--r-- | old-makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/old-makefile b/old-makefile index d7b1f1f1dc..1cbde2f31f 100644 --- a/old-makefile +++ b/old-makefile @@ -335,7 +335,7 @@ all: $(ALL_TARGETS) %.o: %.c $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< -mpv: $(OBJECTS) player/main-fn-unix.o +mpv: $(OBJECTS) osdep/main-fn-unix.o $(CC) -o $@ $^ $(EXTRALIBS) input/input.c: input/input_conf.h |