# HG changeset patch
# User diego
# Date 1311287097 0
# Node ID 844786b8f7686993b66071012408c46805fc114e
# Parent  6a9627d6f8f10db355f43f4964ec29aa1730af50
Makfile: split non-native directories from native directories in DIRS

gui/win32: use C99 bool type instead of Windows BOOL

diff -r 6a9627d6f8f1 -r 844786b8f768 Makefile
--- a/Makefile	Thu Jul 21 01:21:36 2011 +0000
+++ b/Makefile	Thu Jul 21 22:24:57 2011 +0000
@@ -720,20 +720,14 @@
         input \
         libaf \
         libao2 \
-        libass \
-        libdvdcss \
-        libdvdnav \
-        libdvdnav/vm \
-        libdvdread4 \
         libmenu \
         libmpcodecs \
         libmpcodecs/native \
         libmpdemux \
-        libmpeg2 \
         libvo \
         loader \
+        loader/dmo \
         loader/dshow \
-        loader/dmo \
         loader/wine \
         mp3lib \
         osdep \
@@ -742,14 +736,22 @@
         stream/librtsp \
         stream/realrtsp \
         sub \
-        tremor \
         TOOLS \
         vidix \
 
+ALL_DIRS = $(DIRS) \
+        libass \
+        libdvdcss \
+        libdvdnav \
+        libdvdnav/vm \
+        libdvdread4 \
+        libmpeg2 \
+        tremor \
+
 ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
 
 ADDSUFFIXES     = $(foreach suf,$(1),$(addsuffix $(suf),$(2)))
-ADD_ALL_DIRS    = $(call ADDSUFFIXES,$(1),$(DIRS))
+ADD_ALL_DIRS    = $(call ADDSUFFIXES,$(1),$(ALL_DIRS))
 ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
 
 
diff -r 6a9627d6f8f1 -r 844786b8f768 gui/win32/playlist.c
--- a/gui/win32/playlist.c	Thu Jul 21 01:21:36 2011 +0000
+++ b/gui/win32/playlist.c	Thu Jul 21 22:24:57 2011 +0000
@@ -22,6 +22,7 @@
  */
 
 #include <windows.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "mp_msg.h"
@@ -29,7 +30,7 @@
 
 /* TODO: implement sort_playlist */
 
-BOOL adddirtoplaylist(playlist_t *playlist, const char *path, BOOL recursive)
+bool adddirtoplaylist(playlist_t *playlist, const char *path, bool recursive)
 {
     HANDLE findHandle = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATA finddata;
diff -r 6a9627d6f8f1 -r 844786b8f768 gui/win32/playlist.h
--- a/gui/win32/playlist.h	Thu Jul 21 01:21:36 2011 +0000
+++ b/gui/win32/playlist.h	Thu Jul 21 22:24:57 2011 +0000
@@ -24,7 +24,7 @@
 #ifndef MPLAYER_GUI_PLAYLIST_H
 #define MPLAYER_GUI_PLAYLIST_H
 
-#include <windows.h>
+#include <stdbool.h>
 
 typedef struct
 {
@@ -56,6 +56,6 @@
 #define SORT_BYDURATION     4
 
 playlist_t *create_playlist(void);
-BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
+bool adddirtoplaylist(playlist_t *playlist, const char* path, bool recursive);
 
 #endif /* MPLAYER_GUI_PLAYLIST_H */