Module dpvideo: Change committed
havoc at icculus.org
havoc at icculus.org
Thu Aug 1 08:07:45 EDT 2002
Commiter : havoc
CVSROOT : /cvs/cvsroot/twilight
Module : dpvideo
Commit time: 2002-08-01 12:07:45 UTC
Log message:
fixed dpvencoder... MSVC made the project in the parent directory (which was not committed) and... well, big mess, long story short, it was broken, now it is fixed.
Modified files:
dpvencoder.dsp dpvideo.dsw
------=MIME.da2635e61f6d836b2973e6398d251abb
Content-Type: text/plain; name="dpvideo.20020801.120745.havoc.diff"
Content-Disposition: attachment; filename="dpvideo.20020801.120745.havoc.diff"
Content-Transfer-Encoding: 8bit
Index: dpvideo/dpvencoder.dsp
diff -u dpvideo/dpvencoder.dsp:1.1 dpvideo/dpvencoder.dsp:1.2
--- dpvideo/dpvencoder.dsp:1.1 Thu Aug 1 06:14:03 2002
+++ dpvideo/dpvencoder.dsp Thu Aug 1 08:07:35 2002
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="dpvencode" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="dpvencoder" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=dpvencode - Win32 Debug
+CFG=dpvencoder - 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 "dpvencode.mak".
+!MESSAGE NMAKE /f "dpvencoder.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 "dpvencode.mak" CFG="dpvencode - Win32 Debug"
+!MESSAGE NMAKE /f "dpvencoder.mak" CFG="dpvencoder - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "dpvencode - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dpvencode - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dpvencoder - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "dpvencoder - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -26,72 +26,101 @@
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
-MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "dpvencode - Win32 Release"
+!IF "$(CFG)" == "dpvencoder - 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 Output_Dir "dpvencoder___Win32_Release"
+# PROP BASE Intermediate_Dir "dpvencoder___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "dpvencoder___Win32_Release"
+# PROP Intermediate_Dir "dpvencoder___Win32_Release"
+# 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 "DPVENCODE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DPVENCODE_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 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 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 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:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /machine:I386
-!ELSEIF "$(CFG)" == "dpvencode - Win32 Debug"
+!ELSEIF "$(CFG)" == "dpvencoder - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "dpvencode___Win32_Debug"
-# PROP BASE Intermediate_Dir "dpvencode___Win32_Debug"
+# PROP BASE Output_Dir "dpvencoder___Win32_Debug"
+# PROP BASE Intermediate_Dir "dpvencoder___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "dpvencode___Win32_Debug"
-# PROP Intermediate_Dir "dpvencode___Win32_Debug"
+# PROP Output_Dir "dpvencoder___Win32_Debug"
+# PROP Intermediate_Dir "dpvencoder___Win32_Debug"
+# 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 "DPVENCODE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DPVENCODE_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /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 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# 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 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:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
-# Name "dpvencode - Win32 Release"
-# Name "dpvencode - Win32 Debug"
+# Name "dpvencoder - Win32 Release"
+# Name "dpvencoder - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\dpvencode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dpvencoder.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tgafile.c
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\dpvencode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hz_write.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tgafile.h
+# End Source File
# End Group
# Begin Group "Resource Files"
Index: dpvideo/dpvideo.dsw
diff -u dpvideo/dpvideo.dsw:1.1 dpvideo/dpvideo.dsw:1.2
--- dpvideo/dpvideo.dsw:1.1 Thu Aug 1 06:14:03 2002
+++ dpvideo/dpvideo.dsw Thu Aug 1 08:07:35 2002
@@ -15,7 +15,7 @@
###############################################################################
-Project: "dpvencoder"=..\dpvencoder.dsp - Package Owner=<4>
+Project: "dpvencoder"=.\dpvencoder.dsp - Package Owner=<4>
Package=<5>
{{{
More information about the twilight-commits
mailing list