From 1f93c3866ac62e671b02ba83978282924086042e Mon Sep 17 00:00:00 2001 From: Tim Champagne Date: Tue, 20 May 2003 10:52:03 +0000 Subject: This fixes the msvc projects to use the internal xine libdvdnav. CVS patchset: 4882 CVS date: 2003/05/20 10:52:03 --- win32/config.h | 10 +- win32/libdvdnav.def | 129 ++++++++++++++--------- win32/libdvdnav.dsp | 132 +++++++++++++++++++----- win32/libdvdread.dsp | 250 ++++++++++++++++++++------------------------- win32/libxine.dsp | 2 +- win32/xine.dsw | 36 +------ win32/xineplug_inp_dvd.dsp | 2 +- win32/xineui.dsp | 2 +- 8 files changed, 313 insertions(+), 250 deletions(-) (limited to 'win32') diff --git a/win32/config.h b/win32/config.h index f050a62ed..a0137d99a 100755 --- a/win32/config.h +++ b/win32/config.h @@ -354,7 +354,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1-beta6" +#define VERSION "1-beta12" /* xine major version number */ #define XINE_MAJOR 1 @@ -376,7 +376,7 @@ /* Define this if you want nvtvd tvmode support */ /* #undef XINE_HAVE_NVTV */ -#define HAVE_DVDCSS_DVDCSS_H 1 +/*#undef HAVE_DVDCSS_DVDCSS_H */ #if defined(WIN32) @@ -470,6 +470,11 @@ static char * exec_path_append_subdir( char * string ) #define XINE_FONTDIR exec_path_append_subdir( "fonts" ) #define XINE_LOCALEDIR exec_path_append_subdir( "locale" ) +#define S_ISDIR(m) ((m) & _S_IFDIR) +#define S_ISREG(m) ((m) & _S_IFREG) +#define S_ISBLK(m) 0 +#define S_ISCHR(m) 0 + #else /* Path where catalog files will be. */ @@ -499,4 +504,5 @@ static char * exec_path_append_subdir( char * string ) /* Define to `unsigned' if does not define. */ /* #undef size_t */ + #endif /* defined CONFIG_H */ diff --git a/win32/libdvdnav.def b/win32/libdvdnav.def index 0265ca71f..7f633d18d 100644 --- a/win32/libdvdnav.def +++ b/win32/libdvdnav.def @@ -1,47 +1,82 @@ -;------------------------------------------------------------ -; LIBDVDNAV DLL DEFINITIONS FILE - -EXPORTS - -dvdnav_set_readahead_flag -dvdnav_set_region_mask -dvdnav_spu_language_select -dvdnav_audio_language_select -dvdnav_menu_language_select -dvdnav_get_angle_info -dvdnav_current_title_info -dvdnav_title_play -dvdnav_part_play -dvdnav_get_number_of_titles -dvdnav_get_title_string -dvdnav_open -dvdnav_close -dvdnav_wait_skip -dvdnav_get_video_scale_permission -dvdnav_get_video_aspect -dvdnav_still_skip -dvdnav_err_to_string -dvdnav_get_next_cache_block -dvdnav_free_cache_block -dvdnav_get_position -dvdnav_sector_search -dvdnav_get_current_highlight -dvdnav_button_select_and_activate -dvdnav_right_button_select -dvdnav_left_button_select -dvdnav_lower_button_select -dvdnav_upper_button_select -dvdnav_mouse_select -dvdnav_button_select -dvdnav_mouse_activate -dvdnav_button_activate -dvdnav_angle_change -dvdnav_prev_pg_search -dvdnav_next_pg_search -dvdnav_menu_call -dvdnav_spu_stream_to_lang -dvdnav_get_spu_logical_stream -dvdnav_audio_stream_to_lang -dvdnav_get_audio_logical_stream -dvdnav_is_domain_vts - +;------------------------------------------------------------ +; LIBDVDNAV DLL DEFINITIONS FILE + +EXPORTS + +DVDOpen +DVDClose +DVDOpenFile +DVDCloseFile +DVDReadBlocks + +navRead_DSI +navRead_PCI + +ifoClose +ifoRead_VOBU_ADMAP +ifoRead_VTS_ATRT +ifoRead_PTL_MAIT +ifoRead_PGCI_UT +ifoRead_TT_SRPT +ifoRead_FP_PGC +ifoOpenVMGI +ifoRead_TITLE_VOBU_ADMAP +ifoRead_PGCIT +ifoRead_VTS_PTT_SRPT +ifoOpenVTSI +ifoPrint + +dvdnav_set_readahead_flag +dvdnav_set_region_mask +dvdnav_spu_language_select +dvdnav_audio_language_select +dvdnav_menu_language_select +dvdnav_get_angle_info +dvdnav_current_title_info +dvdnav_title_play +dvdnav_part_play +dvdnav_get_number_of_titles +dvdnav_get_title_string +dvdnav_open +dvdnav_close +dvdnav_wait_skip +dvdnav_get_video_scale_permission +dvdnav_get_video_aspect +dvdnav_still_skip +dvdnav_err_to_string +dvdnav_get_next_cache_block +dvdnav_free_cache_block +dvdnav_get_position +dvdnav_sector_search +dvdnav_get_current_highlight +dvdnav_button_select_and_activate +dvdnav_right_button_select +dvdnav_left_button_select +dvdnav_lower_button_select +dvdnav_upper_button_select +dvdnav_mouse_select +dvdnav_button_select +dvdnav_mouse_activate +dvdnav_button_activate +dvdnav_angle_change +dvdnav_prev_pg_search +dvdnav_next_pg_search +dvdnav_menu_call +dvdnav_spu_stream_to_lang +dvdnav_get_spu_logical_stream +dvdnav_audio_stream_to_lang +dvdnav_get_audio_logical_stream +dvdnav_is_domain_vts + +dvdnav_set_PGC_positioning_flag +dvdnav_get_number_of_parts +dvdnav_reset + +;------------------------------------------------------------ +; timer exports + +gettimeofday +setitimer +pause +sleep +nanosleep diff --git a/win32/libdvdnav.dsp b/win32/libdvdnav.dsp index 7d4556cb2..429f82b61 100644 --- a/win32/libdvdnav.dsp +++ b/win32/libdvdnav.dsp @@ -2,7 +2,7 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 +# TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=libdvdnav - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -17,8 +17,8 @@ CFG=libdvdnav - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libdvdnav - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libdvdnav - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libdvdnav - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libdvdnav - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -26,7 +26,6 @@ CFG=libdvdnav - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "libdvdnav - Win32 Release" @@ -38,23 +37,28 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release/libdvdnav" -# PROP Intermediate_Dir "Release/libdvdnav" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" # PROP Target_Dir "" -LIB32=link.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDNAV_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDNAV_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +MTL=midl.exe +LINK32=link.exe +# ADD BASE LINK32 /machine:IX86 +# ADD LINK32 /machine:IX86 +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "." /I ".." /I "..\..\libdvdcss\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/libdvdnav.dll" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Create libdvdnav Install Files +PostBuild_Cmds=scripts\libdvdnav_install.bat Release +# End Special Build Tool !ELSEIF "$(CFG)" == "libdvdnav - Win32 Debug" @@ -65,23 +69,25 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug/libdvdnav" -# PROP Intermediate_Dir "Debug/libdvdnav" +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -LIB32=link.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDNAV_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "../include" /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdread" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDNAV_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /I /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +MTL=midl.exe +LINK32=link.exe +# ADD BASE LINK32 /machine:IX86 +# ADD LINK32 /debug /machine:IX86 /out:"Debug/libdvdnav.lib" /implib:"Debug/libdvdnav.lib" +# SUBTRACT LINK32 /pdb:none /nodefaultlib +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "../src/xine-utils" /I "contrib/dirent" /I "contrib/pthreads" /I "contrib/timer" /I "../src/input/libdvdcss/src" /I ".." /I "../src" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /FR"Debug/libdvdnav/" /Fp"Debug/libdvdnav/libdvdnav.pch" /YX /Fo"Debug/libdvdnav/" /Fd"Debug/libdvdnav/" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libdvdnav.dll" /pdbtype:sept +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"Debug\libdvdnav\libdvdnav.lib" !ENDIF @@ -98,6 +104,18 @@ SOURCE=..\src\input\libdvdnav\decoder.c # End Source File # Begin Source File +SOURCE=..\src\input\libdvdnav\dvd_input.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\dvd_reader.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\dvd_udf.c +# End Source File +# Begin Source File + SOURCE=..\src\input\libdvdnav\dvdnav.c # End Source File # Begin Source File @@ -106,6 +124,22 @@ SOURCE=..\src\input\libdvdnav\highlight.c # End Source File # Begin Source File +SOURCE=..\src\input\libdvdnav\ifo_read.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\md5.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\nav_print.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\nav_read.c +# End Source File +# Begin Source File + SOURCE=..\src\input\libdvdnav\navigation.c # End Source File # Begin Source File @@ -133,6 +167,54 @@ SOURCE=..\src\input\libdvdnav\vm.c SOURCE=..\src\input\libdvdnav\vmcmd.c # End Source File # End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\dvdread\bswap.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\dvd_input.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\dvd_reader.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\dvd_udf.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\ifo_print.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\ifo_read.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\ifo_types.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\nav_print.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\nav_read.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\nav_types.h +# End Source File +# Begin Source File + +SOURCE=..\dvdread\types.h +# End Source File +# End Group # Begin Group "DLL Defs" # PROP Default_Filter "" diff --git a/win32/libdvdread.dsp b/win32/libdvdread.dsp index 5d5941b0c..864198d5b 100644 --- a/win32/libdvdread.dsp +++ b/win32/libdvdread.dsp @@ -1,140 +1,110 @@ -# Microsoft Developer Studio Project File - Name="libdvdread" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libdvdread - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libdvdread.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libdvdread.mak" CFG="libdvdread - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libdvdread - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libdvdread - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libdvdread - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release/libdvdread" -# PROP Intermediate_Dir "Release/libdvdread" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/libdvdread.dll" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Moving Xine Includes -PostBuild_Cmds=scripts\move_xine_deps.bat Release -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libdvdread - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug/libdvdread" -# PROP Intermediate_Dir "Debug/libdvdread" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "../include" /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdcss/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libdvdread.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "libdvdread - Win32 Release" -# Name "libdvdread - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\input\libdvdread\dvd_input.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdread\dvd_reader.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdread\dvd_udf.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdread\ifo_print.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdread\ifo_read.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdread\md5.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdread\nav_print.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdread\nav_read.c -# End Source File -# End Group -# Begin Group "DLL Defs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\libdvdread.def -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libdvdread" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libdvdread - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libdvdread.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libdvdread.mak" CFG="libdvdread - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libdvdread - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libdvdread - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libdvdread - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release/libdvdread" +# PROP Intermediate_Dir "Release/libdvdread" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/bin/libdvdread.dll" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Moving Xine Includes +PostBuild_Cmds=scripts\move_xine_deps.bat Release +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libdvdread - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug/libdvdread" +# PROP Intermediate_Dir "Debug/libdvdread" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "../include" /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdcss/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDREAD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libdvdread.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "libdvdread - Win32 Release" +# Name "libdvdread - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "DLL Defs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\libdvdread.def +# End Source File +# End Group +# End Target +# End Project diff --git a/win32/libxine.dsp b/win32/libxine.dsp index 1ce460191..b3cdb5ea6 100644 --- a/win32/libxine.dsp +++ b/win32/libxine.dsp @@ -86,7 +86,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdvdnav.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxine.dll" /pdbtype:sept /libpath:"lib" +# ADD LINK32 libdvdnav.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxine.dll" /pdbtype:sept /libpath:"Debug\libdvdnav" /libpath:"lib" # SUBTRACT LINK32 /pdb:none # Begin Special Build Tool SOURCE="$(InputPath)" diff --git a/win32/xine.dsw b/win32/xine.dsw index 42b0e6831..fd08b912b 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -23,42 +23,12 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency Begin Project Dependency Project_Dep_Name libxinesuppt End Project Dependency Begin Project Dependency Project_Dep_Name libxineutils End Project Dependency - Begin Project Dependency - Project_Dep_Name libdvdread - End Project Dependency -}}} - -############################################################################### - -Project: "libdvdread"=".\libdvdread.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdvdcss - End Project Dependency }}} ############################################################################### @@ -464,9 +434,6 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name libdvdcss - End Project Dependency Begin Project Dependency Project_Dep_Name libxine End Project Dependency @@ -476,6 +443,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name libxineutils End Project Dependency + Begin Project Dependency + Project_Dep_Name libdvdnav + End Project Dependency }}} ############################################################################### diff --git a/win32/xineplug_inp_dvd.dsp b/win32/xineplug_inp_dvd.dsp index 6b66b61c5..a245cc2e3 100644 --- a/win32/xineplug_inp_dvd.dsp +++ b/win32/xineplug_inp_dvd.dsp @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libdvdnav.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_dvd.so" /pdbtype:sept /libpath:"lib" +# ADD LINK32 libdvdnav.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_dvd.so" /pdbtype:sept /libpath:"Debug\libdvdnav" /libpath:"lib" !ENDIF diff --git a/win32/xineui.dsp b/win32/xineui.dsp index 91dd4bd15..3460ce0f0 100644 --- a/win32/xineui.dsp +++ b/win32/xineui.dsp @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/bin/xineui.exe" /pdbtype:sept /libpath:"lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/bin/xineui.exe" /pdbtype:sept /libpath:"Debug\libdvdnav\ lib\\" !ENDIF -- cgit v1.2.3