[Mplayer-cvslog] CVS: main Makefile,1.249,1.250 mencoder.c,1.204,1.205 mplayer.c,1.680,1.681

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv8273

Modified Files:
	Makefile mencoder.c mplayer.c 
Log Message:
linux->osdep


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- Makefile	7 Feb 2003 22:25:17 -0000	1.249
+++ Makefile	9 Feb 2003 20:18:11 -0000	1.250
@@ -36,7 +36,7 @@
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
 
@@ -48,7 +48,7 @@
 endif
 endif
 
-PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers linux postproc input libvo libaf
+PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf
 ifeq ($(VIDIX),yes)
 PARTS += libdha vidix
 endif
@@ -80,7 +80,7 @@
 ALL_PRG += $(PRG_FIBMAP)
 endif
 
-COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
+COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
 ifeq (($SHARED_PP),yes)
 COMMON_DEPS += postproc/libpostproc.so
 else
@@ -170,8 +170,8 @@
 Gui/libgui.a:
 	$(MAKE) -C Gui
 
-linux/libosdep.a:
-	$(MAKE) -C linux
+osdep/libosdep.a:
+	$(MAKE) -C osdep
 
 postproc/libswscale.a:
 	$(MAKE) -C postproc

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- mencoder.c	24 Jan 2003 01:04:50 -0000	1.204
+++ mencoder.c	9 Feb 2003 20:18:11 -0000	1.205
@@ -75,7 +75,7 @@
 
 #include "libvo/fastmemcpy.h"
 
-#include "linux/timer.h"
+#include "osdep/timer.h"
 
 int vo_doublebuffering=0;
 int vo_directrendering=0;

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -r1.680 -r1.681
--- mplayer.c	9 Feb 2003 13:17:12 -0000	1.680
+++ mplayer.c	9 Feb 2003 20:18:11 -0000	1.681
@@ -64,8 +64,8 @@
 #include "spudec.h"
 #include "vobsub.h"
 
-#include "linux/getch2.h"
-#include "linux/timer.h"
+#include "osdep/getch2.h"
+#include "osdep/timer.h"
 
 #include "cpudetect.h"