[matroska] r1008 - trunk/DvdMenuXtractor
[email protected] Wed, 5 Jan 2005 18:04:44 +0300 (MSK)
Newsgroups
gmane.comp.multimedia.matroska.cvs
Message-ID
<[email protected] >
Author: robux4
Date: 2005-01-05 18:04:43 +0300 (Wed, 05 Jan 2005)
New Revision: 1008
Modified:
trunk/DvdMenuXtractor/DvdMenuXtractor.bkl
trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
trunk/DvdMenuXtractor/DvdMenuXtractor.dsp
trunk/DvdMenuXtractor/DvdMenuXtractor.dsw
trunk/DvdMenuXtractor/DvdMenuXtractor.sln
trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj
trunk/DvdMenuXtractor/Makefile
trunk/DvdMenuXtractor/README.txt
trunk/DvdMenuXtractor/makefile.vc
Log:
DMX: remove the AC3 and MPEG2 decoders from the build
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.bkl
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.bkl 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.bkl 2005-01-05 15:04:43 UTC (rev 1008)
@@ -26,28 +26,7 @@
<if cond="BUILD=='debug'">__WXDEBUG__</if>
</set>
- <subproject id="liba52">
- <if cond="PLATFORM_WIN32=='1'">
- <dir>a52dec/vc++</dir>
- </if>
- <if cond="PLATFORM_WIN32=='0'">
- <dir>a52dec</dir>
- </if>
- </subproject>
-
- <subproject id="libmpeg2">
- <if cond="PLATFORM_WIN32=='1'">
- <dir>mpeg2dec/vc++</dir>
- </if>
- <if cond="PLATFORM_WIN32=='0'">
- <dir>mpeg2dec</dir>
- </if>
- </subproject>
-
<exe id="DvdMenuXtractor">
- <depends>liba52</depends>
- <depends>libmpeg2</depends>
-
<debug-info>$(DEBUG_FLAG)</debug-info>
<debug-runtime-libs>$(DEBUG_FLAG)</debug-runtime-libs>
<optimize>$(OPTIMIZE)</optimize>
@@ -57,7 +36,7 @@
<app-type>gui</app-type>
<define>$(WX_FLAGS)</define>
- <sources>A52Decoder.cpp DvdMenuXtractor.cpp IFOFile.cpp MPEG2Decoder.cpp MyWizard.cpp SUBDecoder.cpp VobParser.cpp base64.cpp iso/iso_lang.c spudec/spudec.c</sources>
+ <sources>DvdMenuXtractor.cpp IFOFile.cpp MyWizard.cpp SUBDecoder.cpp VobParser.cpp base64.cpp iso/iso_lang.c spudec/spudec.c</sources>
<if cond="PLATFORM_WIN32=='1'">
<!-- Change these paths to your local wxWidget installation -->
@@ -65,8 +44,6 @@
<include>F:\tmp\wxWindows-2.5.1\lib\vc_lib\msw$(DEBUG_SUFFIX)</include>
</if>
- <include>mpeg2dec/include</include>
- <include>a52dec/include</include>
<include>libdvdread</include>
<include>win32</include>
@@ -86,8 +63,6 @@
<if cond="PLATFORM_WIN32=='1'">
<lib-path>F:\tmp\wxWindows-2.5.1\lib\vc_lib</lib-path>
</if>
- <lib-path>a52dec/vc++</lib-path>
- <lib-path>mpeg2dec/vc++</lib-path>
<lib-path>libdvdread/build</lib-path>
</exe>
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp 2005-01-05 15:04:43 UTC (rev 1008)
@@ -21,8 +21,6 @@
#include <inttypes.h>
#include "IFOFile.h"
#include "VOBParser.h"
-#include "MPEG2Decoder.h"
-#include "A52Decoder.h"
#include "SUBDecoder.h"
#include "base64.h"
#include "iso/iso_lang.h"
@@ -763,116 +761,6 @@
}
}
- void ConvertStillToBMP(int16_t title, bool language)
- {
- wxString FilenameBase;
- CellListElem* cle;
- CellsListType::Node *node;
- const CellsListType *CellsList = IfoFile->GetCellsList(title, language);
- int i;
- wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
-
- if (!CellsList)
- return;
-
- m_gaDemuxProgress->SetValue(0);
- m_gaDemuxProgress->SetRange(CellsList->GetCount());
-
- BitmapMPEG2DecWriter* BMPWriter = new BitmapMPEG2DecWriter();
- MPEG2Decoder* mpeg2decoder = new MPEG2Decoder(BMPWriter);
-
- for (i = 0, node = CellsList->GetFirst(); node != NULL; i++, node = node->GetNext() )
- {
- cle = node->GetData();
- if(cle->isStill)
- {
- FilenameBase = CellName(title, cle->vobid, cle->cellid, language);
- m_txtDemuxLog->AppendText("Converting " + FilenameBase + ".m2v to "+FilenameBase+".bmp ...\n");
- BMPWriter->SetFilename(outputDirectory + FilenameBase+".bmp");
- mpeg2decoder->ProcessFile(outputDirectory + FilenameBase+".m2v");
- wxYield();
- }
- m_gaDemuxProgress->SetValue(i);
- }
-
- delete BMPWriter;
- delete mpeg2decoder;
- }
-
-#if 0
- void ConvertAudioToWAV(int16_t title, bool language)
- {
- wxString FilenameBase;
- CellListElem* cle;
- CellsListType::Node *node;
- const CellsListType *CellsList = IfoFile->GetCellsList(title, language);
- int i;
- wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
-
- if (!CellsList)
- return;
-
- m_gaDemuxProgress->SetValue(0);
- m_gaDemuxProgress->SetRange(CellsList->GetCount());
-
- WavfileA52DecWriter* WAVWriter = new WavfileA52DecWriter();
- A52Decoder* a52decoder = new A52Decoder(WAVWriter);
-
- for (i = 0, node = CellsList->GetFirst(); node != NULL; i++, node = node->GetNext() )
- {
- // TODO : check if audio exist
- cle = node->GetData();
- if(!cle->isStill)
- {
- FilenameBase = CellName(title, cle->vobid, cle->cellid, language);
- m_txtDemuxLog->AppendText("Converting " + FilenameBase + ".ac3 to "+FilenameBase+".wav ...\n");
- WAVWriter->SetFilename(wavDirectory+FilenameBase+".wav");
- a52decoder->ProcessFile(outputDirectory + FilenameBase+".ac3");
- wxYield();
- }
- m_gaDemuxProgress->SetValue(i);
- }
-
- delete WAVWriter;
- delete a52decoder;
- }
-
- void ConvertButtonMaskToBMP(int16_t title, bool language)
- {
- wxString FilenameBase;
- CellListElem* cle;
- CellsListType::Node *node;
- const CellsListType *CellsList = IfoFile->GetCellsList(title, language);
- int i;
- wxFileConfig *pConfig = (wxFileConfig *)wxConfigBase::Get();
-
- if (!CellsList)
- return;
-
- m_gaDemuxProgress->SetValue(0);
- m_gaDemuxProgress->SetRange(CellsList->GetCount());
-
- SUBDecOutput* BMPWriter = NULL;
- SUBDecoder* subdecoder = new SUBDecoder(NULL);
-
- for (i = 0, node = CellsList->GetFirst(); node != NULL; i++, node = node->GetNext() )
- {
- cle = node->GetData();
- // TODO : Select only cell with button
- FilenameBase = CellName(title, cle->vobid, cle->cellid, language);
- m_txtDemuxLog->AppendText("Converting " + FilenameBase + ".sub to "+FilenameBase+".bmp ...\n");
- //WAVWriter->SetFilename(wavDirectory+FilenameBase+".wav");
-
- subdecoder->ProcessFile(outputDirectory + FilenameBase+".sub", maskDirectory+FilenameBase);
- wxYield();
- m_gaDemuxProgress->SetValue(i);
- }
-
- //delete BMPWriter;
- delete subdecoder;
- }
-#endif
-
static wxString IndentString(int lvl)
{
wxString result = "";
@@ -1490,25 +1378,7 @@
m_txtDemuxLog->AppendText(StepString+"\n");
m_lbStep->Update();
SplitAndDemux(*aVobParser, title, language);
-/*
- StepString = StepString.Format(StepStringFormat, Step++, NbsStep, "Converting still to bitmap");
- m_lbStep->SetLabel(StepString);
- m_txtDemuxLog->AppendText(StepString+"\n");
- m_lbStep->Update();
-// TODO with file output offset ConvertStillToBMP(title, language);
-/*
- StepString = StepString.Format(StepStringFormat, Step++, NbsStep, "Converting audio to wav");
- m_lbStep->SetLabel(StepString);
- m_txtDemuxLog->AppendText(StepString+"\n");
- m_lbStep->Update();
- ConvertAudioToWAV(title, language);
-* /
- StepString = StepString.Format(StepStringFormat, Step++, NbsStep, "Converting button mask to bitmap");
- m_lbStep->SetLabel(StepString);
- m_txtDemuxLog->AppendText(StepString+"\n");
- m_lbStep->Update();
- ConvertButtonMaskToBMP(title, language);
-*/
+
delete aVobParser;
}
language = !language;
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.dsp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.dsp 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.dsp 2005-01-05 15:04:43 UTC (rev 1008)
@@ -8,12 +8,12 @@
!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 "DvdMenuXtractor.mak".
+!MESSAGE NMAKE /f "dvdmenuxtractor.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 "DvdMenuXtractor.mak" CFG="DvdMenuXtractor - Win32 Debug"
+!MESSAGE NMAKE /f "dvdmenuxtractor.mak" CFG="DvdMenuXtractor - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -33,56 +33,53 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "build"
+# PROP BASE Intermediate_Dir "build\DvdMenuXtractor"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
+# PROP Output_Dir "build"
+# PROP Intermediate_Dir "build\DvdMenuXtractor"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O1 /I "F:\wx\lib\msw" /I ".\mpeg2dec\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /d "NDEBUG"
+# ADD BASE CPP /nologo /FD /MD /W1 /GR /GX /Fdbuild\DvdMenuXtractor.pdb /O1 /I "F:\tmp\wxWindows-2.5.1\include" /I "F:\tmp\wxWindows-2.5.1\lib\vc_lib\msw" /I "libdvdread" /I "win32" /D "WIN32" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /MD /W1 /GR /GX /Fdbuild\DvdMenuXtractor.pdb /O1 /I "F:\tmp\wxWindows-2.5.1\include" /I "F:\tmp\wxWindows-2.5.1\lib\vc_lib\msw" /I "libdvdread" /I "win32" /D "WIN32" /D "_WINDOWS" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_WINDOWS" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_WINDOWS" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /i "F:\tmp\wxWindows-2.5.1\include" /d "_WINDOWS" /i "F:\tmp\wxWindows-2.5.1\include" /i "F:\tmp\wxWindows-2.5.1\lib\vc_lib\msw" /i "libdvdread" /i win32
+# ADD RSC /l 0x405 /i "F:\tmp\wxWindows-2.5.1\include" /d "_WINDOWS" /i "F:\tmp\wxWindows-2.5.1\include" /i "F:\tmp\wxWindows-2.5.1\lib\vc_lib\msw" /i "libdvdread" /i win32
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 /subsystem:windows /machine:I386
-# ADD 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 comctl32.lib wsock32.lib wxmsw.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib"
+# ADD BASE LINK32 wxbase25.lib wxmsw25_core.lib user32.lib comdlg32.lib comctl32.lib shell32.lib gdi32.lib advapi32.lib ole32.lib rpcrt4.lib libdvdread.lib /nologo /machine:i386 /out:"build\DvdMenuXtractor.exe" /subsystem:windows /libpath:"F:\tmp\wxWindows-2.5.1\lib\vc_lib" /libpath:"libdvdread\build"
+# ADD LINK32 wxbase25.lib wxmsw25_core.lib user32.lib comdlg32.lib comctl32.lib shell32.lib gdi32.lib advapi32.lib ole32.lib rpcrt4.lib libdvdread.lib /nologo /machine:i386 /out:"build\DvdMenuXtractor.exe" /subsystem:windows /libpath:"F:\tmp\wxWindows-2.5.1\lib\vc_lib" /libpath:"libdvdread\build"
!ELSEIF "$(CFG)" == "DvdMenuXtractor - 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 Output_Dir "build"
+# PROP BASE Intermediate_Dir "build\DvdMenuXtractor"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
+# PROP Output_Dir "build"
+# PROP Intermediate_Dir "build\DvdMenuXtractor"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "a52dec\include" /I "mpeg2dec\include" /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /Yu"wx/wxprec.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
+# ADD BASE CPP /nologo /FD /MDd /W1 /GR /GX /Zi /Gm /GZ /Fdbuild\DvdMenuXtractor.pdb /Od /I "F:\tmp\wxWindows-2.5.1\include" /I "F:\tmp\wxWindows-2.5.1\lib\vc_lib\mswd" /I "libdvdread" /I "win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /W1 /GR /GX /Zi /Gm /GZ /Fdbuild\DvdMenuXtractor.pdb /Od /I "F:\tmp\wxWindows-2.5.1\include" /I "F:\tmp\wxWindows-2.5.1\lib\vc_lib\mswd" /I "libdvdread" /I "win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /i "F:\tmp\wxWindows-2.5.1\include" /d "_WINDOWS" /d "__WXDEBUG__" /i "F:\tmp\wxWindows-2.5.1\include" /i "F:\tmp\wxWindows-2.5.1\lib\vc_lib\mswd" /i "libdvdread" /i win32
+# ADD RSC /l 0x405 /d "_DEBUG" /i "F:\tmp\wxWindows-2.5.1\include" /d "_WINDOWS" /d "__WXDEBUG__" /i "F:\tmp\wxWindows-2.5.1\include" /i "F:\tmp\wxWindows-2.5.1\lib\vc_lib\mswd" /i "libdvdread" /i win32
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 /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"mpeg2dec/vc++/Debug/" /libpath:"a52dec/vc++/Debug/"
-# SUBTRACT LINK32 /nodefaultlib
+# ADD BASE LINK32 wxbase25d.lib wxmsw25d_core.lib user32.lib comdlg32.lib comctl32.lib shell32.lib gdi32.lib advapi32.lib ole32.lib rpcrt4.lib libdvdread.lib /nologo /machine:i386 /out:"build\DvdMenuXtractor.exe" /debug /subsystem:windows /libpath:"F:\tmp\wxWindows-2.5.1\lib\vc_lib" /libpath:"libdvdread\build"
+# ADD LINK32 wxbase25d.lib wxmsw25d_core.lib user32.lib comdlg32.lib comctl32.lib shell32.lib gdi32.lib advapi32.lib ole32.lib rpcrt4.lib libdvdread.lib /nologo /machine:i386 /out:"build\DvdMenuXtractor.exe" /debug /subsystem:windows /libpath:"F:\tmp\wxWindows-2.5.1\lib\vc_lib" /libpath:"libdvdread\build"
-!ENDIF
+!ENDIF
# Begin Target
@@ -90,308 +87,44 @@
# Name "DvdMenuXtractor - Win32 Debug"
# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\A52Decoder.cpp
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
+SOURCE=.\DvdMenuXtractor.cpp
# End Source File
# Begin Source File
-SOURCE=.\DvdMenuXtractor.cpp
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
+SOURCE=.\DvdMenuXtractor.rc
# End Source File
# Begin Source File
SOURCE=.\IFOFile.cpp
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
# End Source File
# Begin Source File
-SOURCE=.\MPEG2Decoder.cpp
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\MyWizard.cpp
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\SUBDecoder.cpp
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
# End Source File
# Begin Source File
SOURCE=.\VobParser.cpp
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\A52Decoder.h
+SOURCE=.\base64.cpp
# End Source File
# Begin Source File
-SOURCE=.\DvdMenuXtractor.h
+SOURCE=.\iso\iso_lang.c
# End Source File
# Begin Source File
-SOURCE=.\IFOFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MPEG2Decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MyWizard.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SUBDecoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\VobParser.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\wx\msw\blank.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\bullseye.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\cdrom.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\computer.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\drive.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\DvdMenuXtractor.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\file1.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\floppy.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\folder1.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\folder2.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\hand.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\magnif1.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\noentry.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pbrush.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pencil.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntleft.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntright.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\query.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\removble.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\roller.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\size.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\tip.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\watch1.cur
-# End Source File
-# End Group
-# Begin Group "spudec"
-
-# PROP Default_Filter ""
-# Begin Source File
-
SOURCE=.\spudec\spudec.c
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
# End Source File
-# Begin Source File
-
-SOURCE=.\spudec\spudec.h
-# End Source File
# End Group
-# Begin Group "dvdread"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\dvdread_win32\dvd_reader.c
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dvdread_win32\dvd_reader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dvdread_win32\ifo_read.c
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dvdread_win32\ifo_read.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dvdread_win32\ifo_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dvdread_win32\iso_lang.c
-
-!IF "$(CFG)" == "DvdMenuXtractor - Win32 Release"
-
-!ELSEIF "$(CFG)" == "DvdMenuXtractor - Win32 Debug"
-
-# ADD CPP /YX
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dvdread_win32\iso_lang.h
-# End Source File
-# End Group
# End Target
# End Project
+
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.dsw
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.dsw 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.dsw 2005-01-05 15:04:43 UTC (rev 1008)
@@ -2,9 +2,8 @@
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
+Project: "DvdMenuXtractor"=dvdmenuxtractor.dsp - Package Owner=<4>
-Project: "DvdMenuXtractor"=.\DvdMenuXtractor.dsp - Package Owner=<4>
-
Package=<5>
{{{
}}}
@@ -15,63 +14,3 @@
###############################################################################
-Project: "liba52"=".\a52dec\vc++\liba52.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libao"=".\a52dec\vc++\libao.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libmpeg2"=".\mpeg2dec\vc++\libmpeg2.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libvo"=".\mpeg2dec\vc++\libvo.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.sln
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.sln 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.sln 2005-01-05 15:04:43 UTC (rev 1008)
@@ -1,29 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DvdMenuXtractor", "DvdMenuXtractor.vcproj", "{13E98204-EB5E-4A66-96FC-4083CBB11D42}"
ProjectSection(ProjectDependencies) = postProject
- {C062AE0E-C4CD-42CE-AF10-B8BD0C557013} = {C062AE0E-C4CD-42CE-AF10-B8BD0C557013}
- {772BB728-30E6-421A-BC5F-573AB7818A23} = {772BB728-30E6-421A-BC5F-573AB7818A23}
- {BD804F44-3B8E-45A8-8C1F-150EF2018DC9} = {BD804F44-3B8E-45A8-8C1F-150EF2018DC9}
{0EE415C3-DA09-476C-A405-B493F80FC6CF} = {0EE415C3-DA09-476C-A405-B493F80FC6CF}
- {A1DEC2E6-E2F1-4096-8352-43EB3349F48F} = {A1DEC2E6-E2F1-4096-8352-43EB3349F48F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liba52", "a52dec\vc++\liba52.vcproj", "{BD804F44-3B8E-45A8-8C1F-150EF2018DC9}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libao", "a52dec\vc++\libao.vcproj", "{A1DEC2E6-E2F1-4096-8352-43EB3349F48F}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpeg2", "mpeg2dec\vc++\libmpeg2.vcproj", "{772BB728-30E6-421A-BC5F-573AB7818A23}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvo", "mpeg2dec\vc++\libvo.vcproj", "{C062AE0E-C4CD-42CE-AF10-B8BD0C557013}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdvdread", "libdvdread\win32\libdvdread.vcproj", "{0EE415C3-DA09-476C-A405-B493F80FC6CF}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -38,22 +18,6 @@
{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Debug.Build.0 = Debug|Win32
{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Release.ActiveCfg = Release|Win32
{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Release.Build.0 = Release|Win32
- {BD804F44-3B8E-45A8-8C1F-150EF2018DC9}.Debug.ActiveCfg = Debug|Win32
- {BD804F44-3B8E-45A8-8C1F-150EF2018DC9}.Debug.Build.0 = Debug|Win32
- {BD804F44-3B8E-45A8-8C1F-150EF2018DC9}.Release.ActiveCfg = Release|Win32
- {BD804F44-3B8E-45A8-8C1F-150EF2018DC9}.Release.Build.0 = Release|Win32
- {A1DEC2E6-E2F1-4096-8352-43EB3349F48F}.Debug.ActiveCfg = Debug|Win32
- {A1DEC2E6-E2F1-4096-8352-43EB3349F48F}.Debug.Build.0 = Debug|Win32
- {A1DEC2E6-E2F1-4096-8352-43EB3349F48F}.Release.ActiveCfg = Release|Win32
- {A1DEC2E6-E2F1-4096-8352-43EB3349F48F}.Release.Build.0 = Release|Win32
- {772BB728-30E6-421A-BC5F-573AB7818A23}.Debug.ActiveCfg = Debug|Win32
- {772BB728-30E6-421A-BC5F-573AB7818A23}.Debug.Build.0 = Debug|Win32
- {772BB728-30E6-421A-BC5F-573AB7818A23}.Release.ActiveCfg = Release|Win32
- {772BB728-30E6-421A-BC5F-573AB7818A23}.Release.Build.0 = Release|Win32
- {C062AE0E-C4CD-42CE-AF10-B8BD0C557013}.Debug.ActiveCfg = Debug|Win32
- {C062AE0E-C4CD-42CE-AF10-B8BD0C557013}.Debug.Build.0 = Debug|Win32
- {C062AE0E-C4CD-42CE-AF10-B8BD0C557013}.Release.ActiveCfg = Release|Win32
- {C062AE0E-C4CD-42CE-AF10-B8BD0C557013}.Release.Build.0 = Release|Win32
{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Debug.ActiveCfg = Debug|Win32
{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Debug.Build.0 = Debug|Win32
{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Release.ActiveCfg = Release|Win32
Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj 2005-01-05 15:04:43 UTC (rev 1008)
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(ProjectDir)\win32";"$(ProjectDir)\a52dec\include";"$(ProjectDir)\mpeg2dec\include";"$(ProjectDir)\libdvdread""
+ AdditionalIncludeDirectories=""$(ProjectDir)\win32";";"$(ProjectDir)\libdvdread""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
StringPooling="TRUE"
RuntimeLibrary="4"
@@ -87,7 +87,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)\win32";"$(ProjectDir)\a52dec\include";"$(ProjectDir)\mpeg2dec\include";"$(ProjectDir)\libdvdread""
+ AdditionalIncludeDirectories=""$(ProjectDir)\win32";"$(ProjectDir)\libdvdread""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -110,7 +110,7 @@
OutputFile=".\Debug/DvdMenuXtractor.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="mpeg2dec/vc++/Debug/,a52dec/vc++/Debug/"
+ AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/DvdMenuXtractor.pdb"
@@ -153,29 +153,6 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
- RelativePath="A52Decoder.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="2"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath=".\base64.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -232,29 +209,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="MPEG2Decoder.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="2"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="MyWizard.cpp">
<FileConfiguration
Name="Release|Win32">
@@ -328,9 +282,6 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
- RelativePath="A52Decoder.h">
- </File>
- <File
RelativePath=".\base64.h">
</File>
<File
@@ -340,9 +291,6 @@
RelativePath="IFOFile.h">
</File>
<File
- RelativePath="MPEG2Decoder.h">
- </File>
- <File
RelativePath="MyWizard.h">
</File>
<File
Modified: trunk/DvdMenuXtractor/Makefile
===================================================================
--- trunk/DvdMenuXtractor/Makefile 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/Makefile 2005-01-05 15:04:43 UTC (rev 1008)
@@ -1,5 +1,4 @@
# basic makefile for UNIX
-# - you will need to build & install libmpeg2 and liba52
prefix = /usr/local
exec_prefix = /usr/local/bin
@@ -16,21 +15,19 @@
CFLAGS = $(shell wx-config --cflags)
CXXFLAGS = $(shell wx-config --cxxflags)
CPPFLAGS = $(shell wx-config --cppflags)
-LDFLAGS = $(shell wx-config --ldflags) -lmpeg2 -la52 ./mpeg2dec/libvo/libvo.a
+LDFLAGS = $(shell wx-config --ldflags) ./mpeg2dec/libvo/libvo.a
### Variables: ###
DESTDIR =
-DVDMENUXTRACTOR_CFLAGS = $(__WX_FLAGS_p) -Impeg2dec/include -Ia52dec/include \
+DVDMENUXTRACTOR_CFLAGS = $(__WX_FLAGS_p) \
-I./ $(CPPFLAGS) $(CFLAGS)
-DVDMENUXTRACTOR_CXXFLAGS = $(__WX_FLAGS_p) -Impeg2dec/include -Ia52dec/include \
+DVDMENUXTRACTOR_CXXFLAGS = $(__WX_FLAGS_p) \
-I./ $(CPPFLAGS) $(CXXFLAGS)
DVDMENUXTRACTOR_OBJECTS = \
$(__DvdMenuXtractor___win32rc) \
- build/DvdMenuXtractor_A52Decoder.o \
build/DvdMenuXtractor_DvdMenuXtractor.o \
build/DvdMenuXtractor_IFOFile.o \
- build/DvdMenuXtractor_MPEG2Decoder.o \
build/DvdMenuXtractor_MyWizard.o \
build/DvdMenuXtractor_SUBDecoder.o \
build/DvdMenuXtractor_VobParser.o \
@@ -66,7 +63,7 @@
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
build/DvdMenuXtractor$(EXEEXT): $(DVDMENUXTRACTOR_OBJECTS) $(__DvdMenuXtractor___win32rc)
- $(CXX) -o $@ $(DVDMENUXTRACTOR_OBJECTS) $(LDFLAGS) $(LDFLAGS_GUI) -La52dec/vc++ -Lmpeg2dec/vc++
+ $(CXX) -o $@ $(DVDMENUXTRACTOR_OBJECTS) $(LDFLAGS) $(LDFLAGS_GUI)
$(__DvdMenuXtractor___mac_setfilecmd)
$(__DvdMenuXtractor___os2_emxbindcmd)
@@ -74,18 +71,12 @@
build/DvdMenuXtractor_DvdMenuXtractor_rc.o: $(srcdir)/DvdMenuXtractor.rc
$(RESCOMP) -i$< -o$@ --include-dir F:\tmp\wxWindows-2.5.1\include
-build/DvdMenuXtractor_A52Decoder.o: $(srcdir)/A52Decoder.cpp
- $(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
-
build/DvdMenuXtractor_DvdMenuXtractor.o: $(srcdir)/DvdMenuXtractor.cpp
$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
build/DvdMenuXtractor_IFOFile.o: $(srcdir)/IFOFile.cpp
$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
-build/DvdMenuXtractor_MPEG2Decoder.o: $(srcdir)/MPEG2Decoder.cpp
- $(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
-
build/DvdMenuXtractor_MyWizard.o: $(srcdir)/MyWizard.cpp
$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
Modified: trunk/DvdMenuXtractor/README.txt
===================================================================
--- trunk/DvdMenuXtractor/README.txt 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/README.txt 2005-01-05 15:04:43 UTC (rev 1008)
@@ -4,7 +4,6 @@
* store the palette for subs
* verify (and fix) the frame and cluster timecodes from mkvmerge
* avoid opening .VOB files we know won't exist
-* remove the AC3 and MPEG2 decoders from the build
* generate the d2v file ?
* allow skipping DVD parts when extracting (VMG, VTSM, VTS)
* allow selection of stream output (audio & subs languages)
Modified: trunk/DvdMenuXtractor/makefile.vc
===================================================================
--- trunk/DvdMenuXtractor/makefile.vc 2005-01-05 14:51:05 UTC (rev 1007)
+++ trunk/DvdMenuXtractor/makefile.vc 2005-01-05 15:04:43 UTC (rev 1008)
@@ -39,24 +39,20 @@
### Variables: ###
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)"
DVDMENUXTRACTOR_CFLAGS = /MD$(__DEBUG_FLAG_5) /DWIN32 $(__DEBUG_FLAG_2) \
/Fdbuild\DvdMenuXtractor.pdb $(____DEBUG_FLAG_4_p) $(__OPTIMIZE_6) \
/D_WINDOWS $(__WX_FLAGS_p) /IF:\tmp\wxWindows-2.5.1\include \
- /IF:\tmp\wxWindows-2.5.1\lib\vc_lib\msw$(DEBUG_SUFFIX) /Impeg2dec\include \
- /Ia52dec\include /Ilibdvdread /Iwin32 $(CPPFLAGS) $(CFLAGS)
+ /IF:\tmp\wxWindows-2.5.1\lib\vc_lib\msw$(DEBUG_SUFFIX) /Ilibdvdread \
+ /Iwin32 $(CPPFLAGS) $(CFLAGS)
DVDMENUXTRACTOR_CXXFLAGS = /MD$(__DEBUG_FLAG_5) /DWIN32 $(__DEBUG_FLAG_2) \
/Fdbuild\DvdMenuXtractor.pdb $(____DEBUG_FLAG_4_p) $(__OPTIMIZE_6) \
/D_WINDOWS $(__WX_FLAGS_p) /IF:\tmp\wxWindows-2.5.1\include \
- /IF:\tmp\wxWindows-2.5.1\lib\vc_lib\msw$(DEBUG_SUFFIX) /Impeg2dec\include \
- /Ia52dec\include /Ilibdvdread /Iwin32 /GR /GX $(CPPFLAGS) $(CXXFLAGS)
+ /IF:\tmp\wxWindows-2.5.1\lib\vc_lib\msw$(DEBUG_SUFFIX) /Ilibdvdread \
+ /Iwin32 /GR /GX $(CPPFLAGS) $(CXXFLAGS)
DVDMENUXTRACTOR_OBJECTS = \
build\DvdMenuXtractor_DvdMenuXtractor.res \
- build\DvdMenuXtractor_A52Decoder.obj \
build\DvdMenuXtractor_DvdMenuXtractor.obj \
build\DvdMenuXtractor_IFOFile.obj \
- build\DvdMenuXtractor_MPEG2Decoder.obj \
build\DvdMenuXtractor_MyWizard.obj \
build\DvdMenuXtractor_SUBDecoder.obj \
build\DvdMenuXtractor_VobParser.obj \
@@ -124,46 +120,24 @@
clean:
-if exist build\*.obj del build\*.obj
-if exist build\*.res del build\*.res
- cd a52dec\vc++
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd $(MAKEDIR)
- cd mpeg2dec\vc++
- $(MAKE) -f makefile.vc $(MAKEARGS) clean
- cd $(MAKEDIR)
-if exist build\DvdMenuXtractor.exe del build\DvdMenuXtractor.exe
-if exist build\DvdMenuXtractor.ilk del build\DvdMenuXtractor.ilk
-if exist build\DvdMenuXtractor.pdb del build\DvdMenuXtractor.pdb
-sub_liba52:
- cd a52dec\vc++
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd $(MAKEDIR)
-
-sub_libmpeg2:
- cd mpeg2dec\vc++
- $(MAKE) -f makefile.vc $(MAKEARGS) all
- cd $(MAKEDIR)
-
-build\DvdMenuXtractor.exe: $(DVDMENUXTRACTOR_OBJECTS) sub_liba52 sub_libmpeg2 build\DvdMenuXtractor_DvdMenuXtractor.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUG_FLAG_3) /SUBSYSTEM:WINDOWS /LIBPATH:F:\tmp\wxWindows-2.5.1\lib\vc_lib /LIBPATH:a52dec\vc++ /LIBPATH:mpeg2dec\vc++ /LIBPATH:libdvdread\build @<<
+build\DvdMenuXtractor.exe: $(DVDMENUXTRACTOR_OBJECTS) build\DvdMenuXtractor_DvdMenuXtractor.res
+ link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUG_FLAG_3) /SUBSYSTEM:WINDOWS /LIBPATH:F:\tmp\wxWindows-2.5.1\lib\vc_lib /LIBPATH:libdvdread\build @<<
$(DVDMENUXTRACTOR_OBJECTS) wxbase25$(DEBUG_SUFFIX).lib wxmsw25$(DEBUG_SUFFIX)_core.lib user32.lib comdlg32.lib comctl32.lib shell32.lib gdi32.lib advapi32.lib ole32.lib rpcrt4.lib libdvdread.lib
<<
build\DvdMenuXtractor_DvdMenuXtractor.res: .\DvdMenuXtractor.rc
rc /fo$@ /d WIN32 $(____DEBUG_FLAG_4_p_1) /i F:\tmp\wxWindows-2.5.1\include $**
-build\DvdMenuXtractor_A52Decoder.obj: .\A52Decoder.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(DVDMENUXTRACTOR_CXXFLAGS) $**
-
build\DvdMenuXtractor_DvdMenuXtractor.obj: .\DvdMenuXtractor.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DVDMENUXTRACTOR_CXXFLAGS) $**
build\DvdMenuXtractor_IFOFile.obj: .\IFOFile.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DVDMENUXTRACTOR_CXXFLAGS) $**
-build\DvdMenuXtractor_MPEG2Decoder.obj: .\MPEG2Decoder.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(DVDMENUXTRACTOR_CXXFLAGS) $**
-
build\DvdMenuXtractor_MyWizard.obj: .\MyWizard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DVDMENUXTRACTOR_CXXFLAGS) $**